[PATCH 28/54] dt-bindings: power: supply: axp20x: Add AXP803 compatible

[PATCH 28/54] dt-bindings: power: supply: axp20x: Add AXP803 compatible

[Maxime Ripard]

The AXP803 compatible was introduced recently with a fallback to the
AXP813, but it was never documented.

Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-pm@vger.kernel.org
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 .../supply/x-powers,axp20x-ac-power-supply.yaml    | 11 +++++++----
 .../x-powers,axp20x-battery-power-supply.yaml      | 11 +++++++----
 .../supply/x-powers,axp20x-usb-power-supply.yaml   | 14 +++++++++-----
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
index dcda6660b8ed..de6a23aee977 100644
--- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
+++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
@@ -21,10 +21,13 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - x-powers,axp202-ac-power-supply
-      - x-powers,axp221-ac-power-supply
-      - x-powers,axp813-ac-power-supply
+    oneOf:
+      - const: x-powers,axp202-ac-power-supply
+      - const: x-powers,axp221-ac-power-supply
+      - items:
+          - const: x-powers,axp803-ac-power-supply
+          - const: x-powers,axp813-ac-power-supply
+      - const: x-powers,axp813-ac-power-supply
 
 required:
   - compatible
diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
index 86e8a713d4e2..d1f0df123a5a 100644
--- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
+++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
@@ -19,10 +19,13 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - x-powers,axp209-battery-power-supply
-      - x-powers,axp221-battery-power-supply
-      - x-powers,axp813-battery-power-supply
+    oneOf:
+      - const: x-powers,axp202-battery-power-supply
+      - const: x-powers,axp221-battery-power-supply
+      - items:
+          - const: x-powers,axp803-battery-power-supply
+          - const: x-powers,axp813-battery-power-supply
+      - const: x-powers,axp813-battery-power-supply
 
 required:
   - compatible
diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
index 61f1b320c157..0c371b55c9e1 100644
--- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
+++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
@@ -20,11 +20,15 @@ allOf:
 
 properties:
   compatible:
-    enum:
-      - x-powers,axp202-usb-power-supply
-      - x-powers,axp221-usb-power-supply
-      - x-powers,axp223-usb-power-supply
-      - x-powers,axp813-usb-power-supply
+    oneOf:
+      - enum:
+          - x-powers,axp202-usb-power-supply
+          - x-powers,axp221-usb-power-supply
+          - x-powers,axp223-usb-power-supply
+          - x-powers,axp813-usb-power-supply
+      - items:
+          - const: x-powers,axp803-usb-power-supply
+          - const: x-powers,axp813-usb-power-supply
 
 
 required:
-- 
2.31.1

Re: [PATCH 28/54] dt-bindings: power: supply: axp20x: Add AXP803 compatible

[Rob Herring]

On Wed, 21 Jul 2021 16:03:58 +0200, Maxime Ripard wrote:
> The AXP803 compatible was introduced recently with a fallback to the
> AXP813, but it was never documented.
> 
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
>  .../supply/x-powers,axp20x-ac-power-supply.yaml    | 11 +++++++----
>  .../x-powers,axp20x-battery-power-supply.yaml      | 11 +++++++----
>  .../supply/x-powers,axp20x-usb-power-supply.yaml   | 14 +++++++++-----
>  3 files changed, 23 insertions(+), 13 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [linux-sunxi] [PATCH 28/54] dt-bindings: power: supply: axp20x: Add AXP803 compatible

[Chen-Yu Tsai]

On Wed, Jul 21, 2021 at 10:05 PM Maxime Ripard <maxime@cerno.tech> wrote:
>
> The AXP803 compatible was introduced recently with a fallback to the
> AXP813, but it was never documented.
>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Reviewed-by: Chen-Yu Tsai <wens@csie.org>

Re: [PATCH 28/54] dt-bindings: power: supply: axp20x: Add AXP803 compatible

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 3748 bytes --]

Hi,

On Wed, Jul 21, 2021 at 04:03:58PM +0200, Maxime Ripard wrote:
> The AXP803 compatible was introduced recently with a fallback to the
> AXP813, but it was never documented.
> 
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---

Thanks, queued.

-- Sebastian

