[<prev] [next>] [day] [month] [year] [list]
Message-ID: <a238b9dd-9251-4241-81ef-461081c1c4be@roeck-us.net>
Date: Mon, 25 Mar 2024 09:42:45 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: Andreas Kemnade <andreas@...nade.info>, dmitry.torokhov@...il.com,
robh+dt@...nel.org, krzysztof.kozlowski+dt@...aro.org, conor+dt@...nel.org,
lee@...nel.org, alexandre.belloni@...tlin.com, wim@...ux-watchdog.org,
linux-input@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-rtc@...r.kernel.org,
linux-watchdog@...r.kernel.org, linux-omap@...r.kernel.org, sre@...nel.org
Subject: Re: [PATCH v2] dt-bindings: mfd: twl: Convert trivial subdevices to
json-schema
On 3/24/24 11:37, Andreas Kemnade wrote:
> Convert subdevices with just an interrupt and compatbile to
> json-schema and wire up already converted subdevices.
> RTC is available in all variants, so allow it unconditionally.
> GPADC binding for TWL603X uses two different compatibles, so
> specify just the compatible and do not include it.
>
> Signed-off-by: Andreas Kemnade <andreas@...nade.info>
For watchdog:
Acked-by: Guenter Roeck <linux@...ck-us.net>
> ---
> Changes in v2:
> - style cleanup
> - absolute paths
> - unevalutedProperties instead of additionalProperties
> due to not accepting things in if: clauses without it
>
> .../bindings/input/twl4030-pwrbutton.txt | 21 ------
> .../devicetree/bindings/mfd/ti,twl.yaml | 72 ++++++++++++++++++-
> .../devicetree/bindings/rtc/twl-rtc.txt | 11 ---
> .../bindings/watchdog/twl4030-wdt.txt | 10 ---
> 4 files changed, 71 insertions(+), 43 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
> delete mode 100644 Documentation/devicetree/bindings/rtc/twl-rtc.txt
> delete mode 100644 Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
>
> diff --git a/Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt b/Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
> deleted file mode 100644
> index 6c201a2ba8acf..0000000000000
> --- a/Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Texas Instruments TWL family (twl4030) pwrbutton module
> -
> -This module is part of the TWL4030. For more details about the whole
> -chip see Documentation/devicetree/bindings/mfd/ti,twl.yaml.
> -
> -This module provides a simple power button event via an Interrupt.
> -
> -Required properties:
> -- compatible: should be one of the following
> - - "ti,twl4030-pwrbutton": For controllers compatible with twl4030
> -- interrupts: should be one of the following
> - - <8>: For controllers compatible with twl4030
> -
> -Example:
> -
> -&twl {
> - twl_pwrbutton: pwrbutton {
> - compatible = "ti,twl4030-pwrbutton";
> - interrupts = <8>;
> - };
> -};
> diff --git a/Documentation/devicetree/bindings/mfd/ti,twl.yaml b/Documentation/devicetree/bindings/mfd/ti,twl.yaml
> index 52ed228fb1e7e..c2357fecb56cc 100644
> --- a/Documentation/devicetree/bindings/mfd/ti,twl.yaml
> +++ b/Documentation/devicetree/bindings/mfd/ti,twl.yaml
> @@ -15,6 +15,67 @@ description: |
> USB transceiver or Audio amplifier.
> These chips are connected to an i2c bus.
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: ti,twl4030
> + then:
> + properties:
> + madc:
> + type: object
> + $ref: /schemas/iio/adc/ti,twl4030-madc.yaml
> + unevaluatedProperties: false
> +
> + bci:
> + type: object
> + $ref: /schemas/power/supply/twl4030-charger.yaml
> + unevaluatedProperties: false
> +
> + pwrbutton:
> + type: object
> + additionalProperties: false
> + properties:
> + compatible:
> + const: ti,twl4030-pwrbutton
> + interrupts:
> + items:
> + - items:
> + const: 8
> +
> + watchdog:
> + type: object
> + additionalProperties: false
> + properties:
> + compatible:
> + const: ti,twl4030-wdt
> +
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: ti,twl6030
> + then:
> + properties:
> + gpadc:
> + type: object
> + properties:
> + compatible:
> + const: ti,twl6030-gpadc
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: ti,twl6032
> + then:
> + properties:
> + gpadc:
> + type: object
> + properties:
> + compatible:
> + const: ti,twl6032-gpadc
> +
> properties:
> compatible:
> description:
> @@ -42,7 +103,16 @@ properties:
> "#clock-cells":
> const: 1
>
> -additionalProperties: false
> + rtc:
> + type: object
> + additionalProperties: false
> + properties:
> + compatible:
> + const: ti,twl4030-rtc
> + interrupts:
> + maxItems: 1
> +
> +unevaluatedProperties: false
>
> required:
> - compatible
> diff --git a/Documentation/devicetree/bindings/rtc/twl-rtc.txt b/Documentation/devicetree/bindings/rtc/twl-rtc.txt
> deleted file mode 100644
> index 8f9a94f2f8969..0000000000000
> --- a/Documentation/devicetree/bindings/rtc/twl-rtc.txt
> +++ /dev/null
> @@ -1,11 +0,0 @@
> -* Texas Instruments TWL4030/6030 RTC
> -
> -Required properties:
> -- compatible : Should be "ti,twl4030-rtc"
> -- interrupts : Should be the interrupt number.
> -
> -Example:
> - rtc {
> - compatible = "ti,twl4030-rtc";
> - interrupts = <11>;
> - };
> diff --git a/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt b/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
> deleted file mode 100644
> index 80a37193c0b86..0000000000000
> --- a/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
> +++ /dev/null
> @@ -1,10 +0,0 @@
> -Device tree bindings for twl4030-wdt driver (TWL4030 watchdog)
> -
> -Required properties:
> - compatible = "ti,twl4030-wdt";
> -
> -Example:
> -
> -watchdog {
> - compatible = "ti,twl4030-wdt";
> -};
Powered by blists - more mailing lists