ARM: dts: aspeed: rainier: Fix pca9551 nodes

The pca9551 compatible LED drivers are under the pca9546 mux
on Rainier pass > 1. On pass 1, they are directly connected to
the aspeed i2c.

Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Link: https://lore.kernel.org/r/20221102223554.1738642-1-joel@jms.id.au

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 4edaa62..20ef958 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -1017,32 +1017,6 @@
                reg = <0x4a>;
        };
 
-       pca9551@60 {
-               compatible = "nxp,pca9551";
-               reg = <0x60>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               led@0 {
-                       label = "cablecard0-cxp-top";
-                       reg = <0>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-
-               led@1 {
-                       label = "cablecard0-cxp-bot";
-                       reg = <1>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-       };
-
        pca9546@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
@@ -1060,6 +1034,32 @@
                                compatible = "atmel,24c64";
                                reg = <0x50>;
                        };
+
+                       pca9551@60 {
+                               compatible = "nxp,pca9551";
+                               reg = <0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
+
+                               led@0 {
+                                       label = "cablecard0-cxp-top";
+                                       reg = <0>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+
+                               led@1 {
+                                       label = "cablecard0-cxp-bot";
+                                       reg = <1>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+                       };
                };
 
                i2c4mux0chn1: i2c@1 {
@@ -1099,58 +1099,6 @@
                reg = <0x49>;
        };
 
-       pca9551@60 {
-               compatible = "nxp,pca9551";
-               reg = <0x60>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               led@0 {
-                       label = "cablecard3-cxp-top";
-                       reg = <0>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-
-               led@1 {
-                       label = "cablecard3-cxp-bot";
-                       reg = <1>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-       };
-
-       pca9551@61 {
-               compatible = "nxp,pca9551";
-               reg = <0x61>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               led@0 {
-                       label = "cablecard4-cxp-top";
-                       reg = <0>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-
-               led@1 {
-                       label = "cablecard4-cxp-bot";
-                       reg = <1>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-       };
-
        pca9546@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
@@ -1168,6 +1116,32 @@
                                compatible = "atmel,24c64";
                                reg = <0x50>;
                        };
+
+                       pca9551@60 {
+                               compatible = "nxp,pca9551";
+                               reg = <0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
+
+                               led@0 {
+                                       label = "cablecard3-cxp-top";
+                                       reg = <0>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+
+                               led@1 {
+                                       label = "cablecard3-cxp-bot";
+                                       reg = <1>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+                       };
                };
 
                i2c5mux0chn1: i2c@1 {
@@ -1179,6 +1153,32 @@
                                compatible = "atmel,24c64";
                                reg = <0x51>;
                        };
+
+                       pca9551@61 {
+                               compatible = "nxp,pca9551";
+                               reg = <0x61>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
+
+                               led@0 {
+                                       label = "cablecard4-cxp-top";
+                                       reg = <0>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+
+                               led@1 {
+                                       label = "cablecard4-cxp-bot";
+                                       reg = <1>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+                       };
                };
        };
 };
@@ -2031,32 +2031,6 @@
                reg = <0x49>;
        };
 
-       pca9551@60 {
-               compatible = "nxp,pca9551";
-               reg = <0x60>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               gpio-controller;
-               #gpio-cells = <2>;
-
-               led@0 {
-                       label = "cablecard10-cxp-top";
-                       reg = <0>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-
-               led@1 {
-                       label = "cablecard10-cxp-bot";
-                       reg = <1>;
-                       retain-state-shutdown;
-                       default-state = "keep";
-                       type = <PCA955X_TYPE_LED>;
-               };
-       };
-
        pca9546@70 {
                compatible = "nxp,pca9546";
                reg = <0x70>;
@@ -2074,6 +2048,32 @@
                                compatible = "atmel,24c64";
                                reg = <0x50>;
                        };
+
+                       pca9551@60 {
+                               compatible = "nxp,pca9551";
+                               reg = <0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               gpio-controller;
+                               #gpio-cells = <2>;
+
+                               led@0 {
+                                       label = "cablecard10-cxp-top";
+                                       reg = <0>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+
+                               led@1 {
+                                       label = "cablecard10-cxp-bot";
+                                       reg = <1>;
+                                       retain-state-shutdown;
+                                       default-state = "keep";
+                                       type = <PCA955X_TYPE_LED>;
+                               };
+                       };
                };
 
                i2c11mux0chn1: i2c@1 {