>  .../supply/x-powers,axp20x-ac-power-supply.yaml    | 11 +++++++----
>  .../x-powers,axp20x-battery-power-supply.yaml      | 11 +++++++----
>  .../supply/x-powers,axp20x-usb-power-supply.yaml   | 14 +++++++++-----
>  3 files changed, 23 insertions(+), 13 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
> index dcda6660b8ed..de6a23aee977 100644
> --- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-ac-power-supply.yaml
> @@ -21,10 +21,13 @@ allOf:
>  
>  properties:
>    compatible:
> -    enum:
> -      - x-powers,axp202-ac-power-supply
> -      - x-powers,axp221-ac-power-supply
> -      - x-powers,axp813-ac-power-supply
> +    oneOf:
> +      - const: x-powers,axp202-ac-power-supply
> +      - const: x-powers,axp221-ac-power-supply
> +      - items:
> +          - const: x-powers,axp803-ac-power-supply
> +          - const: x-powers,axp813-ac-power-supply
> +      - const: x-powers,axp813-ac-power-supply
>  
>  required:
>    - compatible
> diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> index 86e8a713d4e2..d1f0df123a5a 100644
> --- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> @@ -19,10 +19,13 @@ allOf:
>  
>  properties:
>    compatible:
> -    enum:
> -      - x-powers,axp209-battery-power-supply
> -      - x-powers,axp221-battery-power-supply
> -      - x-powers,axp813-battery-power-supply
> +    oneOf:
> +      - const: x-powers,axp202-battery-power-supply
> +      - const: x-powers,axp221-battery-power-supply
> +      - items:
> +          - const: x-powers,axp803-battery-power-supply
> +          - const: x-powers,axp813-battery-power-supply
> +      - const: x-powers,axp813-battery-power-supply
>  
>  required:
>    - compatible
> diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
> index 61f1b320c157..0c371b55c9e1 100644
> --- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-usb-power-supply.yaml
> @@ -20,11 +20,15 @@ allOf:
>  
>  properties:
>    compatible:
> -    enum:
> -      - x-powers,axp202-usb-power-supply
> -      - x-powers,axp221-usb-power-supply
> -      - x-powers,axp223-usb-power-supply
> -      - x-powers,axp813-usb-power-supply
> +    oneOf:
> +      - enum:
> +          - x-powers,axp202-usb-power-supply
> +          - x-powers,axp221-usb-power-supply
> +          - x-powers,axp223-usb-power-supply
> +          - x-powers,axp813-usb-power-supply
> +      - items:
> +          - const: x-powers,axp803-usb-power-supply
> +          - const: x-powers,axp813-usb-power-supply
>  
>  
>  required:
> -- 
> 2.31.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 29/54] dt-bindings: power: supply: axp20x-battery: Add AXP209 compatible

[Maxime Ripard]

The AXP209 compatible was used in Device Trees and the driver, but it
was never documented.

Cc: Chen-Yu Tsai <wens@csie.org>
Cc: linux-pm@vger.kernel.org
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 .../power/supply/x-powers,axp20x-battery-power-supply.yaml       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
index d1f0df123a5a..d055428ae39f 100644
--- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
+++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
@@ -21,6 +21,7 @@ properties:
   compatible:
     oneOf:
       - const: x-powers,axp202-battery-power-supply
+      - const: x-powers,axp209-battery-power-supply
       - const: x-powers,axp221-battery-power-supply
       - items:
           - const: x-powers,axp803-battery-power-supply
-- 
2.31.1

Re: [PATCH 29/54] dt-bindings: power: supply: axp20x-battery: Add AXP209 compatible

[Rob Herring]

On Wed, 21 Jul 2021 16:03:59 +0200, Maxime Ripard wrote:
> The AXP209 compatible was used in Device Trees and the driver, but it
> was never documented.
> 
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
>  .../power/supply/x-powers,axp20x-battery-power-supply.yaml       | 1 +
>  1 file changed, 1 insertion(+)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH 29/54] dt-bindings: power: supply: axp20x-battery: Add AXP209 compatible

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

Hi,

On Wed, Jul 21, 2021 at 04:03:59PM +0200, Maxime Ripard wrote:
> The AXP209 compatible was used in Device Trees and the driver, but it
> was never documented.
> 
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---

Thanks, queued.

-- Sebastian

>  .../power/supply/x-powers,axp20x-battery-power-supply.yaml       | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> index d1f0df123a5a..d055428ae39f 100644
> --- a/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/x-powers,axp20x-battery-power-supply.yaml
> @@ -21,6 +21,7 @@ properties:
>    compatible:
>      oneOf:
>        - const: x-powers,axp202-battery-power-supply
> +      - const: x-powers,axp209-battery-power-supply
>        - const: x-powers,axp221-battery-power-supply
>        - items:
>            - const: x-powers,axp803-battery-power-supply
> -- 
> 2.31.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[PATCH 33/54] dt-bindings: thermal: Make trips node optional

