ARM: dts: aspeed: everest: Reorganise FSI description

Use the P10 quad FSI CFAM description to reduce duplication and add the
I2C responders and associated engines.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20230809074921.116987-5-joel@jms.id.au
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
index c6f8f20..632e421 100644 (file)
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
@@ -12,38 +12,6 @@
        compatible = "ibm,everest-bmc", "aspeed,ast2600";
 
        aliases {
-               i2c100 = &cfam0_i2c0;
-               i2c101 = &cfam0_i2c1;
-               i2c110 = &cfam0_i2c10;
-               i2c111 = &cfam0_i2c11;
-               i2c112 = &cfam0_i2c12;
-               i2c113 = &cfam0_i2c13;
-               i2c114 = &cfam0_i2c14;
-               i2c115 = &cfam0_i2c15;
-               i2c202 = &cfam1_i2c2;
-               i2c203 = &cfam1_i2c3;
-               i2c210 = &cfam1_i2c10;
-               i2c211 = &cfam1_i2c11;
-               i2c214 = &cfam1_i2c14;
-               i2c215 = &cfam1_i2c15;
-               i2c216 = &cfam1_i2c16;
-               i2c217 = &cfam1_i2c17;
-               i2c300 = &cfam2_i2c0;
-               i2c301 = &cfam2_i2c1;
-               i2c310 = &cfam2_i2c10;
-               i2c311 = &cfam2_i2c11;
-               i2c312 = &cfam2_i2c12;
-               i2c313 = &cfam2_i2c13;
-               i2c314 = &cfam2_i2c14;
-               i2c315 = &cfam2_i2c15;
-               i2c402 = &cfam3_i2c2;
-               i2c403 = &cfam3_i2c3;
-               i2c410 = &cfam3_i2c10;
-               i2c411 = &cfam3_i2c11;
-               i2c414 = &cfam3_i2c14;
-               i2c415 = &cfam3_i2c15;
-               i2c416 = &cfam3_i2c16;
-               i2c417 = &cfam3_i2c17;
                i2c500 = &cfam4_i2c0;
                i2c501 = &cfam4_i2c1;
                i2c510 = &cfam4_i2c10;
@@ -113,22 +81,72 @@
 
                serial4 = &uart5;
 
-               spi10 = &cfam0_spi0;
-               spi11 = &cfam0_spi1;
-               spi12 = &cfam0_spi2;
-               spi13 = &cfam0_spi3;
-               spi20 = &cfam1_spi0;
-               spi21 = &cfam1_spi1;
-               spi22 = &cfam1_spi2;
-               spi23 = &cfam1_spi3;
-               spi30 = &cfam2_spi0;
-               spi31 = &cfam2_spi1;
-               spi32 = &cfam2_spi2;
-               spi33 = &cfam2_spi3;
-               spi40 = &cfam3_spi0;
-               spi41 = &cfam3_spi1;
-               spi42 = &cfam3_spi2;
-               spi43 = &cfam3_spi3;
+               sbefifo500 = &sbefifo500;
+               sbefifo501 = &sbefifo501;
+               sbefifo510 = &sbefifo510;
+               sbefifo511 = &sbefifo511;
+               sbefifo512 = &sbefifo512;
+               sbefifo513 = &sbefifo513;
+               sbefifo514 = &sbefifo514;
+               sbefifo515 = &sbefifo515;
+               sbefifo602 = &sbefifo602;
+               sbefifo603 = &sbefifo603;
+               sbefifo610 = &sbefifo610;
+               sbefifo611 = &sbefifo611;
+               sbefifo614 = &sbefifo614;
+               sbefifo615 = &sbefifo615;
+               sbefifo616 = &sbefifo616;
+               sbefifo617 = &sbefifo617;
+               sbefifo700 = &sbefifo700;
+               sbefifo701 = &sbefifo701;
+               sbefifo710 = &sbefifo710;
+               sbefifo711 = &sbefifo711;
+               sbefifo712 = &sbefifo712;
+               sbefifo713 = &sbefifo713;
+               sbefifo714 = &sbefifo714;
+               sbefifo715 = &sbefifo715;
+               sbefifo802 = &sbefifo802;
+               sbefifo803 = &sbefifo803;
+               sbefifo810 = &sbefifo810;
+               sbefifo811 = &sbefifo811;
+               sbefifo814 = &sbefifo814;
+               sbefifo815 = &sbefifo815;
+               sbefifo816 = &sbefifo816;
+               sbefifo817 = &sbefifo817;
+
+               scom500 = &scom500;
+               scom501 = &scom501;
+               scom510 = &scom510;
+               scom511 = &scom511;
+               scom512 = &scom512;
+               scom513 = &scom513;
+               scom514 = &scom514;
+               scom515 = &scom515;
+               scom602 = &scom602;
+               scom603 = &scom603;
+               scom610 = &scom610;
+               scom611 = &scom611;
+               scom614 = &scom614;
+               scom615 = &scom615;
+               scom616 = &scom616;
+               scom617 = &scom617;
+               scom700 = &scom700;
+               scom701 = &scom701;
+               scom710 = &scom710;
+               scom711 = &scom711;
+               scom712 = &scom712;
+               scom713 = &scom713;
+               scom714 = &scom714;
+               scom715 = &scom715;
+               scom802 = &scom802;
+               scom803 = &scom803;
+               scom810 = &scom810;
+               scom811 = &scom811;
+               scom814 = &scom814;
+               scom815 = &scom815;
+               scom816 = &scom816;
+               scom817 = &scom817;
+
                spi50 = &cfam4_spi0;
                spi51 = &cfam4_spi1;
                spi52 = &cfam4_spi2;
@@ -2413,23 +2431,15 @@
        clk-phase-mmc-hs200 = <210>, <228>;
 };
 
