On Sat, Aug 29, 2020 at 11:40:20AM +0200, Krzysztof Kozlowski wrote:
> 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@xxxxxxxxxx>
> ---
> .../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
>
> 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 c5bb24b3b7b5..e90433b7d52b 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@xxxxxxxxxx>
>
> +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.
>
> required:
> - compatible
> @@ -83,6 +96,27 @@ required:
>
> unevaluatedProperties: 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:
> + maxItems: 0
> + vcc-supply:
> + maxItems: 0
reset-gpios: false
vcc-supply: false
> +
> examples:
> - |
> #include <dt-bindings/interrupt-controller/irq.h>
> @@ -136,3 +170,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
>
