ARM: dts: / gpio: Add dtschema for NXP PCA953x and correct dts
Subsystems (8)
v2 cover ARM: dts: / gpio: Add dtschema for NXP PCA953x and correct dts
Hi,
Changes since v1:
1. Patch 1: Use additionalProperties, Add wakeup-source, Add hogs, Extend example with hogs.
2. New patches: 3, 4, 5, 6, 7, 9, 10, 12, 14 and 15.
The patches could be picked up independently if dtschema makes sense. The fixes for pins make sense anyway, regardless of dtschema.
Best regards,
Krzysztof
Krzysztof Kozlowski (15):
dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
dt-bindings: gpio: convert bindings for Maxim MAX732x family to
dtschema
arm64: dts: mediatek: fix tca6416 reset GPIOs in pumpkin
arm64: dts: mediatek: align GPIO hog names with dtschema
arm64: dts: renesas: align GPIO hog names with dtschema
arm64: dts: ti: align GPIO hog names with dtschema
arm64: dts: xilinx: align GPIO hog names with dtschema
ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
ARM: dts: am335x: t335: align GPIO hog names with dtschema
ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs
ARM: dts: aspeed: fix PCA95xx GPIO expander properties on Portwell
ARM: dts: aspeed: align GPIO hog names with dtschema
ARM: dts: dove: fix PCA95xx GPIO expander properties on A510
ARM: dts: armada: align GPIO hog names with dtschema
ARM: dts: imx6q: align GPIO hog names with dtschema
.../devicetree/bindings/gpio/gpio-max732x.txt | 58 ----- .../devicetree/bindings/gpio/gpio-pca953x.txt | 90 ------- .../bindings/gpio/gpio-pca95xx.yaml | 234 ++++++++++++++++++ .../devicetree/bindings/trivial-devices.yaml | 4 - arch/arm/boot/dts/am335x-lxm.dts | 4 + arch/arm/boot/dts/am335x-sbc-t335.dts | 4 +- arch/arm/boot/dts/am3874-iceboard.dts | 8 +- arch/arm/boot/dts/armada-388-clearfog.dts | 4 +- arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +- arch/arm/boot/dts/armada-388-helios4.dts | 6 +- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 16 +- .../boot/dts/aspeed-bmc-portwell-neptune.dts | 2 + arch/arm/boot/dts/dove-sbc-a510.dts | 1 + arch/arm/boot/dts/imx6q-b450v3.dts | 14 +- arch/arm/boot/dts/imx6q-b650v3.dts | 12 +- arch/arm/boot/dts/imx6q-b850v3.dts | 4 +- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 12 +- .../boot/dts/mediatek/pumpkin-common.dtsi | 28 +-- .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +- .../dts/ti/k3-j721e-common-proc-board.dts | 4 +- .../boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 +- 24 files changed, 316 insertions(+), 227 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
Signature · 1 line
2.17.1
PATCH v2 1/15 dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Convert the NXP PCA953x family of GPIO expanders bindings to device tree schema.
---
Changes since v1:
1. Use additionalProperties.
2. Add wakeup-source.
3. Add hogs.
4. Extend example with hogs.
--- .../devicetree/bindings/gpio/gpio-pca953x.txt | 90 ---------- .../bindings/gpio/gpio-pca95xx.yaml | 166 ++++++++++++++++++ .../devicetree/bindings/trivial-devices.yaml | 4 - 3 files changed, 166 insertions(+), 94 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
Documentation/devicetree/bindings/gpio/gpio-pca953x.txt deleted +0 -90
@@ -1,90 +0,0 @@ -* NXP PCA953x I2C GPIO multiplexer - -Required properties: - - compatible: Has to contain one of the following: - nxp,pca6416 - nxp,pca9505 - nxp,pca9534 - nxp,pca9535 - nxp,pca9536 - nxp,pca9537 - nxp,pca9538 - nxp,pca9539 - nxp,pca9554 - nxp,pca9555 - nxp,pca9556 - nxp,pca9557 - nxp,pca9574 - nxp,pca9575 - nxp,pca9698 - nxp,pcal6416 - nxp,pcal6524 - nxp,pcal9535 - nxp,pcal9555a - maxim,max7310 - maxim,max7312 - maxim,max7313 - maxim,max7315 - ti,pca6107 - ti,pca9536 - ti,tca6408 - ti,tca6416 - ti,tca6424 - ti,tca9539 - ti,tca9554 - onnn,cat9554 - onnn,pca9654 - exar,xra1202 - - gpio-controller: if used as gpio expander. - - #gpio-cells: if used as gpio expander. - - interrupt-controller: if to be used as interrupt expander. - - #interrupt-cells: if to be used as interrupt expander. - -Optional properties: - - interrupts: interrupt specifier for the device's interrupt output. - - reset-gpios: GPIO specification for the RESET input. This is an - active low signal to the PCA953x. - - vcc-supply: power supply regulator. - -Example: - - - gpio at 20 { - compatible = "nxp,pca9505"; - reg = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pca9505>; - gpio-controller; - #gpio-cells = <2>; - interrupt-parent = <&gpio3>; - interrupts = <23 IRQ_TYPE_LEVEL_LOW>; - }; - - -Example with Interrupts: - - - gpio99: gpio at 22 { - compatible = "nxp,pcal6524"; - reg = <0x22>; - interrupt-parent = <&gpio6>; - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* gpio6_161 */ - interrupt-controller; - #interrupt-cells = <2>; - vcc-supply = <&vdds_1v8_main>; - gpio-controller; - #gpio-cells = <2>; - gpio-line-names = - "hdmi-ct-hpd", "hdmi.ls-oe", "p02", "p03", "vibra", "fault2", "p06", "p07", - "en-usb", "en-host1", "en-host2", "chg-int", "p14", "p15", "mic-int", "en-modem", - "shdn-hs-amp", "chg-status+red", "green", "blue", "en-esata", "fault1", "p26", "p27"; - }; - - ts3a227 at 3b { - compatible = "ti,ts3a227e"; - reg = <0x3b>; - interrupt-parent = <&gpio99>; - interrupts = <14 IRQ_TYPE_EDGE_RISING>; - ti,micbias = <0>; /* 2.1V */ - }; -
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +166 -0
166 lines not on this page · raw message
Documentation/devicetree/bindings/trivial-devices.yaml +0 -4
@@ -322,10 +322,6 @@ properties: - nuvoton,npct601 # Nuvoton Temperature Sensor - nuvoton,w83773g - # Octal SMBus and I2C registered interface - - nxp,pca9556 - # 8-bit I2C-bus and SMBus I/O port with reset - - nxp,pca9557 # OKI ML86V7667 video decoder - oki,ml86v7667 # OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI and Embedded TrueFocus
Signature · 1 line
2.17.1
Nishanth Menon
maintainerRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":
I wonder if "hog" is too generic and might clash with "something-hog" in the future?
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 11 lines · Nishanth Menon
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":I wonder if "hog" is too generic and might clash with "something-hog" in the future?
This pattern is already used in Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml. It will match only children and so far it did not find any other nodes in ARM and ARM64 dts. I don't expect clashes. Also the question is then - if one adds a child of GPIO expander named "foobar-hog" and it is not a GPIO hog, then what is it?
Best regards,
Krzysztof
Nishanth Menon
maintainerRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 13 lines · Krzysztof Kozlowski
Quoted 11 lines · Nishanth Menon
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":I wonder if "hog" is too generic and might clash with "something-hog" in the future?
Quoted 6 lines
This pattern is already used in
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml. It will match only children and so far it did not find any other nodes in ARM and ARM64 dts. I don't expect clashes. Also the question is then - if one adds a child of GPIO expander named "foobar-hog" and it is not a GPIO hog, then what is it?
Probably a nitpick.. but then,.. I have'nt seen us depend on hierarchy for uniqueness of naming.. we choose for example "bus" no matter where in the hierarchy it falls in, as long it is a bus.. etc.. same argument holds good for properties as well.. "gpio-hog;" is kinda redundant if you think of it for a compatible that is already gpio ;)..
I did'nt mean to de-rail the discussion, but was curious what the DT maintainers think..
Signature · 3 lines
Regards, Nishanth Menon Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
Rob Herring
maintainerRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 21 lines · Nishanth Menon
Quoted 13 lines · Krzysztof Kozlowski
Quoted 11 lines · Nishanth Menon
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":I wonder if "hog" is too generic and might clash with "something-hog" in the future?
Quoted 6 lines
This pattern is already used in
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml. It will match only children and so far it did not find any other nodes in ARM and ARM64 dts. I don't expect clashes. Also the question is then - if one adds a child of GPIO expander named "foobar-hog" and it is not a GPIO hog, then what is it?
Quoted 8 lines
Probably a nitpick.. but then,.. I have'nt seen us depend on hierarchy for uniqueness of naming.. we choose for example "bus" no matter where in the hierarchy it falls in, as long it is a bus.. etc.. same argument holds good for properties as well.. "gpio-hog;" is kinda redundant if you think of it for a compatible that is already gpio ;)..
I did'nt mean to de-rail the discussion, but was curious what the DT maintainers think..
Not really a fan of gpio-hog binding to have another type of hog nor can I imagine what that would be.
Rob
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
In reply to Krzysztof KozlowskiHi Krzysztof,
Quoted 12 lines · Krzysztof Kozlowski
Quoted 10 lines · Nishanth Menon
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":I wonder if "hog" is too generic and might clash with "something-hog" in the future?
Quoted 6 lines
This pattern is already used in
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml. It will match only children and so far it did not find any other nodes in ARM and ARM64 dts. I don't expect clashes. Also the question is then - if one adds a child of GPIO expander named "foobar-hog" and it is not a GPIO hog, then what is it?
Perhaps you didn't find any other nodes as children of pca953x controllers?
There are other hog nodes in other types of GPIO controllers. Typically they're named after the purpose, e.g. "wifi-disable", "i2c3_mux_oe_n", "pcie_sata_switch", "lcd0_mux".
IMHO it's a hog if it contains a "gpio-hog" property, regardless of node naming.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus TorvaldsRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 23 lines · Geert Uytterhoeven
Hi Krzysztof,
Quoted 12 lines · Krzysztof Kozlowski
Quoted 10 lines · Nishanth Menon
On 19:57-20200910, Krzysztof Kozlowski wrote:
[...]Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 82
Quoted 5 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +5
-0+ wakeup-source: + $ref: /schemas/types.yaml#/definitions/flag + +patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$":I wonder if "hog" is too generic and might clash with "something-hog" in the future?
Quoted 6 lines
This pattern is already used in
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml. It will match only children and so far it did not find any other nodes in ARM and ARM64 dts. I don't expect clashes. Also the question is then - if one adds a child of GPIO expander named "foobar-hog" and it is not a GPIO hog, then what is it?
Quoted 2 lines
Perhaps you didn't find any other nodes as children of pca953x controllers?
There shouldn't be.. unless one makes some i2c-gpio controller under such GPIO expander. But now it wouldn't be instantiated as expander is not a bus.
Quoted 6 lines
There are other hog nodes in other types of GPIO controllers. Typically they're named after the purpose, e.g. "wifi-disable", "
i2c3_mux_oe_n", "pcie_sata_switch", "lcd0_mux".IMHO it's a hog if it contains a "gpio-hog" property, regardless of node naming.
Yes. The question is then whether to expect the "hog" in name. Just like we expect for all other device nodes to represent the class.
Best regards,
Krzysztof
Joel Stanley
maintainerRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
In reply to Krzysztof KozlowskiQuoted 17 lines · Krzysztof Kozlowski
Convert the NXP PCA953x family of GPIO expanders bindings to device tree schema.
Signed-off-by Krzysztof Kozlowski <[email protected]>Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +11
-0+patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$": + type: object + properties: + gpio-hog: true + gpios: true + input: true + output-high: true + output-low: true + line-name: true +
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 129
Quoted 10 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +9
-0+ required: + - gpio-hog + - gpios + + usb3-sata-sel-hog { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "usb3_sata_sel";
I would prefer we didn't require the addition of hte -hog prefix. It's mostly just a matter of taste, but I can think of a few more concrete reasons:
We don't require -high or -low prefixes, so the node name doesn't need to describe the properties that will be found below.
Changing around node names for existing boards carries with it the chance of userspace breakage (as sysfs paths change). I would prefer we avoid that if possible.
Cheers,
Joel
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 30 lines · Joel Stanley
Quoted 17 lines · Krzysztof Kozlowski
Convert the NXP PCA953x family of GPIO expanders bindings to device tree schema.
Signed-off-by Krzysztof Kozlowski <[email protected]>Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +11
-0+patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$": + type: object + properties: + gpio-hog: true + gpios: true + input: true + output-high: true + output-low: true + line-name: true +Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 129
Quoted 10 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +9
-0+ required: + - gpio-hog + - gpios + + usb3-sata-sel-hog { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "usb3_sata_sel";
Quoted 6 lines
I would prefer we didn't require the addition of hte -hog prefix. It's mostly just a matter of taste, but I can think of a few more concrete reasons:
We don't require -high or -low prefixes, so the node name doesn't need to describe the properties that will be found below.
Thanks for the comments.
It is not about properties (high or low) but the role of a device node. The node names should represent a generic class of device (ePAPR and device tree spec) and "hog" is such class.
The Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml already uses such naming so the best would be to unify.
Quoted 4 lines
Changing around node names for existing boards carries with it the chance of userspace breakage (as sysfs paths change). I would prefer we avoid that if possible.
The impact on userspace is indeed important, but are you sure that hogs are visible to user-space via sysfs and configurable? I guess you think of deprecated CONFIG_GPIO_SYSFS?
Rob,
Any hints from you about hog-naming?
Best regards,
Krzysztof
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 38 lines · Krzysztof Kozlowski
Quoted 30 lines · Joel Stanley
Quoted 17 lines · Krzysztof Kozlowski
Convert the NXP PCA953x family of GPIO expanders bindings to device tree schema.
Signed-off-by Krzysztof Kozlowski <[email protected]>Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +11
-0+patternProperties: + "^(hog-[0-9]+|.+-hog(-[0-9]+)?)$": + type: object + properties: + gpio-hog: true + gpios: true + input: true + output-high: true + output-low: true + line-name: true +Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml line 129
Quoted 10 lines
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml new file +9
-0+ required: + - gpio-hog + - gpios + + usb3-sata-sel-hog { + gpio-hog; + gpios = <4 GPIO_ACTIVE_HIGH>; + output-low; + line-name = "usb3_sata_sel";Quoted 6 lines
I would prefer we didn't require the addition of hte -hog prefix. It's mostly just a matter of taste, but I can think of a few more concrete reasons:
We don't require -high or -low prefixes, so the node name doesn't need to describe the properties that will be found below.
Quoted 8 lines
Thanks for the comments.
It is not about properties (high or low) but the role of a device node. The node names should represent a generic class of device (ePAPR and device tree spec) and "hog" is such class.
The
Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yamlalready uses such naming so the best would be to unify.
In my opinion, It's not right to define this on per gpio-controller and introduce such per gpio-controller restrictions.
More over, there is already generic schema for gpio hogs: gpio-hog.yaml Originally, gpio bindings were defined without restricting gpio hog node names and, generic schema follows this.
I think, the generic "gpio-hogs" sub-node may be introduced to place gpio hogs child nodes, if gpio hogs node names restriction need to be introduces (*which i'm not sure is reasonable*).
gpio at 20 {
gpio-hogs {
yyy-hog {
gpio-hog;
gpios
}
}But this require as gpio code as generic gpio schema update (with backward compatibility in mind).
Quoted 16 lines
Quoted 5 lines
Changing around node names for existing boards carries with it the chance of userspace breakage (as sysfs paths change). I would prefer we avoid that if possible.
The impact on userspace is indeed important, but are you sure that hogs are visible to user-space via sysfs and configurable? I guess you think of deprecated
CONFIG_GPIO_SYSFS?Rob,
Any hints from you about hog-naming?Best regards,
Krzysztof
Signature · 2 lines
Best regards, grygorii
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 1 line · Grygorii Strashko
More over, there is already generic schema for gpio hogs:
gpio-hog.yaml
Where is this? I don't have it in my GPIO devel branch for sure, and it is not in linux-next either so not in Bartosz' tree.
I did suggest that I want a gpio-common.yaml file which includes the hogs.
Quoted 14 lines
Originally, gpio bindings were defined without restricting gpio hog node names and, generic schema follows this.
I think, the generic "gpio-hogs" sub-node may be introduced to place gpio hogs child nodes, if gpio hogs node names restriction need to be introduces (*which i'm not sure is reasonable*).
gpio at 20 { gpio-hogs { yyy-hog { gpio-hog; gpios } }
Quoted 1 line
But this require as gpio code as generic gpio schema update (with backward compatibility in mind).
The whole problem I have with the DT bindings is that defining them is not really a Linux problem and the people maintaining it even want to move it out of the Linux kernel tree. It is supposedly the responsibility of all operating systems using device tree including but not limited to BSD and Zephyr.
But there is noone picking up the responsibility outside of the Linux kernel tree except for Rob and Rob cannot do everything.
With things like this it breaks apart because noone takes the overall responsibility. And as subsystem maintainer I am fully overloaded with the Linux side of things.
This is of course not your or anyone else's fault. But:
GPIO DT binding maintainers/writers wanted!
Yours,
Linus Walleij
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
Quoted 10 lines · Linus Walleij
Quoted 1 line · Grygorii Strashko
More over, there is already generic schema for gpio hogs:
gpio-hog.yamlWhere is this? I don't have it in my GPIO devel branch for sure, and it is not in linux-next either so not in Bartosz' tree.
I did suggest that I want a
gpio-common.yamlfile which includes the hogs.
There it is (am I missing smth?):
pip3 install git+https://github.com/devicetree-org/dt-schema.git at master
as per:
https://www.kernel.org/doc/html/latest/devicetree/writing-schema.html
Signature · 2 lines
Best regards, grygorii
Rob Herring
maintainerRe: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
In reply to Linus WalleijQuoted 7 lines · Linus Walleij
Quoted 1 line · Grygorii Strashko
More over, there is already generic schema for gpio hogs:
gpio-hog.yamlWhere is this? I don't have it in my GPIO devel branch for sure, and it is not in linux-next either so not in Bartosz' tree.
https://github.com/devicetree-org/dt-schema/tree/master/schemas/gpio
Quoted 3 lines
I did suggest that I want a
gpio-common.yamlfile which includes the hogs.
Already there, but not wired together ATM.
Quoted 2 lines
Quoted 2 lines
Originally, gpio bindings were defined without restricting gpio hog node names and, generic schema follows this.
Originally, almost all node names were a free-for-all even for classes defined 20 years ago. Now the names are getting enforced.
Rob
Re: [PATCH v2 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema
In reply to Krzysztof KozlowskiQuoted 12 lines · Krzysztof Kozlowski
Convert the NXP PCA953x family of GPIO expanders bindings to device tree schema.
Signed-off-by Krzysztof Kozlowski <[email protected]>---
Changes since v1:
1. Use additionalProperties.
2. Add wakeup-source.
3. Add hogs.
4. Extend example with hogs.
Quoted 8 lines
--- .../devicetree/bindings/gpio/gpio-pca953x.txt | 90 ---------- .../bindings/gpio/gpio-pca95xx.yaml | 166 ++++++++++++++++++ .../devicetree/bindings/trivial-devices.yaml | 4 - 3 files changed, 166 insertions(+), 94 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
PATCH v2 2/15 dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema
In reply to Krzysztof KozlowskiConvert the Maxim MAX732x family of GPIO expanders bindings to device tree schema by merging it with existing PCA95xx schema. These are quite similar so merging reduces duplication.
--- .../devicetree/bindings/gpio/gpio-max732x.txt | 58 --------------- .../bindings/gpio/gpio-pca95xx.yaml | 72 ++++++++++++++++++- 2 files changed, 70 insertions(+), 60 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt
Documentation/devicetree/bindings/gpio/gpio-max732x.txt deleted +0 -58
@@ -1,58 +0,0 @@ -* MAX732x-compatible I/O expanders - -Required properties: - - compatible: Should be one of the following: - - "maxim,max7319": For the Maxim MAX7319 - - "maxim,max7320": For the Maxim MAX7320 - - "maxim,max7321": For the Maxim MAX7321 - - "maxim,max7322": For the Maxim MAX7322 - - "maxim,max7323": For the Maxim MAX7323 - - "maxim,max7324": For the Maxim MAX7324 - - "maxim,max7325": For the Maxim MAX7325 - - "maxim,max7326": For the Maxim MAX7326 - - "maxim,max7327": For the Maxim MAX7327 - - reg: I2C slave address for this device. - - gpio-controller: Marks the device node as a GPIO controller. - - #gpio-cells: Should be 2. - - first cell is the GPIO number - - second cell specifies GPIO flags, as defined in <dt-bindings/gpio/gpio.h>. - Only the GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW flags are supported. - -Optional properties: - - The I/O expander can detect input state changes, and thus optionally act as - an interrupt controller. When the expander interrupt line is connected all the - following properties must be set. For more information please see the - interrupt controller device tree bindings documentation available at - Documentation/devicetree/bindings/interrupt-controller/interrupts.txt. - - - interrupt-controller: Identifies the node as an interrupt controller. - - #interrupt-cells: Number of cells to encode an interrupt source, shall be 2. - - first cell is the pin number - - second cell is used to specify flags - - interrupts: Interrupt specifier for the controllers interrupt. - -Please refer to gpio.txt in this directory for details of the common GPIO -bindings used by client devices. - -Example 1. MAX7325 with interrupt support enabled (CONFIG_GPIO_MAX732X_IRQ=y): - - expander: max7325 at 6d { - compatible = "maxim,max7325"; - reg = <0x6d>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - interrupt-parent = <&gpio4>; - interrupts = <29 IRQ_TYPE_EDGE_FALLING>; - }; - -Example 2. MAX7325 with interrupt support disabled (CONFIG_GPIO_MAX732X_IRQ=n): - - expander: max7325 at 6d { - compatible = "maxim,max7325"; - reg = <0x6d>; - gpio-controller; - #gpio-cells = <2>; - };
Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml +70 -2
102 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v2 02/15] dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema
Quoted 5 lines · Krzysztof Kozlowski
Convert the Maxim MAX732x family of GPIO expanders bindings to device tree schema by merging it with existing PCA95xx schema. These are quite similar so merging reduces duplication.
Signed-off-by Krzysztof Kozlowski <[email protected]>
Can I just apply this one patch to the GPIO tree?
Yours,
Linus Walleij
Re: [PATCH v2 02/15] dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema
Quoted 9 lines · Linus Walleij
Quoted 5 lines · Krzysztof Kozlowski
Convert the Maxim MAX732x family of GPIO expanders bindings to device tree schema by merging it with existing PCA95xx schema. These are quite similar so merging reduces duplication.
Signed-off-by Krzysztof Kozlowski <[email protected]>Can I just apply this one patch to the GPIO tree?
No, this requires the previous one (1/15) because it merges the max732x into pca95xx.
Although now Rob reviewed both so you can pick them up.
Best regards,
Krzysztof
Re: [PATCH v2 02/15] dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema
Quoted 7 lines · Krzysztof Kozlowski
Quoted 6 lines · Linus Walleij
Quoted 4 lines · Krzysztof Kozlowski
Convert the Maxim MAX732x family of GPIO expanders bindings to device tree schema by merging it with existing PCA95xx schema. These are quite similar so merging reduces duplication.
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Krzysztof Kozlowski <[email protected]>Can I just apply this one patch to the GPIO tree?
No, this requires the previous one (1/15) because it merges the max732x into pca95xx.
Although now Rob reviewed both so you can pick them up.
I found now one comment from Rob so I will send a v3.
Best regards,
Krzysztof
Re: [PATCH v2 02/15] dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema
In reply to Krzysztof KozlowskiQuoted 11 lines · Krzysztof Kozlowski
Convert the Maxim MAX732x family of GPIO expanders bindings to device tree schema by merging it with existing PCA95xx schema. These are quite similar so merging reduces duplication.
Signed-off-by Krzysztof Kozlowski <[email protected]>--- .../devicetree/bindings/gpio/gpio-max732x.txt | 58 --------------- .../bindings/gpio/gpio-pca95xx.yaml | 72 ++++++++++++++++++- 2 files changed, 70 insertions(+), 60 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt
PATCH v2 3/15 arm64: dts: mediatek: fix tca6416 reset GPIOs in pumpkin
In reply to Krzysztof KozlowskiCorrect the property for reset GPIOs of tca6416 GPIO expander.
--- arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +1 -1
@@ -56,7 +56,7 @@ tca6416: gpio at 20 { compatible = "ti,tca6416"; reg = <0x20>; - rst-gpio = <&pio 65 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 65 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&tca6416_pins>;
Signature · 1 line
2.17.1
Re: [PATCH v2 03/15] arm64: dts: mediatek: fix tca6416 reset GPIOs in pumpkin
Quoted 3 lines · Krzysztof Kozlowski
Correct the property for reset GPIOs of tca6416 GPIO expander.
Signed-off-by Krzysztof Kozlowski <[email protected]>
Applied to v5.9-next/dts64
Thanks!
Quoted 18 lines
--- arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +1
-1@@ -56,7 +56,7 @@ tca6416: gpio at 20 { compatible = "ti,tca6416"; reg = <0x20>; - rst-gpio = <&pio 65 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 65 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; pinctrl-0 = <&tca6416_pins>;
PATCH v2 4/15 arm64: dts: mediatek: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx requires GPIO hogs to end with 'hog' prefix.
--- .../boot/dts/mediatek/pumpkin-common.dtsi | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi +13 -13
@@ -63,91 +63,91 @@ gpio-controller; #gpio-cells = <2>; - eint20_mux_sel0 { + eint20-mux-sel0-hog { gpio-hog; gpios = <0 0>; input; line-name = "eint20_mux_sel0"; }; - expcon_mux_sel1 { + expcon-mux-sel1-hog { gpio-hog; gpios = <1 0>; input; line-name = "expcon_mux_sel1"; }; - mrg_di_mux_sel2 { + mrg-di-mux-sel2-hog { gpio-hog; gpios = <2 0>; input; line-name = "mrg_di_mux_sel2"; }; - sd_sdio_mux_sel3 { + sd-sdio-mux-sel3-hog { gpio-hog; gpios = <3 0>; input; line-name = "sd_sdio_mux_sel3"; }; - sd_sdio_mux_ctrl7 { + sd-sdio-mux-ctrl7-hog { gpio-hog; gpios = <7 0>; output-low; line-name = "sd_sdio_mux_ctrl7"; }; - hw_id0 { + hw-id0-hog { gpio-hog; gpios = <8 0>; input; line-name = "hw_id0"; }; - hw_id1 { + hw-id1-hog { gpio-hog; gpios = <9 0>; input; line-name = "hw_id1"; }; - hw_id2 { + hw-id2-hog { gpio-hog; gpios = <10 0>; input; line-name = "hw_id2"; }; - fg_int_n { + fg-int-n-hog { gpio-hog; gpios = <11 0>; input; line-name = "fg_int_n"; }; - usba_pwr_en { + usba-pwr-en-hog { gpio-hog; gpios = <12 0>; output-high; line-name = "usba_pwr_en"; }; - wifi_3v3_pg { + wifi-3v3-pg-hog { gpio-hog; gpios = <13 0>; input; line-name = "wifi_3v3_pg"; }; - cam_rst { + cam-rst-hog { gpio-hog; gpios = <14 0>; output-low; line-name = "cam_rst"; }; - cam_pwdn { + cam-pwdn-hog { gpio-hog; gpios = <15 0>; output-low;
Signature · 1 line
2.17.1
PATCH v2 5/15 arm64: dts: renesas: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx requires GPIO hogs to end with 'hog' prefix.
--- .../boot/dts/renesas/r8a77951-salvator-xs.dts | 2 +- .../boot/dts/renesas/r8a77965-salvator-xs.dts | 2 +- arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts +1 -1
@@ -118,7 +118,7 @@ }; &pca9654 { - pcie_sata_switch { + pcie-sata-switch-hog { gpio-hog; gpios = <7 GPIO_ACTIVE_HIGH>; output-low; /* enable SATA by default */
arch/arm64/boot/dts/renesas/r8a77965-salvator-xs.dts +1 -1
@@ -55,7 +55,7 @@ }; &pca9654 { - pcie_sata_switch { + pcie-sata-switch-hog { gpio-hog; gpios = <7 GPIO_ACTIVE_HIGH>; output-low; /* enable SATA by default */
arch/arm64/boot/dts/renesas/ulcb-kf.dtsi +7 -7
@@ -143,49 +143,49 @@ interrupt-parent = <&gpio6>; interrupts = <8 IRQ_TYPE_EDGE_FALLING>; - audio_out_off { + audio-out-off-hog { gpio-hog; gpios = <0 GPIO_ACTIVE_HIGH>; /* P00 */ output-high; line-name = "Audio_Out_OFF"; }; - hub_pwen { + hub-pwen-hog { gpio-hog; gpios = <6 GPIO_ACTIVE_HIGH>; output-high; line-name = "HUB pwen"; }; - hub_rst { + hub-rst-hog { gpio-hog; gpios = <7 GPIO_ACTIVE_HIGH>; output-high; line-name = "HUB rst"; }; - otg_extlpn { + otg-extlpn-hog { gpio-hog; gpios = <9 GPIO_ACTIVE_HIGH>; output-high; line-name = "OTG EXTLPn"; }; - otg_offvbusn { + otg-offvbusn-hog { gpio-hog; gpios = <8 GPIO_ACTIVE_HIGH>; output-low; line-name = "OTG OFFVBUSn"; }; - sd-wifi-mux { + sd-wifi-mux-hog { gpio-hog; gpios = <5 GPIO_ACTIVE_HIGH>; output-low; /* Connect WL1837 */ line-name = "SD WiFi mux"; }; - snd_rst { + snd-rst-hog { gpio-hog; gpios = <15 GPIO_ACTIVE_HIGH>; /* P17 */ output-high;
Signature · 1 line
2.17.1
PATCH v2 6/15 arm64: dts: ti: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx requires GPIO hogs to end with 'hog' prefix.
--- arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +2 -2
@@ -407,7 +407,7 @@ gpio-controller; #gpio-cells = <2>; - p09 { + p09-hog { /* P11 - MCASP/TRACE_MUX_S0 */ gpio-hog; gpios = <9 GPIO_ACTIVE_HIGH>;
@@ -415,7 +415,7 @@ line-name = "MCASP/TRACE_MUX_S0"; }; - p10 { + p10-hog { /* P12 - MCASP/TRACE_MUX_S1 */ gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.17.1
PATCH v2 7/15 arm64: dts: xilinx: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx requires GPIO hogs to end with 'hog' prefix.
--- arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts +4 -4
@@ -203,25 +203,25 @@ gpio-line-names = "PS_GTR_LAN_SEL0", "PS_GTR_LAN_SEL1", "PS_GTR_LAN_SEL2", "PS_GTR_LAN_SEL3", "PCI_CLK_DIR_SEL", "IIC_MUX_RESET_B", "GEM3_EXP_RESET_B", "", "", "", "", "", "", "", "", ""; - gtr-sel0 { + gtr-sel0-hog { gpio-hog; gpios = <0 0>; output-low; /* PCIE = 0, DP = 1 */ line-name = "sel0"; }; - gtr-sel1 { + gtr-sel1-hog { gpio-hog; gpios = <1 0>; output-high; /* PCIE = 0, DP = 1 */ line-name = "sel1"; }; - gtr-sel2 { + gtr-sel2-hog { gpio-hog; gpios = <2 0>; output-high; /* PCIE = 0, USB0 = 1 */ line-name = "sel2"; }; - gtr-sel3 { + gtr-sel3-hog { gpio-hog; gpios = <3 0>; output-high; /* PCIE = 0, SATA = 1 */
Signature · 1 line
2.17.1
PATCH v2 8/15 ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
In reply to Krzysztof KozlowskiThe PCA9539 GPIO expander requires GPIO controller properties to operate properly.
--- arch/arm/boot/dts/am335x-lxm.dts | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/boot/dts/am335x-lxm.dts +4 -0
@@ -160,11 +160,15 @@ serial_config1: serial_config1 at 20 { compatible = "nxp,pca9539"; reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; }; serial_config2: serial_config2 at 21 { compatible = "nxp,pca9539"; reg = <0x21>; + gpio-controller; + #gpio-cells = <2>; }; tps: tps at 2d {
Signature · 1 line
2.17.1
Re: [PATCH v2 08/15] ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties
Quoted 4 lines · Krzysztof Kozlowski
The PCA9539 GPIO expander requires GPIO controller properties to operate properly.
Signed-off-by Krzysztof Kozlowski <[email protected]>
I forgot to add here Ack from v1:
Tony,
I think it should go through sub-architecture maintainers, not as entire series.
Best regards,
Krzysztof
PATCH v2 9/15 ARM: dts: am335x: t335: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx expects GPIO hogs to end with 'hog' prefix.
--- arch/arm/boot/dts/am335x-sbc-t335.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am335x-sbc-t335.dts +2 -2
@@ -155,13 +155,13 @@ gpio-controller; #gpio-cells = <2>; reg = <0x26>; - dvi_ena { + dvi-ena-hog { gpio-hog; gpios = <13 GPIO_ACTIVE_HIGH>; output-high; line-name = "dvi-enable"; }; - lcd_ena { + lcd-ena-hog { gpio-hog; gpios = <11 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.17.1
PATCH v2 10/15 ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs
In reply to Krzysztof KozlowskiCorrect the property for reset GPIOs of the GPIO expander.
--- arch/arm/boot/dts/am3874-iceboard.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/am3874-iceboard.dts +4 -4
@@ -195,7 +195,7 @@ "FMCA_PG_C2M", "FMCA_PRSNT_M2C_L", "FMCA_CLK_DIR", "SFP_LOS", "FMCB_EN_12V0", "FMCB_EN_3V3", "FMCB_EN_VADJ", "FMCB_PG_M2C", "FMCB_PG_C2M", "FMCB_PRSNT_M2C_L", "FMCB_CLK_DIR", "SFP_ModPrsL"; - reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; u42: pca9575 at 21 {
@@ -208,7 +208,7 @@ "QSFPA_LPMode", "QSFPB_ModPrsL", "QSFPB_IntL", "QSFPB_ResetL", "SFP_TxFault", "SFP_TxDisable", "SFP_RS0", "SFP_RS1", "QSFPB_ModSelL", "QSFPB_LPMode", "SEL_SFP", "ARM_MR"; - reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; u48: pca9575 at 22 {
@@ -227,7 +227,7 @@ "GP_SW5", "GP_SW6", "GP_SW7", "GP_SW8", "GP_LED8", "GP_LED7", "GP_LED6", "GP_LED5", "GP_LED4", "GP_LED3", "GP_LED2", "GP_LED1"; - reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; u59: pca9575 at 23 {
@@ -240,7 +240,7 @@ "GTX1V8PowerFault", "PHYAPowerFault", "PHYBPowerFault", "ArmPowerFault", "BP_SLOW_GPIO0", "BP_SLOW_GPIO1", "BP_SLOW_GPIO2", "BP_SLOW_GPIO3", "BP_SLOW_GPIO4", "BP_SLOW_GPIO5", "__unused_u59_p16", "__unused_u59_p17"; - reset_gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio2 11 GPIO_ACTIVE_LOW>; }; tmp100 at 48 { compatible = "ti,tmp100"; reg = <0x48>; };
Signature · 1 line
2.17.1
PATCH v2 11/15 ARM: dts: aspeed: fix PCA95xx GPIO expander properties on Portwell
In reply to Krzysztof KozlowskiThe PCA95xx GPIO expander requires GPIO controller properties to operate properly.
--- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +2 -0
@@ -121,6 +121,8 @@ pca9555 at 27 { compatible = "nxp,pca9555"; reg = <0x27>; + gpio-controller; + #gpio-cells = <2>; }; };
Signature · 1 line
2.17.1
Re: [PATCH v2 11/15] ARM: dts: aspeed: fix PCA95xx GPIO expander properties on Portwell
Quoted 5 lines · Krzysztof Kozlowski
The PCA95xx GPIO expander requires GPIO controller properties to operate properly.
Signed-off-by Krzysztof Kozlowski <[email protected]>
(This device tree can probably be dropped in the future. I heard these boards were very hard to come by even a year or so ago, and I doubt they are still in use.)
Quoted 20 lines
--- arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 ++ 1 file changed, 2 insertions(+)arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts +2
-1@@ -121,6 +121,8 @@ pca9555 at 27 { compatible = "nxp,pca9555"; reg = <0x27>; + gpio-controller; + #gpio-cells = <2>; }; }; --2.17.1
PATCH v2 12/15 ARM: dts: aspeed: align GPIO hog names with dtschema
In reply to Krzysztof Kozlowskidtschema for pca95xx expects GPIO hogs to end with 'hog' prefix.
--- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +1 -1
@@ -560,7 +560,7 @@ gpio-controller; #gpio-cells = <2>; - smbus0 { + smbus0-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts +8 -8
@@ -827,7 +827,7 @@ gpio-controller; #gpio-cells = <2>; - smbus0 { + smbus0-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -852,7 +852,7 @@ gpio-controller; #gpio-cells = <2>; - smbus1 { + smbus1-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -900,7 +900,7 @@ gpio-controller; #gpio-cells = <2>; - smbus2 { + smbus2-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -925,7 +925,7 @@ gpio-controller; #gpio-cells = <2>; - smbus3 { + smbus3-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -992,7 +992,7 @@ gpio-controller; #gpio-cells = <2>; - smbus4 { + smbus4-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -1017,7 +1017,7 @@ gpio-controller; #gpio-cells = <2>; - smbus5 { + smbus5-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -1065,7 +1065,7 @@ gpio-controller; #gpio-cells = <2>; - smbus6 { + smbus6-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
@@ -1090,7 +1090,7 @@ gpio-controller; #gpio-cells = <2>; - smbus7 { + smbus7-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.17.1
Joel Stanley
maintainerRe: [PATCH v2 12/15] ARM: dts: aspeed: align GPIO hog names with dtschema
Quoted 2 lines · Krzysztof Kozlowski
dtschema for pca95xx expects GPIO hogs to end with 'hog' prefix.
This is a bit ugly. Do we have to go down this path?
Quoted 99 lines
Signed-off-by Krzysztof Kozlowski <[email protected]>--- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-)arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +1
-1@@ -560,7 +560,7 @@ gpio-controller; #gpio-cells = <2>; - smbus0 { + smbus0-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts +8
-9@@ -827,7 +827,7 @@ gpio-controller; #gpio-cells = <2>; - smbus0 { + smbus0-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -852,7 +852,7 @@ gpio-controller; #gpio-cells = <2>; - smbus1 { + smbus1-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -900,7 +900,7 @@ gpio-controller; #gpio-cells = <2>; - smbus2 { + smbus2-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -925,7 +925,7 @@ gpio-controller; #gpio-cells = <2>; - smbus3 { + smbus3-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -992,7 +992,7 @@ gpio-controller; #gpio-cells = <2>; - smbus4 { + smbus4-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -1017,7 +1017,7 @@ gpio-controller; #gpio-cells = <2>; - smbus5 { + smbus5-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -1065,7 +1065,7 @@ gpio-controller; #gpio-cells = <2>; - smbus6 { + smbus6-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high;@@ -1090,7 +1090,7 @@ gpio-controller; #gpio-cells = <2>; - smbus7 { + smbus7-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high; --2.17.1
Re: [PATCH v2 12/15] ARM: dts: aspeed: align GPIO hog names with dtschema
Quoted 6 lines · Joel Stanley
Quoted 2 lines · Krzysztof Kozlowski
dtschema for pca95xx expects GPIO hogs to end with 'hog' prefix.
This is a bit ugly. Do we have to go down this path?
No, but please comment on schema (1/15 in this series).
Best regards,
Krzysztof
PATCH v2 13/15 ARM: dts: dove: fix PCA95xx GPIO expander properties on A510
In reply to Krzysztof KozlowskiThe PCA95xx GPIO expander requires GPIO controller properties to operate properly.
--- arch/arm/boot/dts/dove-sbc-a510.dts | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/dove-sbc-a510.dts +1 -0
@@ -143,6 +143,7 @@ gpio_ext: gpio at 20 { compatible = "nxp,pca9555"; reg = <0x20>; + gpio-controller; #gpio-cells = <2>; }; };
Signature · 1 line
2.17.1
PATCH v2 14/15 ARM: dts: armada: align GPIO hog names with dtschema
In reply to Krzysztof KozlowskiThe convention for node names is to use hyphens, not underscores. dtschema for pca95xx requires GPIO hogs to end with 'hog' prefix.
--- arch/arm/boot/dts/armada-388-clearfog.dts | 4 ++-- arch/arm/boot/dts/armada-388-clearfog.dtsi | 10 +++++----- arch/arm/boot/dts/armada-388-helios4.dts | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/armada-388-clearfog.dts +2 -2
@@ -73,13 +73,13 @@ * 14-SFP_TX_DISABLE * 15-SFP_MOD_DEF0 */ - pcie2_0_clkreq { + pcie2-0-clkreq-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_LOW>; input; line-name = "pcie2.0-clkreq"; }; - pcie2_0_w_disable { + pcie2-0-w-disable-hog { gpio-hog; gpios = <7 GPIO_ACTIVE_LOW>; output-low;
arch/arm/boot/dts/armada-388-clearfog.dtsi +5 -5
@@ -141,31 +141,31 @@ #gpio-cells = <2>; reg = <0x20>; - pcie1_0_clkreq { + pcie1-0-clkreq-hog { gpio-hog; gpios = <0 GPIO_ACTIVE_LOW>; input; line-name = "pcie1.0-clkreq"; }; - pcie1_0_w_disable { + pcie1-0-w-disable-hog { gpio-hog; gpios = <3 GPIO_ACTIVE_LOW>; output-low; line-name = "pcie1.0-w-disable"; }; - usb3_ilimit { + usb3-ilimit-hog { gpio-hog; gpios = <5 GPIO_ACTIVE_LOW>; input; line-name = "usb3-current-limit"; }; - usb3_power { + usb3-power-hog { gpio-hog; gpios = <6 GPIO_ACTIVE_HIGH>; output-high; line-name = "usb3-power"; }; - m2_devslp { + m2-devslp-hog { gpio-hog; gpios = <11 GPIO_ACTIVE_HIGH>; output-low;
arch/arm/boot/dts/armada-388-helios4.dts +3 -3
@@ -166,19 +166,19 @@ interrupt-controller; #interrupt-cells = <2>; - board_rev_bit_0 { + board-rev-bit-0-hog { gpio-hog; gpios = <0 GPIO_ACTIVE_LOW>; input; line-name = "board-rev-0"; }; - board_rev_bit_1 { + board-rev-bit-1-hog { gpio-hog; gpios = <1 GPIO_ACTIVE_LOW>; input; line-name = "board-rev-1"; }; - usb3_ilimit { + usb3-ilimit-hog { gpio-hog; gpios = <5 GPIO_ACTIVE_HIGH>; input;
Signature · 1 line
2.17.1
PATCH v2 15/15 ARM: dts: imx6q: align GPIO hog names with dtschema
In reply to Krzysztof Kozlowskidtschema for pca95xx expects GPIO hogs to end with 'hog' prefix. While touching the hogs, fix indentation (spaces -> tabs).
--- arch/arm/boot/dts/imx6q-b450v3.dts | 14 +++++++------- arch/arm/boot/dts/imx6q-b650v3.dts | 12 ++++++------ arch/arm/boot/dts/imx6q-b850v3.dts | 4 ++-- arch/arm/boot/dts/imx6q-bx50v3.dtsi | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-)
arch/arm/boot/dts/imx6q-b450v3.dts +7 -7
@@ -84,19 +84,19 @@ }; &pca9539 { - P04 { + P04-hog { gpio-hog; gpios = <4 0>; output-low; line-name = "PCA9539-P04"; }; - P07 { - gpio-hog; - gpios = <7 0>; - output-low; - line-name = "PCA9539-P07"; - }; + P07-hog { + gpio-hog; + gpios = <7 0>; + output-low; + line-name = "PCA9539-P07"; + }; }; &pci_root {
arch/arm/boot/dts/imx6q-b650v3.dts +6 -6
@@ -84,12 +84,12 @@ }; &pca9539 { - P07 { - gpio-hog; - gpios = <7 0>; - output-low; - line-name = "PCA9539-P07"; - }; + P07-hog { + gpio-hog; + gpios = <7 0>; + output-low; + line-name = "PCA9539-P07"; + }; }; &usbphy1 {
arch/arm/boot/dts/imx6q-b850v3.dts +2 -2
@@ -199,14 +199,14 @@ }; &pca9539 { - P10 { + P10-hog { gpio-hog; gpios = <8 0>; output-low; line-name = "PCA9539-P10"; }; - P11 { + P11-hog { gpio-hog; gpios = <9 0>; output-low;
arch/arm/boot/dts/imx6q-bx50v3.dtsi +6 -6
@@ -248,42 +248,42 @@ interrupt-parent = <&gpio2>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; - P12 { + P12-hog { gpio-hog; gpios = <10 0>; output-low; line-name = "PCA9539-P12"; }; - P13 { + P13-hog { gpio-hog; gpios = <11 0>; output-low; line-name = "PCA9539-P13"; }; - P14 { + P14-hog { gpio-hog; gpios = <12 0>; output-low; line-name = "PCA9539-P14"; }; - P15 { + P15-hog { gpio-hog; gpios = <13 0>; output-low; line-name = "PCA9539-P15"; }; - P16 { + P16-hog { gpio-hog; gpios = <14 0>; output-low; line-name = "PCA9539-P16"; }; - P17 { + P17-hog { gpio-hog; gpios = <15 0>; output-low;
Signature · 1 line
2.17.1