[PATCH] dt-bindings: Fix SPI and I2C bus node names in examples

Sebastian Reichel sebastian.reichel at collabora.com
Wed Mar 1 23:43:50 UTC 2023


Hi,

On Tue, Feb 28, 2023 at 03:54:33PM -0600, Rob Herring wrote:
> SPI and I2C bus node names are expected to be "spi" or "i2c",
> respectively, with nothing else, a unit-address, or a '-N' index. A
> pattern of 'spi0' or 'i2c0' or similar has crept in. Fix all these
> cases. Mostly scripted with the following commands:
> 
> git grep -l '\si2c[0-9] {' Documentation/devicetree/ | xargs sed -i -e 's/i2c[0-9] {/i2c {/'
> git grep -l '\sspi[0-9] {' Documentation/devicetree/ | xargs sed -i -e 's/spi[0-9] {/spi {/'
> 
> With this, a few errors in examples were exposed and fixed.
> 
> Signed-off-by: Rob Herring <robh at kernel.org>
> ---

Acked-by: Sebastian Reichel <sebastian.reichel at collabora.com> # for power-supply

-- Sebastian

...

>  .../devicetree/bindings/power/supply/bq2415x.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq24190.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq24257.yaml |  4 ++--
>  .../devicetree/bindings/power/supply/bq24735.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq2515x.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq25890.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq25980.yaml |  2 +-
>  .../devicetree/bindings/power/supply/bq27xxx.yaml | 15 ++++++++-------
>  .../bindings/power/supply/lltc,ltc294x.yaml       |  2 +-
>  .../bindings/power/supply/ltc4162-l.yaml          |  2 +-
>  .../bindings/power/supply/maxim,max14656.yaml     |  2 +-
>  .../bindings/power/supply/maxim,max17040.yaml     |  4 ++--
>  .../bindings/power/supply/maxim,max17042.yaml     |  2 +-
>  .../bindings/power/supply/richtek,rt9455.yaml     |  2 +-
>  .../bindings/power/supply/ti,lp8727.yaml          |  2 +-

...

> diff --git a/Documentation/devicetree/bindings/power/supply/bq2415x.yaml b/Documentation/devicetree/bindings/power/supply/bq2415x.yaml
> index f7287ffd4b12..13822346e708 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq2415x.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq2415x.yaml
> @@ -77,7 +77,7 @@ additionalProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq24190.yaml b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
> index 001c0ffb408d..d3ebc9de8c0b 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq24190.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq24190.yaml
> @@ -75,7 +75,7 @@ examples:
>        charge-term-current-microamp = <128000>;
>      };
>  
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq24257.yaml b/Documentation/devicetree/bindings/power/supply/bq24257.yaml
> index cc45939d385b..eb064bbf876c 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq24257.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq24257.yaml
> @@ -84,7 +84,7 @@ examples:
>    - |
>      #include <dt-bindings/gpio/gpio.h>
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> @@ -104,7 +104,7 @@ examples:
>    - |
>      #include <dt-bindings/gpio/gpio.h>
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq24735.yaml b/Documentation/devicetree/bindings/power/supply/bq24735.yaml
> index 388ee16f8a1e..af41e7ccd784 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq24735.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq24735.yaml
> @@ -77,7 +77,7 @@ examples:
>    - |
>      #include <dt-bindings/gpio/gpio.h>
>  
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
> index 1a1b240034ef..845822c87f2a 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq2515x.yaml
> @@ -73,7 +73,7 @@ examples:
>        constant-charge-voltage-max-microvolt = <4000000>;
>      };
>      #include <dt-bindings/gpio/gpio.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq25890.yaml b/Documentation/devicetree/bindings/power/supply/bq25890.yaml
> index dae27e93af09..0ad302ab2bcc 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq25890.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq25890.yaml
> @@ -102,7 +102,7 @@ unevaluatedProperties: false
>  examples:
>    - |
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq25980.yaml b/Documentation/devicetree/bindings/power/supply/bq25980.yaml
> index b687b8bcd705..b70ce8d7f86c 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq25980.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq25980.yaml
> @@ -95,7 +95,7 @@ examples:
>      };
>      #include <dt-bindings/gpio/gpio.h>
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml b/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
> index 347d4433adc5..309ea33b5b25 100644
> --- a/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
> @@ -75,15 +75,16 @@ additionalProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    bat: battery {
> +      compatible = "simple-battery";
> +      voltage-min-design-microvolt = <3200000>;
> +      energy-full-design-microwatt-hours = <5290000>;
> +      charge-full-design-microamp-hours = <1430000>;
> +    };
> +
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
> -      bat: battery {
> -        compatible = "simple-battery";
> -        voltage-min-design-microvolt = <3200000>;
> -        energy-full-design-microwatt-hours = <5290000>;
> -        charge-full-design-microamp-hours = <1430000>;
> -      };
>  
>        bq27510g3: fuel-gauge at 55 {
>          compatible = "ti,bq27510g3";
> diff --git a/Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml b/Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml
> index 774582cd3a2c..e68a97cb49fe 100644
> --- a/Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/lltc,ltc294x.yaml
> @@ -54,7 +54,7 @@ additionalProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>        battery at 64 {
> diff --git a/Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml b/Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml
> index cfffaeef8b09..29d536541152 100644
> --- a/Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/ltc4162-l.yaml
> @@ -54,7 +54,7 @@ additionalProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>        charger: battery-charger at 68 {
> diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml
> index 711066b8cdb9..b444b799848e 100644
> --- a/Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/maxim,max14656.yaml
> @@ -32,7 +32,7 @@ additionalProperties: false
>  examples:
>    - |
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
> index 3a529326ecbd..2627cd3eed83 100644
> --- a/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/maxim,max17040.yaml
> @@ -68,7 +68,7 @@ unevaluatedProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> @@ -82,7 +82,7 @@ examples:
>      };
>    - |
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
> index 64a0edb7bc47..085e2504d0dc 100644
> --- a/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/maxim,max17042.yaml
> @@ -69,7 +69,7 @@ additionalProperties: false
>  
>  examples:
>    - |
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml b/Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml
> index 27bebc1757ba..07e38be39f1b 100644
> --- a/Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/richtek,rt9455.yaml
> @@ -68,7 +68,7 @@ additionalProperties: false
>  examples:
>    - |
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  
> diff --git a/Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml b/Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml
> index ce6fbdba8f6b..3a9e4310b433 100644
> --- a/Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml
> +++ b/Documentation/devicetree/bindings/power/supply/ti,lp8727.yaml
> @@ -61,7 +61,7 @@ additionalProperties: false
>  examples:
>    - |
>      #include <dt-bindings/interrupt-controller/irq.h>
> -    i2c0 {
> +    i2c {
>        #address-cells = <1>;
>        #size-cells = <0>;
>  

...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20230302/02ad2505/attachment.sig>


More information about the dri-devel mailing list