Skip to content

L
linux
Commit f0eb62ec authored by Eddie James's avatar Eddie James Committed by Joel Stanley
Browse files
Options

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: default avatarEddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20230809074921.116987-5-joel@jms.id.auSigned-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent 71354f77
Show whitespace changes
Inline Side-by-side
Showing with 1003 additions and 709 deletions
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts
View file @ f0eb62ec
...@@ -12,38 +12,6 @@ / { ...@@ -12,38 +12,6 @@ / {
compatible = "ibm,everest-bmc", "aspeed,ast2600"; compatible = "ibm,everest-bmc", "aspeed,ast2600";
aliases { 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; i2c500 = &cfam4_i2c0;
i2c501 = &cfam4_i2c1; i2c501 = &cfam4_i2c1;
i2c510 = &cfam4_i2c10; i2c510 = &cfam4_i2c10;
...@@ -113,22 +81,72 @@ aliases { ...@@ -113,22 +81,72 @@ aliases {
serial4 = &uart5; serial4 = &uart5;
spi10 = &cfam0_spi0; sbefifo500 = &sbefifo500;
spi11 = &cfam0_spi1; sbefifo501 = &sbefifo501;
spi12 = &cfam0_spi2; sbefifo510 = &sbefifo510;
spi13 = &cfam0_spi3; sbefifo511 = &sbefifo511;
spi20 = &cfam1_spi0; sbefifo512 = &sbefifo512;
spi21 = &cfam1_spi1; sbefifo513 = &sbefifo513;
spi22 = &cfam1_spi2; sbefifo514 = &sbefifo514;
spi23 = &cfam1_spi3; sbefifo515 = &sbefifo515;
spi30 = &cfam2_spi0; sbefifo602 = &sbefifo602;
spi31 = &cfam2_spi1; sbefifo603 = &sbefifo603;
spi32 = &cfam2_spi2; sbefifo610 = &sbefifo610;
spi33 = &cfam2_spi3; sbefifo611 = &sbefifo611;
spi40 = &cfam3_spi0; sbefifo614 = &sbefifo614;
spi41 = &cfam3_spi1; sbefifo615 = &sbefifo615;
spi42 = &cfam3_spi2; sbefifo616 = &sbefifo616;
spi43 = &cfam3_spi3; 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; spi50 = &cfam4_spi0;
spi51 = &cfam4_spi1; spi51 = &cfam4_spi1;
spi52 = &cfam4_spi2; spi52 = &cfam4_spi2;
...@@ -2413,23 +2431,15 @@ &emmc { ...@@ -2413,23 +2431,15 @@ &emmc {
clk-phase-mmc-hs200 = <210>, <228>; clk-phase-mmc-hs200 = <210>, <228>;
}; };
&fsim0 {
status = "okay";
#address-cells = <2>;
#size-cells = <0>;
/* #include "ibm-power10-quad.dtsi"
* 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>;
cfam@0,0 { /* DCM0_C0 */ &fsi_hub0 {
reg = <0 0>; cfam@4,0 { /* DCM2_C0 */
reg = <4 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <0>; chip-id = <4>;
scom@1000 { scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,fsi2pib";
...@@ -2442,185 +2452,260 @@ i2c@1800 { ...@@ -2442,185 +2452,260 @@ i2c@1800 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam0_i2c0: i2c-bus@0 { cfam4_i2c0: i2c-bus@0 {
reg = <0>; /* OMI01 */ #address-cells = <1>;
}; #size-cells = <0>;
reg = <0>; /* OM01 */
cfam0_i2c1: i2c-bus@1 {
reg = <1>; /* OMI23 */
};
cfam0_i2c10: i2c-bus@a { i2cr@20 {
reg = <10>; /* OP3A */ compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam0_i2c11: i2c-bus@b { cfam@0,0 {
reg = <11>; /* OP3B */ reg = <0 0>;
}; #address-cells = <1>;
#size-cells = <1>;
chip-id = <0>;
cfam0_i2c12: i2c-bus@c { scom500: scom@1000 {
reg = <12>; /* OP4A */ compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
cfam0_i2c13: i2c-bus@d { sbefifo500: sbefifo@2400 {
reg = <13>; /* OP4B */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
}; };
cfam0_i2c14: i2c-bus@e {
reg = <14>; /* OP5A */
}; };
cfam0_i2c15: i2c-bus@f {
reg = <15>; /* OP5B */
}; };
}; };
fsi2spi@1c00 { cfam4_i2c1: i2c-bus@1 {
compatible = "ibm,fsi2spi";
reg = <0x1c00 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <1>; /* OM23 */
cfam0_spi0: spi@0 { i2cr@20 {
reg = <0x0>; compatible = "ibm,i2cr-fsi-master";
#address-cells = <1>; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
eeprom@0 { cfam@0,0 {
at25,byte-len = <0x80000>; reg = <0 0>;
at25,addr-mode = <4>; #address-cells = <1>;
at25,page-size = <256>; #size-cells = <1>;
chip-id = <0>;
compatible = "atmel,at25"; scom501: scom@1000 {
reg = <0>; compatible = "ibm,i2cr-scom";
spi-max-frequency = <1000000>; reg = <0x1000 0x400>;
};
sbefifo501: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
}; };
}; };
cfam0_spi1: spi@20 { cfam4_i2c10: i2c-bus@a {
reg = <0x20>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <10>; /* OP3A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #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_spi2: spi@40 { cfam4_i2c11: i2c-bus@b {
reg = <0x40>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <11>; /* OP3B */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #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_spi3: spi@60 { cfam4_i2c12: i2c-bus@c {
reg = <0x60>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <12>; /* OP4A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #address-cells = <1>;
}; #size-cells = <1>;
}; chip-id = <0>;
scom512: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
sbefifo@2400 { sbefifo512: sbefifo@2400 {
compatible = "ibm,p9-sbefifo"; compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
};
fsi_occ0: occ {
compatible = "ibm,p10-occ";
occ-hwmon {
compatible = "ibm,p10-occ-hwmon";
ibm,no-poll-on-init;
}; };
}; };
}; };
fsi_hub0: hub@3400 { cfam4_i2c13: i2c-bus@d {
compatible = "fsi-master-hub"; #address-cells = <1>;
reg = <0x3400 0x400>; #size-cells = <0>;
reg = <13>; /* OP4B */
i2cr@20 {
compatible = "ibm,i2cr-fsi-master";
reg = <0x20>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
};
};
};
&fsi_hub0 { cfam@0,0 {
cfam@1,0 { /* DCM0_C1 */ reg = <0 0>;
reg = <1 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <1>; chip-id = <0>;
scom@1000 { scom513: scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
}; };
i2c@1800 { sbefifo513: sbefifo@2400 {
compatible = "ibm,fsi-i2c-master"; compatible = "ibm,p9-sbefifo";
reg = <0x1800 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam1_i2c2: i2c-bus@2 {
reg = <2>; /* OMI45 */
}; };
cfam1_i2c3: i2c-bus@3 {
reg = <3>; /* OMI67 */
}; };
cfam1_i2c10: i2c-bus@a {
reg = <10>; /* OP3A */
}; };
cfam1_i2c11: i2c-bus@b {
reg = <11>; /* OP3B */
}; };
cfam1_i2c14: i2c-bus@e { cfam4_i2c14: i2c-bus@e {
#address-cells = <1>;
#size-cells = <0>;
reg = <14>; /* OP5A */ 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>;
}; };
cfam1_i2c15: i2c-bus@f { sbefifo514: sbefifo@2400 {
reg = <15>; /* OP5B */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam1_i2c16: i2c-bus@10 { cfam4_i2c15: i2c-bus@f {
reg = <16>; /* OP6A */ #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>;
}; };
cfam1_i2c17: i2c-bus@11 { sbefifo515: sbefifo@2400 {
reg = <17>; /* OP6B */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
}; };
...@@ -2630,7 +2715,7 @@ fsi2spi@1c00 { ...@@ -2630,7 +2715,7 @@ fsi2spi@1c00 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam1_spi0: spi@0 { cfam4_spi0: spi@0 {
reg = <0x0>; reg = <0x0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2646,7 +2731,7 @@ eeprom@0 { ...@@ -2646,7 +2731,7 @@ eeprom@0 {
}; };
}; };
cfam1_spi1: spi@20 { cfam4_spi1: spi@20 {
reg = <0x20>; reg = <0x20>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2662,9 +2747,9 @@ eeprom@0 { ...@@ -2662,9 +2747,9 @@ eeprom@0 {
}; };
}; };
cfam1_spi2: spi@40 { cfam4_spi2: spi@40 {
reg = <0x40>; reg = <0x40>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2679,9 +2764,9 @@ eeprom@0 { ...@@ -2679,9 +2764,9 @@ eeprom@0 {
}; };
}; };
cfam1_spi3: spi@60 { cfam4_spi3: spi@60 {
reg = <0x60>; reg = <0x60>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2703,7 +2788,7 @@ sbefifo@2400 { ...@@ -2703,7 +2788,7 @@ sbefifo@2400 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fsi_occ1: occ { fsi_occ4: occ {
compatible = "ibm,p10-occ"; compatible = "ibm,p10-occ";
occ-hwmon { occ-hwmon {
...@@ -2713,7 +2798,7 @@ occ-hwmon { ...@@ -2713,7 +2798,7 @@ occ-hwmon {
}; };
}; };
fsi_hub1: hub@3400 { fsi_hub4: hub@3400 {
compatible = "fsi-master-hub"; compatible = "fsi-master-hub";
reg = <0x3400 0x400>; reg = <0x3400 0x400>;
#address-cells = <2>; #address-cells = <2>;
...@@ -2723,11 +2808,11 @@ fsi_hub1: hub@3400 { ...@@ -2723,11 +2808,11 @@ fsi_hub1: hub@3400 {
}; };
}; };
cfam@2,0 { /* DCM1_C0 */ cfam@5,0 { /* DCM2_C1 */
reg = <2 0>; reg = <5 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <2>; chip-id = <5>;
scom@1000 { scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,fsi2pib";
...@@ -2740,185 +2825,260 @@ i2c@1800 { ...@@ -2740,185 +2825,260 @@ i2c@1800 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam2_i2c0: i2c-bus@0 { cfam5_i2c2: i2c-bus@2 {
reg = <0>; /* OM01 */ #address-cells = <1>;
}; #size-cells = <0>;
reg = <2>; /* OM45 */
cfam2_i2c1: i2c-bus@1 { i2cr@20 {
reg = <1>; /* OM23 */ compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam2_i2c10: i2c-bus@a { cfam@0,0 {
reg = <10>; /* OP3A */ reg = <0 0>;
}; #address-cells = <1>;
#size-cells = <1>;
chip-id = <0>;
cfam2_i2c11: i2c-bus@b { scom602: scom@1000 {
reg = <11>; /* OP3B */ compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
cfam2_i2c12: i2c-bus@c { sbefifo602: sbefifo@2400 {
reg = <12>; /* OP4A */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
}; };
cfam2_i2c13: i2c-bus@d {
reg = <13>; /* OP4B */
}; };
cfam2_i2c14: i2c-bus@e {
reg = <14>; /* OP5A */
};
cfam2_i2c15: i2c-bus@f {
reg = <15>; /* OP5B */
}; };
}; };
fsi2spi@1c00 { cfam5_i2c3: i2c-bus@3 {
compatible = "ibm,fsi2spi";
reg = <0x1c00 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <3>; /* OM67 */
cfam2_spi0: spi@0 { i2cr@20 {
reg = <0x0>; compatible = "ibm,i2cr-fsi-master";
#address-cells = <1>; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
eeprom@0 { cfam@0,0 {
at25,byte-len = <0x80000>; reg = <0 0>;
at25,addr-mode = <4>; #address-cells = <1>;
at25,page-size = <256>; #size-cells = <1>;
chip-id = <0>;
compatible = "atmel,at25"; scom603: scom@1000 {
reg = <0>; compatible = "ibm,i2cr-scom";
spi-max-frequency = <1000000>; reg = <0x1000 0x400>;
};
sbefifo603: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
}; };
}; };
cfam2_spi1: spi@20 { cfam5_i2c10: i2c-bus@a {
reg = <0x20>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <10>; /* OP3A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #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>;
};
};
}; };
}; };
cfam2_spi2: spi@40 { cfam5_i2c11: i2c-bus@b {
reg = <0x40>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <11>; /* OP3B */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #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>;
};
};
}; };
}; };
cfam2_spi3: spi@60 { cfam5_i2c14: i2c-bus@e {
reg = <0x60>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <14>; /* OP5A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #address-cells = <1>;
}; #size-cells = <1>;
}; chip-id = <0>;
scom614: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
sbefifo@2400 { sbefifo614: sbefifo@2400 {
compatible = "ibm,p9-sbefifo"; compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
};
fsi_occ2: occ {
compatible = "ibm,p10-occ";
occ-hwmon {
compatible = "ibm,p10-occ-hwmon";
ibm,no-poll-on-init;
}; };
}; };
}; };
fsi_hub2: hub@3400 { cfam5_i2c15: i2c-bus@f {
compatible = "fsi-master-hub"; #address-cells = <1>;
reg = <0x3400 0x400>; #size-cells = <0>;
reg = <15>; /* OP5B */
i2cr@20 {
compatible = "ibm,i2cr-fsi-master";
reg = <0x20>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
no-scan-on-init; 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>;
};
};
}; };
}; };
cfam@3,0 { /* DCM1_C1 */ cfam5_i2c16: i2c-bus@10 {
reg = <3 0>; #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>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <3>; chip-id = <0>;
scom@1000 { scom616: scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
}; };
i2c@1800 { sbefifo616: sbefifo@2400 {
compatible = "ibm,fsi-i2c-master"; compatible = "ibm,p9-sbefifo";
reg = <0x1800 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam3_i2c2: i2c-bus@2 {
reg = <2>; /* OM45 */
}; };
cfam3_i2c3: i2c-bus@3 {
reg = <3>; /* OM67 */
}; };
cfam3_i2c10: i2c-bus@a {
reg = <10>; /* OP3A */
}; };
cfam3_i2c11: i2c-bus@b {
reg = <11>; /* OP3B */
}; };
cfam3_i2c14: i2c-bus@e { cfam5_i2c17: i2c-bus@11 {
reg = <14>; /* OP5A */ #address-cells = <1>;
}; #size-cells = <0>;
reg = <17>; /* OP6B */
cfam3_i2c15: i2c-bus@f { i2cr@20 {
reg = <15>; /* OP5B */ compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam3_i2c16: i2c-bus@10 { cfam@0,0 {
reg = <16>; /* OP6A */ reg = <0 0>;
#address-cells = <1>;
#size-cells = <1>;
chip-id = <0>;
scom617: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
cfam3_i2c17: i2c-bus@11 { sbefifo617: sbefifo@2400 {
reg = <17>; /* OP6B */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
}; };
...@@ -2928,7 +3088,7 @@ fsi2spi@1c00 { ...@@ -2928,7 +3088,7 @@ fsi2spi@1c00 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam3_spi0: spi@0 { cfam5_spi0: spi@0 {
reg = <0x0>; reg = <0x0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2944,7 +3104,7 @@ eeprom@0 { ...@@ -2944,7 +3104,7 @@ eeprom@0 {
}; };
}; };
cfam3_spi1: spi@20 { cfam5_spi1: spi@20 {
reg = <0x20>; reg = <0x20>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2960,9 +3120,9 @@ eeprom@0 { ...@@ -2960,9 +3120,9 @@ eeprom@0 {
}; };
}; };
cfam3_spi2: spi@40 { cfam5_spi2: spi@40 {
reg = <0x40>; reg = <0x40>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -2977,9 +3137,9 @@ eeprom@0 { ...@@ -2977,9 +3137,9 @@ eeprom@0 {
}; };
}; };
cfam3_spi3: spi@60 { cfam5_spi3: spi@60 {
reg = <0x60>; reg = <0x60>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -3001,7 +3161,7 @@ sbefifo@2400 { ...@@ -3001,7 +3161,7 @@ sbefifo@2400 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fsi_occ3: occ { fsi_occ5: occ {
compatible = "ibm,p10-occ"; compatible = "ibm,p10-occ";
occ-hwmon { occ-hwmon {
...@@ -3011,7 +3171,7 @@ occ-hwmon { ...@@ -3011,7 +3171,7 @@ occ-hwmon {
}; };
}; };
fsi_hub3: hub@3400 { fsi_hub5: hub@3400 {
compatible = "fsi-master-hub"; compatible = "fsi-master-hub";
reg = <0x3400 0x400>; reg = <0x3400 0x400>;
#address-cells = <2>; #address-cells = <2>;
...@@ -3021,11 +3181,11 @@ fsi_hub3: hub@3400 { ...@@ -3021,11 +3181,11 @@ fsi_hub3: hub@3400 {
}; };
}; };
cfam@4,0 { /* DCM2_C0 */ cfam@6,0 { /* DCM3_C0 */
reg = <4 0>; reg = <6 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <4>; chip-id = <6>;
scom@1000 { scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,fsi2pib";
...@@ -3038,334 +3198,260 @@ i2c@1800 { ...@@ -3038,334 +3198,260 @@ i2c@1800 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
cfam4_i2c0: i2c-bus@0 { cfam6_i2c0: i2c-bus@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>; /* OM01 */ reg = <0>; /* OM01 */
};
cfam4_i2c1: i2c-bus@1 { i2cr@20 {
reg = <1>; /* OM23 */ compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
cfam4_i2c10: i2c-bus@a { #size-cells = <0>;
reg = <10>; /* OP3A */
};
cfam4_i2c11: i2c-bus@b { cfam@0,0 {
reg = <11>; /* OP3B */ reg = <0 0>;
}; #address-cells = <1>;
#size-cells = <1>;
chip-id = <0>;
cfam4_i2c12: i2c-bus@c { scom700: scom@1000 {
reg = <12>; /* OP4A */ compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
cfam4_i2c13: i2c-bus@d { sbefifo700: sbefifo@2400 {
reg = <13>; /* OP4B */ compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
}; };
cfam4_i2c14: i2c-bus@e {
reg = <14>; /* OP5A */
}; };
cfam4_i2c15: i2c-bus@f {
reg = <15>; /* OP5B */
}; };
}; };
fsi2spi@1c00 { cfam6_i2c1: i2c-bus@1 {
compatible = "ibm,fsi2spi";
reg = <0x1c00 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <1>; /* OM23 */
cfam4_spi0: spi@0 { i2cr@20 {
reg = <0x0>; compatible = "ibm,i2cr-fsi-master";
#address-cells = <1>; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
eeprom@0 { cfam@0,0 {
at25,byte-len = <0x80000>; reg = <0 0>;
at25,addr-mode = <4>; #address-cells = <1>;
at25,page-size = <256>; #size-cells = <1>;
chip-id = <0>;
compatible = "atmel,at25"; scom701: scom@1000 {
reg = <0>; compatible = "ibm,i2cr-scom";
spi-max-frequency = <1000000>; reg = <0x1000 0x400>;
};
}; };
cfam4_spi1: spi@20 { sbefifo701: sbefifo@2400 {
reg = <0x20>; compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 { cfam6_i2c10: i2c-bus@a {
reg = <0x60>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <10>; /* OP3A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #address-cells = <1>;
}; #size-cells = <1>;
}; chip-id = <0>;
scom710: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
sbefifo@2400 { sbefifo710: sbefifo@2400 {
compatible = "ibm,p9-sbefifo"; compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 { cfam6_i2c11: i2c-bus@b {
compatible = "fsi-master-hub"; #address-cells = <1>;
reg = <0x3400 0x400>;
#address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
reg = <11>; /* OP3B */
no-scan-on-init; i2cr@20 {
}; compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam@5,0 { /* DCM2_C1 */ cfam@0,0 {
reg = <5 0>; reg = <0 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <5>; chip-id = <0>;
scom@1000 { scom711: scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
}; };
i2c@1800 { sbefifo711: sbefifo@2400 {
compatible = "ibm,fsi-i2c-master"; compatible = "ibm,p9-sbefifo";
reg = <0x1800 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 { cfam6_i2c12: i2c-bus@c {
reg = <14>; /* OP5A */ #address-cells = <1>;
}; #size-cells = <0>;
reg = <12>; /* OP4A */
cfam5_i2c15: i2c-bus@f { i2cr@20 {
reg = <15>; /* OP5B */ compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam5_i2c16: i2c-bus@10 { cfam@0,0 {
reg = <16>; /* OP6A */ reg = <0 0>;
}; #address-cells = <1>;
#size-cells = <1>;
chip-id = <0>;
cfam5_i2c17: i2c-bus@11 { scom712: scom@1000 {
reg = <17>; /* OP6B */ compatible = "ibm,i2cr-scom";
}; reg = <0x1000 0x400>;
}; };
fsi2spi@1c00 { sbefifo712: sbefifo@2400 {
compatible = "ibm,fsi2spi"; compatible = "ibm,p9-sbefifo";
reg = <0x1c00 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
};
};
};
};
cfam5_spi0: spi@0 { cfam6_i2c13: i2c-bus@d {
reg = <0x0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <13>; /* OP4B */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>;
at25,page-size = <256>;
compatible = "atmel,at25";
reg = <0>;
spi-max-frequency = <1000000>;
};
};
cfam5_spi1: spi@20 {
reg = <0x20>; reg = <0x20>;
#address-cells = <1>; #address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
eeprom@0 { cfam@0,0 {
at25,byte-len = <0x80000>; reg = <0 0>;
at25,addr-mode = <4>; #address-cells = <1>;
at25,page-size = <256>; #size-cells = <1>;
chip-id = <0>;
compatible = "atmel,at25"; scom713: scom@1000 {
reg = <0>; compatible = "ibm,i2cr-scom";
spi-max-frequency = <1000000>; reg = <0x1000 0x400>;
};
}; };
cfam5_spi2: spi@40 { sbefifo713: sbefifo@2400 {
reg = <0x40>; compatible = "ibm,p9-sbefifo";
compatible = "ibm,fsi2spi-restricted"; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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>;
}; };
}; };
cfam5_spi3: spi@60 { cfam6_i2c14: i2c-bus@e {
reg = <0x60>;
compatible = "ibm,fsi2spi-restricted";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <14>; /* OP5A */
eeprom@0 { i2cr@20 {
at25,byte-len = <0x80000>; compatible = "ibm,i2cr-fsi-master";
at25,addr-mode = <4>; reg = <0x20>;
at25,page-size = <256>; #address-cells = <2>;
#size-cells = <0>;
compatible = "atmel,at25"; cfam@0,0 {
reg = <0>; reg = <0 0>;
spi-max-frequency = <1000000>; #address-cells = <1>;
}; #size-cells = <1>;
}; chip-id = <0>;
scom714: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
}; };
sbefifo@2400 { sbefifo714: sbefifo@2400 {
compatible = "ibm,p9-sbefifo"; compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
};
fsi_occ5: occ {
compatible = "ibm,p10-occ";
occ-hwmon {
compatible = "ibm,p10-occ-hwmon";
ibm,no-poll-on-init;
}; };
}; };
}; };
fsi_hub5: hub@3400 { cfam6_i2c15: i2c-bus@f {
compatible = "fsi-master-hub"; #address-cells = <1>;
reg = <0x3400 0x400>;
#address-cells = <2>;
#size-cells = <0>; #size-cells = <0>;
reg = <15>; /* OP5B */
no-scan-on-init; i2cr@20 {
}; compatible = "ibm,i2cr-fsi-master";
}; reg = <0x20>;
#address-cells = <2>;
#size-cells = <0>;
cfam@6,0 { /* DCM3_C0 */ cfam@0,0 {
reg = <6 0>; reg = <0 0>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
chip-id = <6>; chip-id = <0>;
scom@1000 { scom715: scom@1000 {
compatible = "ibm,fsi2pib"; compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>; reg = <0x1000 0x400>;
}; };
i2c@1800 { sbefifo715: sbefifo@2400 {
compatible = "ibm,fsi-i2c-master"; compatible = "ibm,p9-sbefifo";
reg = <0x1800 0x400>; reg = <0x2400 0x400>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #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 {
reg = <15>; /* OP5B */
}; };
}; };
...@@ -3409,7 +3495,7 @@ eeprom@0 { ...@@ -3409,7 +3495,7 @@ eeprom@0 {
cfam6_spi2: spi@40 { cfam6_spi2: spi@40 {
reg = <0x40>; reg = <0x40>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -3426,7 +3512,7 @@ eeprom@0 { ...@@ -3426,7 +3512,7 @@ eeprom@0 {
cfam6_spi3: spi@60 { cfam6_spi3: spi@60 {
reg = <0x60>; reg = <0x60>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -3486,35 +3572,259 @@ i2c@1800 { ...@@ -3486,35 +3572,259 @@ i2c@1800 {
#size-cells = <0>; #size-cells = <0>;
cfam7_i2c2: i2c-bus@2 { cfam7_i2c2: i2c-bus@2 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2>; /* OM45 */ 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>;
};
};
};
}; };
cfam7_i2c3: i2c-bus@3 { cfam7_i2c3: i2c-bus@3 {
#address-cells = <1>;
#size-cells = <0>;
reg = <3>; /* OM67 */ 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>;
scom803: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo803: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam7_i2c10: i2c-bus@a { cfam7_i2c10: i2c-bus@a {
#address-cells = <1>;
#size-cells = <0>;
reg = <10>; /* OP3A */ 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>;
scom810: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo810: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam7_i2c11: i2c-bus@b { cfam7_i2c11: i2c-bus@b {
#address-cells = <1>;
#size-cells = <0>;
reg = <11>; /* OP3B */ 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>;
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>;
};
};
};
}; };
cfam7_i2c14: i2c-bus@e { cfam7_i2c14: i2c-bus@e {
#address-cells = <1>;
#size-cells = <0>;
reg = <14>; /* OP5A */ 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>;
scom814: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo814: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam7_i2c15: i2c-bus@f { cfam7_i2c15: i2c-bus@f {
#address-cells = <1>;
#size-cells = <0>;
reg = <15>; /* OP5B */ 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>;
scom815: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo815: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam7_i2c16: i2c-bus@10 { cfam7_i2c16: i2c-bus@10 {
#address-cells = <1>;
#size-cells = <0>;
reg = <16>; /* OP6A */ 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>;
scom816: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo816: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
cfam7_i2c17: i2c-bus@11 { cfam7_i2c17: i2c-bus@11 {
#address-cells = <1>;
#size-cells = <0>;
reg = <17>; /* OP6B */ 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>;
scom817: scom@1000 {
compatible = "ibm,i2cr-scom";
reg = <0x1000 0x400>;
};
sbefifo817: sbefifo@2400 {
compatible = "ibm,p9-sbefifo";
reg = <0x2400 0x400>;
#address-cells = <1>;
#size-cells = <0>;
};
};
};
}; };
}; };
...@@ -3558,7 +3868,7 @@ eeprom@0 { ...@@ -3558,7 +3868,7 @@ eeprom@0 {
cfam7_spi2: spi@40 { cfam7_spi2: spi@40 {
reg = <0x40>; reg = <0x40>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -3575,7 +3885,7 @@ eeprom@0 { ...@@ -3575,7 +3885,7 @@ eeprom@0 {
cfam7_spi3: spi@60 { cfam7_spi3: spi@60 {
reg = <0x60>; reg = <0x60>;
compatible = "ibm,fsi2spi-restricted"; compatible = "ibm,fsi2spi";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -3619,22 +3929,6 @@ fsi_hub7: hub@3400 { ...@@ -3619,22 +3929,6 @@ fsi_hub7: hub@3400 {
}; };
/* Legacy OCC numbering (to get rid of when userspace is fixed) */ /* 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 { &fsi_occ4 {
reg = <5>; reg = <5>;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7