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

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. Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for the microchip,mcp251xfd.yaml Acked-by: Mark Brown <broonie@kernel.org> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> # for power-supply Acked-by: Wolfram Sang <wsa@kernel.org> Acked-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20230228215433.3944508-1-robh@kernel.orgSigned-off-by: Rob Herring <robh@kernel.org>

dt-bindings: Fix SPI and I2C bus node names in examples
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. Acked-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Stephen Boyd <sboyd@kernel.org> Reviewed-by: Simon Glass <sjg@chromium.org> Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for the microchip,mcp251xfd.yaml Acked-by: Mark Brown <broonie@kernel.org> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> # for power-supply Acked-by: Wolfram Sang <wsa@kernel.org> Acked-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/20230228215433.3944508-1-robh@kernel.orgSigned-off-by: Rob Herring <robh@kernel.org>
20a72af1 · Rob Herring · ab82b4f1 · 20a72af1 · 20a72af1 · 20a72af1
Commit 20a72af1 authored Feb 28, 2023 by Rob Herring
87 changed files
--- a/Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
+++ b/Documentation/devicetree/bindings/auxdisplay/holtek,ht16k33.yaml
@@ -72,7 +72,7 @@ examples:
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/input/input.h>
    #include <dt-bindings/leds/common.h>
-    i2c1 {
+    i2c {
            #address-cells = <1>;
            #size-cells = <0>;

--- a/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml
+++ b/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.yaml
@@ -41,7 +41,7 @@ additionalProperties: false
 examples:
  - |+
-    spi0 {
+    spi {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml
+++ b/Documentation/devicetree/bindings/chrome/google,cros-kbd-led-backlight.yaml
@@ -20,7 +20,7 @@ additionalProperties: false
 examples:
  - |
-    spi0 {
+    spi {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/clock/ti,lmk04832.yaml
+++ b/Documentation/devicetree/bindings/clock/ti,lmk04832.yaml
@@ -160,7 +160,7 @@ examples:
        };
    };
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml
@@ -134,7 +134,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/anx6345.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/anx6345.yaml
@@ -61,7 +61,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/lontium,lt8912b.yaml
@@ -67,7 +67,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c4 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/nxp,ptn3460.yaml
@@ -71,7 +71,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c1 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/ps8640.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ps8640.yaml
@@ -73,7 +73,7 @@ additionalProperties: false
 examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/sil,sii9234.yaml
@@ -71,7 +71,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c1 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ti,dlpc3433.yaml
@@ -83,7 +83,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c1 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml
@@ -51,7 +51,7 @@ additionalProperties: false
 examples:
  - |
-    i2c1 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/toshiba,tc358768.yaml
@@ -87,7 +87,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c1 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/panel/nec,nl8048hl11.yaml
+++ b/Documentation/devicetree/bindings/display/panel/nec,nl8048hl11.yaml
@@ -41,7 +41,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    spi0 {
+    spi {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
+++ b/Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
@@ -226,7 +226,7 @@ unevaluatedProperties: false
 examples:
  - |
-    i2c1 {
+    i2c {
            #address-cells = <1>;
            #size-cells = <0>;
@@ -239,7 +239,7 @@ examples:
            ssd1306_i2c: oled@3d {
                    compatible = "solomon,ssd1306";
-                    reg = <0x3c>;
+                    reg = <0x3d>;
                    pwms = <&pwm 4 3000>;
                    reset-gpios = <&gpio2 7>;
                    solomon,com-lrremap;

--- a/Documentation/devicetree/bindings/eeprom/at25.yaml
+++ b/Documentation/devicetree/bindings/eeprom/at25.yaml
@@ -122,7 +122,7 @@ unevaluatedProperties: false
 examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml
+++ b/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.yaml
@@ -34,7 +34,7 @@ additionalProperties: false
 examples:
  - |
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;
        cros-ec@0 {

--- a/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
+++ b/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
@@ -30,7 +30,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
        tusb320@61 {

--- a/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml
@@ -34,7 +34,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-pca95xx.yaml
@@ -151,7 +151,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -177,7 +177,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c1 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -203,7 +203,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c2 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -221,7 +221,7 @@ examples:
    };
  - |
-    i2c3 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/aspeed,i2c.yaml
@@ -60,7 +60,7 @@ unevaluatedProperties: false
 examples:
  - |
    #include <dt-bindings/clock/aspeed-clock.h>
-    i2c0: i2c-bus@40 {
+    i2c@40 {
      #address-cells = <1>;
      #size-cells = <0>;
      compatible = "aspeed,ast2500-i2c-bus";

--- a/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml
+++ b/Documentation/devicetree/bindings/i2c/google,cros-ec-i2c-tunnel.yaml
@@ -39,7 +39,7 @@ unevaluatedProperties: false
 examples:
  - |
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
+++ b/Documentation/devicetree/bindings/leds/cznic,turris-omnia-leds.yaml
@@ -58,7 +58,7 @@ examples:
    #include <dt-bindings/leds/common.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/leds/issi,is31fl319x.yaml
+++ b/Documentation/devicetree/bindings/leds/issi,is31fl319x.yaml
@@ -165,7 +165,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/leds/common.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/leds/leds-aw2013.yaml
+++ b/Documentation/devicetree/bindings/leds/leds-aw2013.yaml
@@ -54,7 +54,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/leds/common.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/leds/leds-rt4505.yaml
+++ b/Documentation/devicetree/bindings/leds/leds-rt4505.yaml
@@ -39,7 +39,7 @@ examples:
  - |
    #include <dt-bindings/leds/common.h>
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/leds/ti,tca6507.yaml
+++ b/Documentation/devicetree/bindings/leds/ti,tca6507.yaml
@@ -87,7 +87,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/leds/common.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/aptina,mt9p031.yaml
@@ -82,7 +82,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/aptina,mt9v111.yaml
@@ -55,7 +55,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/imx219.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/imx219.yaml
@@ -83,7 +83,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/imx258.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/imx258.yaml
@@ -84,7 +84,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -111,7 +111,7 @@ examples:
    };
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
@@ -106,7 +106,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/media/video-interfaces.h>
-    i2c2 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov5648.yaml
@@ -81,7 +81,7 @@ examples:
    #include <dt-bindings/clock/sun8i-v3s-ccu.h>
    #include <dt-bindings/gpio/gpio.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov772x.yaml
@@ -107,7 +107,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/media/video-interfaces.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
        ov772x: camera@21 {

--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov8865.yaml
@@ -82,7 +82,7 @@ examples:
    #include <dt-bindings/clock/sun8i-a83t-ccu.h>
    #include <dt-bindings/gpio/gpio.h>
-    i2c2 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/ovti,ov9282.yaml
@@ -78,7 +78,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/rda,rda5807.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/rda,rda5807.yaml
@@ -50,7 +50,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
@@ -97,7 +97,7 @@ examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
@@ -52,7 +52,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx334.yaml
@@ -65,7 +65,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx335.yaml
@@ -66,7 +66,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
@@ -77,7 +77,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
+++ b/Documentation/devicetree/bindings/mfd/actions,atc260x.yaml
@@ -129,7 +129,7 @@ required:
 examples:
  - |
    #include <dt-bindings/interrupt-controller/arm-gic.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
+++ b/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
@@ -246,7 +246,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -263,7 +263,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -296,7 +296,7 @@ examples:
  # Example for FPMCU
  - |
-    spi0 {
+    spi {
      #address-cells = <0x1>;
      #size-cells = <0x0>;

--- a/Documentation/devicetree/bindings/mfd/ti,tps65086.yaml
+++ b/Documentation/devicetree/bindings/mfd/ti,tps65086.yaml
@@ -95,7 +95,7 @@ required:
 examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml
+++ b/Documentation/devicetree/bindings/mfd/x-powers,axp152.yaml
@@ -299,7 +299,7 @@ additionalProperties: false
 examples:
  - |
-      i2c0 {
+      i2c {
          #address-cells = <1>;
          #size-cells = <0>;
@@ -315,7 +315,7 @@ examples:
  - |
      #include <dt-bindings/interrupt-controller/irq.h>
-      i2c0 {
+      i2c {
          #address-cells = <1>;
          #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/asix,ax88796c.yaml
+++ b/Documentation/devicetree/bindings/net/asix,ax88796c.yaml
@@ -58,7 +58,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/gpio/gpio.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
+++ b/Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
@@ -62,7 +62,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
@@ -67,7 +67,7 @@ examples:
        };
    };
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
+++ b/Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml
@@ -69,7 +69,7 @@ examples:
    #include <dt-bindings/gpio/gpio.h>
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c4 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
+++ b/Documentation/devicetree/bindings/net/vertexcom-mse102x.yaml
@@ -55,7 +55,7 @@ additionalProperties: false
 examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml
+++ b/Documentation/devicetree/bindings/net/wireless/ti,wlcore.yaml
@@ -89,7 +89,7 @@ examples:
    #include <dt-bindings/interrupt-controller/irq.h>
    // For wl12xx family:
-    spi1 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -104,8 +104,11 @@ examples:
        };
    };
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
    // For wl18xx family:
-    spi2 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -118,6 +121,9 @@ examples:
        };
    };
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
    // SDIO example:
    mmc3 {
        vmmc-supply = <&wlan_en_reg>;

--- a/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/pinmux-node.yaml
@@ -31,7 +31,7 @@ description: |
    };
  };
  state_1_node_a {
-    spi0 {
+    spi {
      function = "spi0";
      groups = "spi0pins";
    };

--- a/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml
@@ -293,7 +293,7 @@ examples:
            pinctrl-names = "default";
        };
-        i2c0 {
+        i2c {
            pinctrl-0 = <&i2c0_pins_default>;
            pinctrl-names = "default";
        };

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- a/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
+++ b/Documentation/devicetree/bindings/power/supply/bq27xxx.yaml
@@ -75,9 +75,6 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
-      #address-cells = <1>;
-      #size-cells = <0>;
    bat: battery {
      compatible = "simple-battery";
      voltage-min-design-microvolt = <3200000>;
@@ -85,6 +82,10 @@ examples:
      charge-full-design-microamp-hours = <1430000>;
    };
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
      bq27510g3: fuel-gauge@55 {
        compatible = "ti,bq27510g3";
        reg = <0x55>;

--- 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@64 {

--- 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@68 {

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- 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>;

--- a/Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml
+++ b/Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml
@@ -90,7 +90,7 @@ examples:
  - |
    #include <dt-bindings/regulator/active-semi,8865-regulator.h>
-    i2c1 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.yaml
@@ -32,7 +32,7 @@ unevaluatedProperties: false
 examples:
  - |
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
@@ -109,7 +109,7 @@ additionalProperties: false
 examples:
  - |
-    i2c1 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/sound/everest,es8316.yaml
+++ b/Documentation/devicetree/bindings/sound/everest,es8316.yaml
@@ -40,7 +40,7 @@ unevaluatedProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;
      es8316: codec@11 {

--- a/Documentation/devicetree/bindings/sound/tas2562.yaml
+++ b/Documentation/devicetree/bindings/sound/tas2562.yaml
@@ -66,7 +66,7 @@ unevaluatedProperties: false
 examples:
  - |
   #include <dt-bindings/gpio/gpio.h>
-   i2c0 {
+   i2c {
     #address-cells = <1>;
     #size-cells = <0>;
     codec: codec@4c {

--- a/Documentation/devicetree/bindings/sound/tas2770.yaml
+++ b/Documentation/devicetree/bindings/sound/tas2770.yaml
@@ -68,7 +68,7 @@ unevaluatedProperties: false
 examples:
  - |
   #include <dt-bindings/gpio/gpio.h>
-   i2c0 {
+   i2c {
     #address-cells = <1>;
     #size-cells = <0>;
     codec: codec@41 {

--- a/Documentation/devicetree/bindings/sound/tas27xx.yaml
+++ b/Documentation/devicetree/bindings/sound/tas27xx.yaml
@@ -61,7 +61,7 @@ unevaluatedProperties: false
 examples:
  - |
   #include <dt-bindings/gpio/gpio.h>
-   i2c0 {
+   i2c {
     #address-cells = <1>;
     #size-cells = <0>;
     codec: codec@38 {

--- a/Documentation/devicetree/bindings/sound/tas5805m.yaml
+++ b/Documentation/devicetree/bindings/sound/tas5805m.yaml
@@ -39,7 +39,7 @@ properties:
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;
        tas5805m: tas5805m@2c {

--- a/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
+++ b/Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
@@ -192,7 +192,7 @@ additionalProperties: false
 examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;
      codec: codec@4c {

--- a/Documentation/devicetree/bindings/sound/zl38060.yaml
+++ b/Documentation/devicetree/bindings/sound/zl38060.yaml
@@ -56,7 +56,7 @@ unevaluatedProperties: false
 examples:
  - |
    #include <dt-bindings/gpio/gpio.h>
-    spi0 {
+    spi {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/maxim,max33359.yaml
+++ b/Documentation/devicetree/bindings/usb/maxim,max33359.yaml
@@ -40,7 +40,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/usb/pd.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/maxim,max3420-udc.yaml
+++ b/Documentation/devicetree/bindings/usb/maxim,max3420-udc.yaml
@@ -52,7 +52,7 @@ examples:
  - |
      #include <dt-bindings/gpio/gpio.h>
      #include <dt-bindings/interrupt-controller/irq.h>
-      spi0 {
+      spi {
            #address-cells = <1>;
            #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mt6360-tcpc.yaml
@@ -43,7 +43,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/usb/pd.h>
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml
+++ b/Documentation/devicetree/bindings/usb/richtek,rt1711h.yaml
@@ -51,7 +51,7 @@ examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
    #include <dt-bindings/usb/pd.h>
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/richtek,rt1719.yaml
+++ b/Documentation/devicetree/bindings/usb/richtek,rt1719.yaml
@@ -48,7 +48,7 @@ required:
 examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c0 {
+    i2c {
      #address-cells = <1>;
      #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/st,stusb160x.yaml
+++ b/Documentation/devicetree/bindings/usb/st,stusb160x.yaml
@@ -56,7 +56,7 @@ additionalProperties: false
 examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c4 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml
+++ b/Documentation/devicetree/bindings/usb/ti,hd3ss3220.yaml
@@ -51,7 +51,7 @@ additionalProperties: false
 examples:
  - |
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;

--- a/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
+++ b/Documentation/devicetree/bindings/usb/ti,tps6598x.yaml
@@ -43,7 +43,7 @@ additionalProperties: true
 examples:
  - |
    #include <dt-bindings/interrupt-controller/irq.h>
-    i2c0 {
+    i2c {
        #address-cells = <1>;
        #size-cells = <0>;