-&fsim0 {
-       status = "okay";
-
-       #address-cells = <2>;
-       #size-cells = <0>;
 
-       /*
-        * CFAM Reset is supposed to be active low but pass1 hardware is wired
-        * active high.
-        */
-       cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;
+#include "ibm-power10-quad.dtsi"
 
-       cfam@0,0 {      /* DCM0_C0 */
-               reg = <0 0>;
+&fsi_hub0 {
+       cfam@4,0 { /* DCM2_C0 */
+               reg = <4 0>;
                #address-cells = <1>;
                #size-cells = <1>;
-               chip-id = <0>;
+               chip-id = <4>;
 
                scom@1000 {
                        compatible = "ibm,fsi2pib";
@@ -2442,36 +2452,260 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam0_i2c0: i2c-bus@0 {
-                               reg = <0>;      /* OMI01 */
+                       cfam4_i2c0: i2c-bus@0 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <0>;      /* OM01 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom500: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo500: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c1: i2c-bus@1 {
-                               reg = <1>;      /* OMI23 */
+                       cfam4_i2c1: i2c-bus@1 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <1>;      /* OM23 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom501: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo501: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c10: i2c-bus@a {
+                       cfam4_i2c10: i2c-bus@a {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <10>;     /* OP3A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom510: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo510: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c11: i2c-bus@b {
+                       cfam4_i2c11: i2c-bus@b {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <11>;     /* OP3B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom511: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo511: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c12: i2c-bus@c {
+                       cfam4_i2c12: i2c-bus@c {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <12>;     /* OP4A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom512: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo512: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c13: i2c-bus@d {
+                       cfam4_i2c13: i2c-bus@d {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <13>;     /* OP4B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom513: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo513: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c14: i2c-bus@e {
+                       cfam4_i2c14: i2c-bus@e {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <14>;     /* OP5A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom514: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo514: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam0_i2c15: i2c-bus@f {
+                       cfam4_i2c15: i2c-bus@f {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <15>;     /* OP5B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom515: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo515: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
                };
 
@@ -2481,7 +2715,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam0_spi0: spi@0 {
+                       cfam4_spi0: spi@0 {
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2497,7 +2731,7 @@
                                };
                        };
 
-                       cfam0_spi1: spi@20 {
+                       cfam4_spi1: spi@20 {
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2513,9 +2747,9 @@
                                };
                        };
 
-                       cfam0_spi2: spi@40 {
+                       cfam4_spi2: spi@40 {
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2530,9 +2764,9 @@
                                };
                        };
 
-                       cfam0_spi3: spi@60 {
+                       cfam4_spi3: spi@60 {
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2554,7 +2788,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       fsi_occ0: occ {
+                       fsi_occ4: occ {
                                compatible = "ibm,p10-occ";
 
                                occ-hwmon {
@@ -2564,21 +2798,21 @@
                        };
                };
 
-               fsi_hub0: hub@3400 {
+               fsi_hub4: hub@3400 {
                        compatible = "fsi-master-hub";
                        reg = <0x3400 0x400>;
                        #address-cells = <2>;
                        #size-cells = <0>;
+
+                       no-scan-on-init;
                };
        };
-};
 
-&fsi_hub0 {
-       cfam@1,0 { /* DCM0_C1 */
-               reg = <1 0>;
+       cfam@5,0 { /* DCM2_C1 */
+               reg = <5 0>;
                #address-cells = <1>;
                #size-cells = <1>;
-               chip-id = <1>;
+               chip-id = <5>;
 
                scom@1000 {
                        compatible = "ibm,fsi2pib";
@@ -2591,36 +2825,260 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam1_i2c2: i2c-bus@2 {
-                               reg = <2>;      /* OMI45 */
+                       cfam5_i2c2: i2c-bus@2 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <2>;      /* OM45 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom602: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo602: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c3: i2c-bus@3 {
-                               reg = <3>;      /* OMI67 */
+                       cfam5_i2c3: i2c-bus@3 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               reg = <3>;      /* OM67 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom603: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo603: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c10: i2c-bus@a {
+                       cfam5_i2c10: i2c-bus@a {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <10>;     /* OP3A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom610: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo610: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c11: i2c-bus@b {
+                       cfam5_i2c11: i2c-bus@b {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <11>;     /* OP3B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom611: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo611: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c14: i2c-bus@e {
+                       cfam5_i2c14: i2c-bus@e {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <14>;     /* OP5A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom614: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo614: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c15: i2c-bus@f {
+                       cfam5_i2c15: i2c-bus@f {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <15>;     /* OP5B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom615: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo615: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c16: i2c-bus@10 {
+                       cfam5_i2c16: i2c-bus@10 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <16>;     /* OP6A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom616: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo616: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam1_i2c17: i2c-bus@11 {
+                       cfam5_i2c17: i2c-bus@11 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <17>;     /* OP6B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom617: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo617: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
                };
 
@@ -2630,7 +3088,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam1_spi0: spi@0 {
+                       cfam5_spi0: spi@0 {
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2646,7 +3104,7 @@
                                };
                        };
 
-                       cfam1_spi1: spi@20 {
+                       cfam5_spi1: spi@20 {
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2662,9 +3120,9 @@
                                };
                        };
 
-                       cfam1_spi2: spi@40 {
+                       cfam5_spi2: spi@40 {
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2679,9 +3137,9 @@
                                };
                        };
 
-                       cfam1_spi3: spi@60 {
+                       cfam5_spi3: spi@60 {
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2703,7 +3161,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       fsi_occ1: occ {
+                       fsi_occ5: occ {
                                compatible = "ibm,p10-occ";
 
                                occ-hwmon {
@@ -2713,7 +3171,7 @@
                        };
                };
 
-               fsi_hub1: hub@3400 {
+               fsi_hub5: hub@3400 {
                        compatible = "fsi-master-hub";
                        reg = <0x3400 0x400>;
                        #address-cells = <2>;
@@ -2723,11 +3181,11 @@
                };
        };
 
-       cfam@2,0 { /* DCM1_C0 */
-               reg = <2 0>;
+       cfam@6,0 { /* DCM3_C0 */
+               reg = <6 0>;
                #address-cells = <1>;
                #size-cells = <1>;
-               chip-id = <2>;
+               chip-id = <6>;
 
                scom@1000 {
                        compatible = "ibm,fsi2pib";
@@ -2740,36 +3198,260 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam2_i2c0: i2c-bus@0 {
+                       cfam6_i2c0: i2c-bus@0 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <0>;      /* OM01 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom700: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo700: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c1: i2c-bus@1 {
+                       cfam6_i2c1: i2c-bus@1 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <1>;      /* OM23 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom701: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo701: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c10: i2c-bus@a {
+                       cfam6_i2c10: i2c-bus@a {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <10>;     /* OP3A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom710: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo710: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c11: i2c-bus@b {
+                       cfam6_i2c11: i2c-bus@b {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <11>;     /* OP3B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom711: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo711: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c12: i2c-bus@c {
+                       cfam6_i2c12: i2c-bus@c {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <12>;     /* OP4A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom712: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo712: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c13: i2c-bus@d {
+                       cfam6_i2c13: i2c-bus@d {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <13>;     /* OP4B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom713: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo713: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c14: i2c-bus@e {
+                       cfam6_i2c14: i2c-bus@e {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <14>;     /* OP5A */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom714: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo714: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam2_i2c15: i2c-bus@f {
+                       cfam6_i2c15: i2c-bus@f {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <15>;     /* OP5B */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom715: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo715: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
                };
 
@@ -2779,7 +3461,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam2_spi0: spi@0 {
+                       cfam6_spi0: spi@0 {
                                reg = <0x0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2795,7 +3477,7 @@
                                };
                        };
 
-                       cfam2_spi1: spi@20 {
+                       cfam6_spi1: spi@20 {
                                reg = <0x20>;
                                #address-cells = <1>;
                                #size-cells = <0>;
@@ -2811,9 +3493,9 @@
                                };
                        };
 
-                       cfam2_spi2: spi@40 {
+                       cfam6_spi2: spi@40 {
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2828,9 +3510,9 @@
                                };
                        };
 
-                       cfam2_spi3: spi@60 {
+                       cfam6_spi3: spi@60 {
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -2852,7 +3534,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       fsi_occ2: occ {
+                       fsi_occ6: occ {
                                compatible = "ibm,p10-occ";
 
                                occ-hwmon {
@@ -2862,7 +3544,7 @@
                        };
                };
 
-               fsi_hub2: hub@3400 {
+               fsi_hub6: hub@3400 {
                        compatible = "fsi-master-hub";
                        reg = <0x3400 0x400>;
                        #address-cells = <2>;
@@ -2872,11 +3554,11 @@
                };
        };
 
-       cfam@3,0 { /* DCM1_C1 */
-               reg = <3 0>;
+       cfam@7,0 { /* DCM3_C1 */
+               reg = <7 0>;
                #address-cells = <1>;
                #size-cells = <1>;
-               chip-id = <3>;
+               chip-id = <7>;
 
                scom@1000 {
                        compatible = "ibm,fsi2pib";
@@ -2889,635 +3571,263 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
 
-                       cfam3_i2c2: i2c-bus@2 {
+                       cfam7_i2c2: i2c-bus@2 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <2>;      /* OM45 */
+
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
+
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom802: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo802: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam3_i2c3: i2c-bus@3 {
+                       cfam7_i2c3: i2c-bus@3 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <3>;      /* OM67 */
-                       };
 
-                       cfam3_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                       };
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-                       cfam3_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                       };
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                       cfam3_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                       };
+                                               scom803: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                       cfam3_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
+                                               sbefifo803: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
+                               };
                        };
 
-                       cfam3_i2c16: i2c-bus@10 {
-                               reg = <16>;     /* OP6A */
-                       };
-
-                       cfam3_i2c17: i2c-bus@11 {
-                               reg = <17>;     /* OP6B */
-                       };
-               };
-
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam3_spi0: spi@0 {
-                               reg = <0x0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam3_spi1: spi@20 {
-                               reg = <0x20>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam3_spi2: spi@40 {
-                               reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam3_spi3: spi@60 {
-                               reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-               };
-
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       fsi_occ3: occ {
-                               compatible = "ibm,p10-occ";
-
-                               occ-hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
-                               };
-                       };
-               };
-
-               fsi_hub3: hub@3400 {
-                       compatible = "fsi-master-hub";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-
-                       no-scan-on-init;
-               };
-       };
-
-       cfam@4,0 { /* DCM2_C0 */
-               reg = <4 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <4>;
-
-               scom@1000 {
-                       compatible = "ibm,fsi2pib";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,fsi-i2c-master";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam4_i2c0: i2c-bus@0 {
-                               reg = <0>;      /* OM01 */
-                       };
-
-                       cfam4_i2c1: i2c-bus@1 {
-                               reg = <1>;      /* OM23 */
-                       };
-
-                       cfam4_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                       };
-
-                       cfam4_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                       };
-
-                       cfam4_i2c12: i2c-bus@c {
-                               reg = <12>;     /* OP4A */
-                       };
-
-                       cfam4_i2c13: i2c-bus@d {
-                               reg = <13>;     /* OP4B */
-                       };
-
-                       cfam4_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                       };
-
-                       cfam4_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
-                       };
-               };
-
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam4_spi0: spi@0 {
-                               reg = <0x0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam4_spi1: spi@20 {
-                               reg = <0x20>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam4_spi2: spi@40 {
-                               reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-
-                       cfam4_spi3: spi@60 {
-                               reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-               };
-
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       fsi_occ4: occ {
-                               compatible = "ibm,p10-occ";
-
-                               occ-hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
-                               };
-                       };
-               };
-
-               fsi_hub4: hub@3400 {
-                       compatible = "fsi-master-hub";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-
-                       no-scan-on-init;
-               };
-       };
-
-       cfam@5,0 { /* DCM2_C1 */
-               reg = <5 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <5>;
-
-               scom@1000 {
-                       compatible = "ibm,fsi2pib";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,fsi-i2c-master";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam5_i2c2: i2c-bus@2 {
-                               reg = <2>;      /* OM45 */
-                       };
-
-                       cfam5_i2c3: i2c-bus@3 {
-                               reg = <3>;      /* OM67 */
-                       };
-
-                       cfam5_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                       };
-
-                       cfam5_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                       };
-
-                       cfam5_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                       };
-
-                       cfam5_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
-                       };
-
-                       cfam5_i2c16: i2c-bus@10 {
-                               reg = <16>;     /* OP6A */
-                       };
-
-                       cfam5_i2c17: i2c-bus@11 {
-                               reg = <17>;     /* OP6B */
-                       };
-               };
-
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam5_spi0: spi@0 {
-                               reg = <0x0>;
+                       cfam7_i2c10: i2c-bus@a {
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               reg = <10>;     /* OP3A */
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-                       cfam5_spi1: spi@20 {
-                               reg = <0x20>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
+                                               scom810: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
+                                               sbefifo810: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
 
-                       cfam5_spi2: spi@40 {
-                               reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
+                       cfam7_i2c11: i2c-bus@b {
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               reg = <11>;     /* OP3B */
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
+
+                                               scom811: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo811: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
 
-                       cfam5_spi3: spi@60 {
-                               reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                       cfam7_i2c14: i2c-bus@e {
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               reg = <14>;     /* OP5A */
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-               };
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                       fsi_occ5: occ {
-                               compatible = "ibm,p10-occ";
+                                               scom814: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                               occ-hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
+                                               sbefifo814: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
-               };
-
-               fsi_hub5: hub@3400 {
-                       compatible = "fsi-master-hub";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-
-                       no-scan-on-init;
-               };
-       };
-
-       cfam@6,0 { /* DCM3_C0 */
-               reg = <6 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <6>;
-
-               scom@1000 {
-                       compatible = "ibm,fsi2pib";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,fsi-i2c-master";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam6_i2c0: i2c-bus@0 {
-                               reg = <0>;      /* OM01 */
-                       };
-
-                       cfam6_i2c1: i2c-bus@1 {
-                               reg = <1>;      /* OM23 */
-                       };
 
-                       cfam6_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                       };
-
-                       cfam6_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                       };
-
-                       cfam6_i2c12: i2c-bus@c {
-                               reg = <12>;     /* OP4A */
-                       };
-
-                       cfam6_i2c13: i2c-bus@d {
-                               reg = <13>;     /* OP4B */
-                       };
-
-                       cfam6_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                       };
-
-                       cfam6_i2c15: i2c-bus@f {
+                       cfam7_i2c15: i2c-bus@f {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
                                reg = <15>;     /* OP5B */
-                       };
-               };
 
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-                       cfam6_spi0: spi@0 {
-                               reg = <0x0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
+                                               scom815: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
+                                               sbefifo815: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
 
-                       cfam6_spi1: spi@20 {
-                               reg = <0x20>;
+                       cfam7_i2c16: i2c-bus@10 {
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               reg = <16>;     /* OP6A */
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-                       cfam6_spi2: spi@40 {
-                               reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
+                                               scom816: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
+                                               sbefifo816: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
 
-                       cfam6_spi3: spi@60 {
-                               reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                       cfam7_i2c17: i2c-bus@11 {
                                #address-cells = <1>;
                                #size-cells = <0>;
+                               reg = <17>;     /* OP6B */
 
-                               eeprom@0 {
-                                       at25,byte-len = <0x80000>;
-                                       at25,addr-mode = <4>;
-                                       at25,page-size = <256>;
-
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       spi-max-frequency = <1000000>;
-                               };
-                       };
-               };
+                               i2cr@20 {
+                                       compatible = "ibm,i2cr-fsi-master";
+                                       reg = <0x20>;
+                                       #address-cells = <2>;
+                                       #size-cells = <0>;
 
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+                                       cfam@0,0 {
+                                               reg = <0 0>;
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                               chip-id = <0>;
 
-                       fsi_occ6: occ {
-                               compatible = "ibm,p10-occ";
+                                               scom817: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
 
-                               occ-hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
+                                               sbefifo817: sbefifo@2400 {
+                                                       compatible = "ibm,p9-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                                       #address-cells = <1>;
+                                                       #size-cells = <0>;
+                                               };
+                                       };
                                };
                        };
                };
 
-               fsi_hub6: hub@3400 {
-                       compatible = "fsi-master-hub";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-
-                       no-scan-on-init;
-               };
-       };
-
-       cfam@7,0 { /* DCM3_C1 */
-               reg = <7 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <7>;
-
-               scom@1000 {
-                       compatible = "ibm,fsi2pib";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,fsi-i2c-master";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam7_i2c2: i2c-bus@2 {
-                               reg = <2>;      /* OM45 */
-                       };
-
-                       cfam7_i2c3: i2c-bus@3 {
-                               reg = <3>;      /* OM67 */
-                       };
-
-                       cfam7_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                       };
-
-                       cfam7_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                       };
-
-                       cfam7_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                       };
-
-                       cfam7_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
-                       };
-
-                       cfam7_i2c16: i2c-bus@10 {
-                               reg = <16>;     /* OP6A */
-                       };
-
-                       cfam7_i2c17: i2c-bus@11 {
-                               reg = <17>;     /* OP6B */
-                       };
-               };
-
                fsi2spi@1c00 {
                        compatible = "ibm,fsi2spi";
                        reg = <0x1c00 0x400>;
@@ -3558,7 +3868,7 @@
 
                        cfam7_spi2: spi@40 {
                                reg = <0x40>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3575,7 +3885,7 @@
 
                        cfam7_spi3: spi@60 {
                                reg = <0x60>;
-                               compatible = "ibm,fsi2spi-restricted";
+                               compatible = "ibm,fsi2spi";
                                #address-cells = <1>;
                                #size-cells = <0>;
 
@@ -3619,22 +3929,6 @@
 };
 
 /* Legacy OCC numbering (to get rid of when userspace is fixed) */
-&fsi_occ0 {
-       reg = <1>;
-};
-
-&fsi_occ1 {
-       reg = <2>;
-};
-
-&fsi_occ2 {
-       reg = <3>;
-};
-
-&fsi_occ3 {
-       reg = <4>;
-};
-
 &fsi_occ4 {
        reg = <5>;
 };