| Message ID | 20240425213701.655540-9-eajames@linux.ibm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: dts: aspeed: Add IBM P11 BMC Boards | expand |
On 25/04/2024 23:36, Eddie James wrote: > Switch to yaml for the AST2600 FSI master documentation. > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > --- > .../fsi/aspeed,ast2600-fsi-master.yaml | 72 +++++++++++++++++++ > .../bindings/fsi/fsi-master-aspeed.txt | 36 ---------- > 2 files changed, 72 insertions(+), 36 deletions(-) > create mode 100644 Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > delete mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt > > diff --git a/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > new file mode 100644 > index 000000000000..f053e3e1d259 > --- /dev/null > +++ b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > @@ -0,0 +1,72 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Aspeed FSI master > + > +maintainers: > + - Eddie James <eajames@linux.ibm.com> > + > +description: > + The AST2600 and later contain two identical FSI masters. They share a > + clock and have a separate interrupt line and output pins. > + > +properties: > + compatible: > + enum: > + - "aspeed,ast2600-fsi-master" > + - "aspeed,ast2700-fsi-master" This wasn't tested. No quotes. Do you see any other example like this? > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + cfam-reset-gpios: > + maxItems: 1 > + description: > + Output GPIO pin for CFAM reset > + > + fsi-routing-gpios: > + maxItems: 1 > + description: > + Output GPIO pin for setting the FSI mux (internal or cabled) > + > + fsi-mux-gpios: > + maxItems: 1 > + description: > + Input GPIO pin for detecting the desired FSI mux state > + > + interrupts: > + maxItems: 1 > + > +allOf: > + - $ref: fsi-controller.yaml# This goes after required: > + > +required: > + - compatible > + - reg > + - clocks > + - interrupts > + > +unevaluatedProperties: false > + > +examples: > + - | > + #include <dt-bindings/clock/ast2600-clock.h> > + #include <dt-bindings/gpio/aspeed-gpio.h> > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + fsi-master@1e79b000 { > + compatible = "aspeed,ast2600-fsi-master"; > + reg = <0x1e79b000 0x94>; > + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_fsi1_default>; > + clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; > + fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>; > + fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>; > + cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>; No children? Best regards, Krzysztof
On 4/26/24 01:25, Krzysztof Kozlowski wrote: > On 25/04/2024 23:36, Eddie James wrote: >> Switch to yaml for the AST2600 FSI master documentation. >> >> Signed-off-by: Eddie James <eajames@linux.ibm.com> >> --- >> .../fsi/aspeed,ast2600-fsi-master.yaml | 72 +++++++++++++++++++ >> .../bindings/fsi/fsi-master-aspeed.txt | 36 ---------- >> 2 files changed, 72 insertions(+), 36 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml >> delete mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt >> >> diff --git a/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml >> new file mode 100644 >> index 000000000000..f053e3e1d259 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml >> @@ -0,0 +1,72 @@ >> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Aspeed FSI master >> + >> +maintainers: >> + - Eddie James <eajames@linux.ibm.com> >> + >> +description: >> + The AST2600 and later contain two identical FSI masters. They share a >> + clock and have a separate interrupt line and output pins. >> + >> +properties: >> + compatible: >> + enum: >> + - "aspeed,ast2600-fsi-master" >> + - "aspeed,ast2700-fsi-master" > This wasn't tested. No quotes. Do you see any other example like this? Strangely this passes make dt_binding_check for me... And Rob's bot didn't seem to catch it either. Just an oversight, I'll fix it. > >> + >> + reg: >> + maxItems: 1 >> + >> + clocks: >> + maxItems: 1 >> + >> + cfam-reset-gpios: >> + maxItems: 1 >> + description: >> + Output GPIO pin for CFAM reset >> + >> + fsi-routing-gpios: >> + maxItems: 1 >> + description: >> + Output GPIO pin for setting the FSI mux (internal or cabled) >> + >> + fsi-mux-gpios: >> + maxItems: 1 >> + description: >> + Input GPIO pin for detecting the desired FSI mux state >> + >> + interrupts: >> + maxItems: 1 >> + >> +allOf: >> + - $ref: fsi-controller.yaml# > This goes after required: Ack. > >> + >> +required: >> + - compatible >> + - reg >> + - clocks >> + - interrupts >> + >> +unevaluatedProperties: false >> + >> +examples: >> + - | >> + #include <dt-bindings/clock/ast2600-clock.h> >> + #include <dt-bindings/gpio/aspeed-gpio.h> >> + #include <dt-bindings/interrupt-controller/arm-gic.h> >> + fsi-master@1e79b000 { >> + compatible = "aspeed,ast2600-fsi-master"; >> + reg = <0x1e79b000 0x94>; >> + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_fsi1_default>; >> + clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; >> + fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>; >> + fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>; >> + cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>; > No children? Ack, I'll add one. > > > Best regards, > Krzysztof >
On Fri, Apr 26, 2024 at 10:13:52AM -0500, Eddie James wrote: > > On 4/26/24 01:25, Krzysztof Kozlowski wrote: > > On 25/04/2024 23:36, Eddie James wrote: > > > Switch to yaml for the AST2600 FSI master documentation. > > > > > > Signed-off-by: Eddie James <eajames@linux.ibm.com> > > > --- > > > .../fsi/aspeed,ast2600-fsi-master.yaml | 72 +++++++++++++++++++ > > > .../bindings/fsi/fsi-master-aspeed.txt | 36 ---------- > > > 2 files changed, 72 insertions(+), 36 deletions(-) > > > create mode 100644 Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > > > delete mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt > > > > > > diff --git a/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > > > new file mode 100644 > > > index 000000000000..f053e3e1d259 > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml > > > @@ -0,0 +1,72 @@ > > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > > +%YAML 1.2 > > > +--- > > > +$id: http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml# > > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > > + > > > +title: Aspeed FSI master > > > + > > > +maintainers: > > > + - Eddie James <eajames@linux.ibm.com> > > > + > > > +description: > > > + The AST2600 and later contain two identical FSI masters. They share a > > > + clock and have a separate interrupt line and output pins. > > > + > > > +properties: > > > + compatible: > > > + enum: > > > + - "aspeed,ast2600-fsi-master" > > > + - "aspeed,ast2700-fsi-master" > > This wasn't tested. No quotes. Do you see any other example like this? > > > Strangely this passes make dt_binding_check for me... And Rob's bot didn't > seem to catch it either. Just an oversight, I'll fix it. Disabled due to yamllint bug. The fix is now released, so that reminds me to go enable it. Rob
diff --git a/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml new file mode 100644 index 000000000000..f053e3e1d259 --- /dev/null +++ b/Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml @@ -0,0 +1,72 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/fsi/aspeed,ast2600-fsi-master.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Aspeed FSI master + +maintainers: + - Eddie James <eajames@linux.ibm.com> + +description: + The AST2600 and later contain two identical FSI masters. They share a + clock and have a separate interrupt line and output pins. + +properties: + compatible: + enum: + - "aspeed,ast2600-fsi-master" + - "aspeed,ast2700-fsi-master" + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + cfam-reset-gpios: + maxItems: 1 + description: + Output GPIO pin for CFAM reset + + fsi-routing-gpios: + maxItems: 1 + description: + Output GPIO pin for setting the FSI mux (internal or cabled) + + fsi-mux-gpios: + maxItems: 1 + description: + Input GPIO pin for detecting the desired FSI mux state + + interrupts: + maxItems: 1 + +allOf: + - $ref: fsi-controller.yaml# + +required: + - compatible + - reg + - clocks + - interrupts + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/ast2600-clock.h> + #include <dt-bindings/gpio/aspeed-gpio.h> + #include <dt-bindings/interrupt-controller/arm-gic.h> + fsi-master@1e79b000 { + compatible = "aspeed,ast2600-fsi-master"; + reg = <0x1e79b000 0x94>; + interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fsi1_default>; + clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>; + fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>; + cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>; + }; diff --git a/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt b/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt deleted file mode 100644 index 9853fefff5d8..000000000000 --- a/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt +++ /dev/null @@ -1,36 +0,0 @@ -Device-tree bindings for AST2600 FSI master -------------------------------------------- - -The AST2600 contains two identical FSI masters. They share a clock and have a -separate interrupt line and output pins. - -Required properties: - - compatible: "aspeed,ast2600-fsi-master" - - reg: base address and length - - clocks: phandle and clock number - - interrupts: platform dependent interrupt description - - pinctrl-0: phandle to pinctrl node - - pinctrl-names: pinctrl state - -Optional properties: - - cfam-reset-gpios: GPIO for CFAM reset - - - fsi-routing-gpios: GPIO for setting the FSI mux (internal or cabled) - - fsi-mux-gpios: GPIO for detecting the desired FSI mux state - - -Examples: - - fsi-master { - compatible = "aspeed,ast2600-fsi-master", "fsi-master"; - reg = <0x1e79b000 0x94>; - interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fsi1_default>; - clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; - - fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>; - fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>; - - cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>; - };
Switch to yaml for the AST2600 FSI master documentation. Signed-off-by: Eddie James <eajames@linux.ibm.com> --- .../fsi/aspeed,ast2600-fsi-master.yaml | 72 +++++++++++++++++++ .../bindings/fsi/fsi-master-aspeed.txt | 36 ---------- 2 files changed, 72 insertions(+), 36 deletions(-) create mode 100644 Documentation/devicetree/bindings/fsi/aspeed,ast2600-fsi-master.yaml delete mode 100644 Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt