From: Krzysztof Kozlowski <krzk@kernel.org> To: "Linus Walleij" <linus.walleij@linaro.org>, "Bartosz Golaszewski" <bgolaszewski@baylibre.com>, "Rob Herring" <robh+dt@kernel.org>, "Benoît Cousson" <bcousson@baylibre.com>, "Tony Lindgren" <tony@atomide.com>, "Jason Cooper" <jason@lakedaemon.net>, "Andrew Lunn" <andrew@lunn.ch>, "Gregory Clement" <gregory.clement@bootlin.com>, "Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>, "Russell King" <linux@armlinux.org.uk>, "Joel Stanley" <joel@jms.id.au>, "Andrew Jeffery" <andrew@aj.id.au>, "Shawn Guo" <shawnguo@kernel.org>, "Sascha Hauer" <s.hauer@pengutronix.de>, "Pengutronix Kernel Team" <kernel@pengutronix.de>, "Fabio Estevam" <festevam@gmail.com>, "NXP Linux Team" <linux-imx@nxp.com>, "Matthias Brugger" <matthias.bgg@gmail.com>, "Geert Uytterhoeven" <geert+renesas@glider.be>, "Magnus Damm" <magnus.damm@gmail.com>, "Tero Kristo" <t-kristo@ti.com>, "Nishanth Menon" <nm@ti.com>, "Michal Simek" <michal.simek@xilinx.com>, linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-mediatek@lists.infradead.org, linux-renesas-soc@vger.kernel.org Cc: Krzysztof Kozlowski <krzk@kernel.org> Subject: [PATCH v3 02/15] dt-bindings: gpio: convert bindings for Maxim MAX732x family to dtschema Date: Wed, 16 Sep 2020 17:57:02 +0200 Message-ID: <20200916155715.21009-3-krzk@kernel.org> (raw) In-Reply-To: <20200916155715.21009-1-krzk@kernel.org> 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 <krzk@kernel.org> Reviewed-by: Rob Herring <robh@kernel.org> --- Changes since v2: 1. Add Rob's review tag 2. Use reset-gpios/vcc-supply: false instead of maxItems 0 3. Use /* for comments in example DTS --- .../devicetree/bindings/gpio/gpio-max732x.txt | 58 --------------- .../bindings/gpio/gpio-pca95xx.yaml | 70 ++++++++++++++++++- 2 files changed, 68 insertions(+), 60 deletions(-) delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt diff --git a/Documentation/devicetree/bindings/gpio/gpio-max732x.txt b/Documentation/devicetree/bindings/gpio/gpio-max732x.txt deleted file mode 100644 index b3a9c0c32823..000000000000 --- a/Documentation/devicetree/bindings/gpio/gpio-max732x.txt +++ /dev/null @@ -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@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@6d { - compatible = "maxim,max7325"; - reg = <0x6d>; - gpio-controller; - #gpio-cells = <2>; - }; diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml b/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml index 7ff6efadf797..183ec23eda39 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml @@ -9,6 +9,10 @@ title: NXP PCA95xx I2C GPIO multiplexer maintainers: - Krzysztof Kozlowski <krzk@kernel.org> +description: |+ + Bindings for the family of I2C GPIO multiplexers/expanders: NXP PCA95xx, + Maxim MAX73xx + properties: compatible: enum: @@ -17,6 +21,15 @@ properties: - maxim,max7312 - maxim,max7313 - maxim,max7315 + - maxim,max7319 + - maxim,max7320 + - maxim,max7321 + - maxim,max7322 + - maxim,max7323 + - maxim,max7324 + - maxim,max7325 + - maxim,max7326 + - maxim,max7327 - nxp,pca6416 - nxp,pca9505 - nxp,pca9534 @@ -69,11 +82,11 @@ properties: reset-gpios: description: GPIO specification for the RESET input. This is an active low signal to - the PCA953x. + the PCA953x. Not valid for Maxim MAX732x devices. vcc-supply: description: - Optional power supply + Optional power supply. Not valid for Maxim MAX732x devices. wakeup-source: $ref: /schemas/types.yaml#/definitions/flag @@ -103,6 +116,25 @@ required: additionalProperties: false +allOf: + - if: + properties: + compatible: + contains: + enum: + - maxim,max7320 + - maxim,max7321 + - maxim,max7322 + - maxim,max7323 + - maxim,max7324 + - maxim,max7325 + - maxim,max7326 + - maxim,max7327 + then: + properties: + reset-gpios: false + vcc-supply: false + examples: - | #include <dt-bindings/gpio/gpio.h> @@ -164,3 +196,37 @@ examples: ti,micbias = <0>; /* 2.1V */ }; }; + + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c2 { + #address-cells = <1>; + #size-cells = <0>; + + /* MAX7325 with interrupt support enabled */ + gpio@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>; + }; + }; + + - | + i2c3 { + #address-cells = <1>; + #size-cells = <0>; + + /* MAX7325 with interrupt support disabled */ + gpio@6e { + compatible = "maxim,max7325"; + reg = <0x6e>; + gpio-controller; + #gpio-cells = <2>; + }; + }; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply index Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-09-16 15:57 [PATCH v3 00/15] ARM: dts: / gpio: Add dtschema for NXP PCA953x and correct dts Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 01/15] dt-bindings: gpio: convert bindings for NXP PCA953x family to dtschema Krzysztof Kozlowski 2020-09-25 15:48 ` Krzysztof Kozlowski 2020-09-29 12:03 ` Linus Walleij 2020-09-16 15:57 ` Krzysztof Kozlowski [this message] 2020-09-16 15:57 ` [PATCH v3 03/15] arm64: dts: mediatek: fix tca6416 reset GPIOs in pumpkin Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 04/15] arm64: dts: mediatek: align GPIO hog names with dtschema Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 05/15] arm64: dts: renesas: " Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 06/15] arm64: dts: ti: " Krzysztof Kozlowski 2020-09-25 12:01 ` Nishanth Menon 2020-09-16 15:57 ` [PATCH v3 07/15] arm64: dts: xilinx: " Krzysztof Kozlowski 2020-09-29 10:54 ` Michal Simek 2020-09-16 15:57 ` [PATCH v3 08/15] ARM: dts: am335x: lxm: fix PCA9539 GPIO expander properties Krzysztof Kozlowski 2020-09-25 11:36 ` Tony Lindgren 2020-09-16 15:57 ` [PATCH v3 09/15] ARM: dts: am335x: t335: align GPIO hog names with dtschema Krzysztof Kozlowski 2020-09-25 11:37 ` Tony Lindgren 2020-09-16 15:57 ` [PATCH v3 10/15] ARM: dts: am3874: iceboard: fix GPIO expander reset GPIOs Krzysztof Kozlowski 2020-09-25 11:38 ` Tony Lindgren 2020-09-16 15:57 ` [PATCH v3 11/15] ARM: dts: aspeed: fix PCA95xx GPIO expander properties on Portwell Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 12/15] ARM: dts: aspeed: align GPIO hog names with dtschema Krzysztof Kozlowski 2020-09-16 15:57 ` [PATCH v3 13/15] ARM: dts: dove: fix PCA95xx GPIO expander properties on A510 Krzysztof Kozlowski 2020-09-23 14:38 ` Gregory CLEMENT 2020-09-16 15:57 ` [PATCH v3 14/15] ARM: dts: armada: align GPIO hog names with dtschema Krzysztof Kozlowski 2020-09-23 14:39 ` Gregory CLEMENT 2020-09-16 15:57 ` [PATCH v3 15/15] ARM: dts: imx6q: " Krzysztof Kozlowski 2020-09-22 2:00 ` Shawn Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200916155715.21009-3-krzk@kernel.org \ --to=krzk@kernel.org \ --cc=andrew@aj.id.au \ --cc=andrew@lunn.ch \ --cc=bcousson@baylibre.com \ --cc=bgolaszewski@baylibre.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=geert+renesas@glider.be \ --cc=gregory.clement@bootlin.com \ --cc=jason@lakedaemon.net \ --cc=joel@jms.id.au \ --cc=kernel@pengutronix.de \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-aspeed@lists.ozlabs.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=magnus.damm@gmail.com \ --cc=matthias.bgg@gmail.com \ --cc=michal.simek@xilinx.com \ --cc=nm@ti.com \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=sebastian.hesselbarth@gmail.com \ --cc=shawnguo@kernel.org \ --cc=t-kristo@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-ARM-Kernel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \ linux-arm-kernel@lists.infradead.org public-inbox-index linux-arm-kernel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git