[Maxime Ripard]

Even though the previous binding made it a required child node, the
implementation in Linux never made it mandatory and just ignored thermal
zones without trip points.

This was even effectively encouraged, since the thermal core wouldn't
allow a thermal sensor to probe without a thermal zone.

In the case where you had a thermal device that had multiple sensors but
with enough knowledge to provide trip points for only a few of them,
this meant that the only way to make that driver probe was to provide a
thermal zone without the trips node required by the binding.

This obviously led to a fair number of device trees doing exactly that,
making the initial binding requirement ineffective.

Let's make it clear by dropping that requirement.

Cc: Amit Kucheria <amitk@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-pm@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
 Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
index 164f71598c59..a07de5ed0ca6 100644
--- a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
+++ b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
@@ -215,7 +215,7 @@ patternProperties:
       - polling-delay
       - polling-delay-passive
       - thermal-sensors
-      - trips
+
     additionalProperties: false
 
 additionalProperties: false
-- 
2.31.1

Re: [PATCH 33/54] dt-bindings: thermal: Make trips node optional

[Rob Herring]

On Wed, 21 Jul 2021 16:04:03 +0200, Maxime Ripard wrote:
> Even though the previous binding made it a required child node, the
> implementation in Linux never made it mandatory and just ignored thermal
> zones without trip points.
> 
> This was even effectively encouraged, since the thermal core wouldn't
> allow a thermal sensor to probe without a thermal zone.
> 
> In the case where you had a thermal device that had multiple sensors but
> with enough knowledge to provide trip points for only a few of them,
> this meant that the only way to make that driver probe was to provide a
> thermal zone without the trips node required by the binding.
> 
> This obviously led to a fair number of device trees doing exactly that,
> making the initial binding requirement ineffective.
> 
> Let's make it clear by dropping that requirement.
> 
> Cc: Amit Kucheria <amitk@kernel.org>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Zhang Rui <rui.zhang@intel.com>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>
> ---
>  Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: [PATCH 33/54] dt-bindings: thermal: Make trips node optional

[Daniel Lezcano]

On 21/07/2021 16:04, Maxime Ripard wrote:
> Even though the previous binding made it a required child node, the
> implementation in Linux never made it mandatory and just ignored thermal
> zones without trip points.
> 
> This was even effectively encouraged, since the thermal core wouldn't
> allow a thermal sensor to probe without a thermal zone.
> 
> In the case where you had a thermal device that had multiple sensors but
> with enough knowledge to provide trip points for only a few of them,
> this meant that the only way to make that driver probe was to provide a
> thermal zone without the trips node required by the binding.
> 
> This obviously led to a fair number of device trees doing exactly that,
> making the initial binding requirement ineffective.
> 
> Let's make it clear by dropping that requirement.
> 
> Cc: Amit Kucheria <amitk@kernel.org>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: linux-pm@vger.kernel.org
> Cc: Zhang Rui <rui.zhang@intel.com>
> Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Applied, thanks!

  -- D.


-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

[thermal: thermal/next] dt-bindings: thermal: Make trips node optional

[thermal-bot for Maxime Ripard]

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     22fc857538c3a256563bb796f978b6d4693f5aa3
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//22fc857538c3a256563bb796f978b6d4693f5aa3
Author:        Maxime Ripard <maxime@cerno.tech>
AuthorDate:    Wed, 21 Jul 2021 16:04:03 +02:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Sat, 14 Aug 2021 15:42:30 +02:00

dt-bindings: thermal: Make trips node optional

Even though the previous binding made it a required child node, the
implementation in Linux never made it mandatory and just ignored thermal
zones without trip points.

This was even effectively encouraged, since the thermal core wouldn't
allow a thermal sensor to probe without a thermal zone.

In the case where you had a thermal device that had multiple sensors but
with enough knowledge to provide trip points for only a few of them,
this meant that the only way to make that driver probe was to provide a
thermal zone without the trips node required by the binding.

This obviously led to a fair number of device trees doing exactly that,
making the initial binding requirement ineffective.

Let's make it clear by dropping that requirement.

Cc: Amit Kucheria <amitk@kernel.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-pm@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210721140424.725744-34-maxime@cerno.tech
---
 Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
index 164f715..a07de5e 100644
--- a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
+++ b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
@@ -215,7 +215,7 @@ patternProperties:
       - polling-delay
       - polling-delay-passive
       - thermal-sensors
-      - trips
+
     additionalProperties: false
 
 additionalProperties: false