]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: aspeed: Add Balcones system
authorEddie James <eajames@linux.ibm.com>
Mon, 22 Sep 2025 17:58:03 +0000 (12:58 -0500)
committerAndrew Jeffery <andrew@codeconstruct.com.au>
Mon, 13 Oct 2025 00:51:14 +0000 (11:21 +1030)
The Balcones system is similar to Bonnell but with a POWER11 processor.
Like POWER10, the POWER11 is a dual-chip module, so a dual chip FSI
tree is needed. Therefore, split up the quad chip FSI tree.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
arch/arm/boot/dts/aspeed/Makefile
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-balcones.dts [new file with mode: 0644]
arch/arm/boot/dts/aspeed/ibm-power11-dual.dtsi [new file with mode: 0644]
arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi

index 0f0b5b7076545e6babb2f25f302b5d70b71d8a19..b56429777c7ef8ed81c92588a1ff64d9059a59a8 100644 (file)
@@ -39,6 +39,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-bmc-facebook-yamp.dtb \
        aspeed-bmc-facebook-yosemitev2.dtb \
        aspeed-bmc-facebook-yosemite4.dtb \
+       aspeed-bmc-ibm-balcones.dtb \
        aspeed-bmc-ibm-blueridge.dtb \
        aspeed-bmc-ibm-bonnell.dtb \
        aspeed-bmc-ibm-everest.dtb \
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-balcones.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-balcones.dts
new file mode 100644 (file)
index 0000000..63fcb7a
--- /dev/null
@@ -0,0 +1,609 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2025 IBM Corp.
+/dts-v1/;
+
+#include <dt-bindings/gpio/aspeed-gpio.h>
+#include <dt-bindings/i2c/i2c.h>
+#include <dt-bindings/leds/leds-pca955x.h>
+#include "aspeed-g6.dtsi"
+#include "ibm-power11-dual.dtsi"
+
+/ {
+       model = "Balcones";
+       compatible = "ibm,balcones-bmc", "aspeed,ast2600";
+
+       aliases {
+               serial4 = &uart5;
+               i2c16 = &i2c11mux0chn0;
+               i2c17 = &i2c11mux0chn1;
+               i2c18 = &i2c11mux0chn2;
+               i2c19 = &i2c11mux0chn3;
+       };
+
+       chosen {
+               stdout-path = &uart5;
+       };
+
+       gpio-keys-polled {
+               compatible = "gpio-keys-polled";
+               poll-interval = <1000>;
+
+               event-fan0-presence {
+                       gpios = <&gpio0 ASPEED_GPIO(F, 4) GPIO_ACTIVE_LOW>;
+                       label = "fan0-presence";
+                       linux,code = <6>;
+               };
+
+               event-fan1-presence {
+                       gpios = <&gpio0 ASPEED_GPIO(F, 5) GPIO_ACTIVE_LOW>;
+                       label = "fan1-presence";
+                       linux,code = <7>;
+               };
+       };
+
+       iio-hwmon {
+               compatible = "iio-hwmon";
+               io-channels = <&adc1 7>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led-fan0 {
+                       gpios = <&gpio0 ASPEED_GPIO(G, 0) GPIO_ACTIVE_LOW>;
+               };
+
+               led-fan1 {
+                       gpios = <&gpio0 ASPEED_GPIO(G, 1) GPIO_ACTIVE_LOW>;
+               };
+
+               led-rear-enc-id0 {
+                       gpios = <&gpio0 ASPEED_GPIO(H, 2) GPIO_ACTIVE_LOW>;
+               };
+
+               led-rear-enc-fault0 {
+                       gpios = <&gpio0 ASPEED_GPIO(H, 3) GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x40000000>;
+       };
+
+       reserved-memory {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               ranges;
+
+               event_log: region@b3d00000 {
+                       reg = <0xb3d00000 0x100000>;
+                       no-map;
+               };
+
+               ramoops@b3e00000 {
+                       compatible = "ramoops";
+                       reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */
+                       record-size = <0x8000>;
+                       console-size = <0x8000>;
+                       ftrace-size = <0x8000>;
+                       pmsg-size = <0x8000>;
+                       max-reason = <3>; /* KMSG_DUMP_EMERG */
+               };
+
+               /* LPC FW cycle bridge region requires natural alignment */
+               flash_memory: region@b4000000 {
+                       reg = <0xb4000000 0x04000000>; /* 64M */
+                       no-map;
+               };
+
+               /* VGA region is dictated by hardware strapping */
+               vga_memory: region@bf000000 {
+                       compatible = "shared-dma-pool";
+                       reg = <0xbf000000 0x01000000>;  /* 16M */
+                       no-map;
+               };
+       };
+};
+
+&adc1 {
+       aspeed,int-vref-microvolt = <2500000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default
+               &pinctrl_adc10_default &pinctrl_adc11_default
+               &pinctrl_adc12_default &pinctrl_adc13_default
+               &pinctrl_adc14_default &pinctrl_adc15_default>;
+       status = "okay";
+};
+
+&ehci1 {
+       status = "okay";
+};
+
+&emmc {
+       clk-phase-mmc-hs200 = <180>, <180>;
+       status = "okay";
+};
+
+&emmc_controller {
+       status = "okay";
+};
+
+&gpio0 {
+       gpio-line-names =
+               /*A0-A7*/       "","","","","","","","",
+               /*B0-B7*/       "","","","","","","checkstop","",
+               /*C0-C7*/       "","","","","","","","",
+               /*D0-D7*/       "","","","","","","","",
+               /*E0-E7*/       "","","","","","","","",
+               /*F0-F7*/       "","fan-ctlr-reset","rtc-battery-voltage-read-enable",
+                               "reset-cause-pinhole","","","","",
+               /*G0-G7*/       "fan0","fan1","","","","","","",
+               /*H0-H7*/       "","","rear-enc-id0","rear-enc-fault0","","","","",
+               /*I0-I7*/       "","","","","","","bmc-secure-boot","",
+               /*J0-J7*/       "","","","","","","","",
+               /*K0-K7*/       "","","","","","","","",
+               /*L0-L7*/       "","","","","","","","",
+               /*M0-M7*/       "","","","","","","","",
+               /*N0-N7*/       "","","","","","","","",
+               /*O0-O7*/       "","","","usb-power","","","","",
+               /*P0-P7*/       "","","","","","","","",
+               /*Q0-Q7*/       "cfam-reset","","regulator-standby-faulted","","","","","",
+               /*R0-R7*/       "bmc-tpm-reset","power-chassis-control","power-chassis-good","","",
+                               "","","",
+               /*S0-S7*/       "presence-ps0","presence-ps1","","","power-ffs-sync-history","","",
+                               "",
+               /*T0-T7*/       "","","","","","","","",
+               /*U0-U7*/       "","","","","","","","",
+               /*V0-V7*/       "","","","","","","","",
+               /*W0-W7*/       "","","","","","","","",
+               /*X0-X7*/       "","","","","","","","",
+               /*Y0-Y7*/       "","","","","","","","",
+               /*Z0-Z7*/       "","","","","","","","";
+
+       usb-power-hog {
+               gpio-hog;
+               gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
+               output-high;
+       };
+};
+
+&i2c0 {
+       status = "okay";
+
+       gpio@20 {
+               compatible = "ti,tca9554";
+               reg = <0x20>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               gpio-line-names =
+                       "",
+                       "RUSSEL_FW_I2C_ENABLE_N",
+                       "RUSSEL_OPPANEL_PRESENCE_N",
+                       "BLYTH_OPPANEL_PRESENCE_N",
+                       "CPU_TPM_CARD_PRESENT_N",
+                       "",
+                       "",
+                       "DASD_BP_PRESENT_N";
+       };
+
+       eeprom@51 {
+               compatible = "atmel,24c64";
+               reg = <0x51>;
+       };
+};
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+
+       pmic@64 {
+               compatible = "ti,ucd90160";
+               reg = <0x64>;
+       };
+};
+
+&i2c3 {
+       status = "okay";
+
+       power-supply@5a {
+               compatible = "acbel,fsg032";
+               reg = <0x5a>;
+       };
+
+       power-supply@5b {
+               compatible = "acbel,fsg032";
+               reg = <0x5b>;
+       };
+};
+
+&i2c4 {
+       status = "okay";
+};
+
+&i2c5 {
+       status = "okay";
+
+       eeprom@52 {
+               compatible = "atmel,24c64";
+               reg = <0x52>;
+       };
+
+       led-controller@62 {
+               compatible = "nxp,pca9551";
+               reg = <0x62>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               led@0 {
+                       reg = <0>;
+                       default-state = "keep";
+                       label = "cablecard2-cxp-top";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@1 {
+                       reg = <1>;
+                       default-state = "keep";
+                       label = "cablecard2-cxp-bot";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+       };
+};
+
+&i2c6 {
+       status = "okay";
+};
+
+&i2c7 {
+       multi-master;
+       status = "okay";
+
+       temperature-sensor@48 {
+               compatible = "ti,tmp275";
+               reg = <0x48>;
+       };
+
+       eeprom@50 {
+               compatible = "atmel,24c64";
+               reg = <0x50>;
+       };
+
+       eeprom@51 {
+               compatible = "atmel,24c64";
+               reg = <0x51>;
+       };
+
+       pwm@53 {
+               compatible = "maxim,max31785a";
+               reg = <0x53>;
+       };
+
+       led-controller@60 {
+               compatible = "nxp,pca9551";
+               reg = <0x60>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               led@0 {
+                       reg = <0>;
+                       default-state = "keep";
+                       label = "front-sys-id0";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@1 {
+                       reg = <1>;
+                       default-state = "keep";
+                       label = "front-check-log0";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@2 {
+                       reg = <2>;
+                       default-state = "keep";
+                       label = "front-enc-fault1";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@3 {
+                       reg = <3>;
+                       default-state = "keep";
+                       label = "front-sys-pwron0";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+       };
+
+       lcd-controller@62 {
+               compatible = "ibm,op-panel";
+               reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;
+       };
+
+       pressure-sensor@76 {
+               compatible = "infineon,dps310";
+               reg = <0x76>;
+               #io-channel-cells = <0>;
+       };
+};
+
+&i2c8 {
+       status = "okay";
+
+       rtc@32 {
+               compatible = "epson,rx8900";
+               reg = <0x32>;
+       };
+
+       eeprom@50 {
+               compatible = "atmel,24c128";
+               reg = <0x50>;
+       };
+
+       led-controller@60 {
+               compatible = "nxp,pca9551";
+               reg = <0x60>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               gpio-line-names =
+                       "",
+                       "APSS_RESET_N",
+                       "",
+                       "N_MODE_CPU_N",
+                       "",
+                       "",
+                       "P10_DCM_PRESENT",
+                       "";
+       };
+
+       led-controller@61 {
+               compatible = "nxp,pca9552";
+               reg = <0x61>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               gpio-line-names =
+                       "",
+                       "",
+                       "SLOT2_PRSNT_EN_RSVD",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "SLOT2_EXPANDER_PRSNT_N",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "";
+       };
+};
+
+&i2c9 {
+       status = "okay";
+
+       temperature-sensor@4c {
+               compatible = "ti,tmp423";
+               reg = <0x4c>;
+       };
+};
+
+&i2c10 {
+       status = "okay";
+};
+
+&i2c11 {
+       status = "okay";
+
+       gpio@20 {
+               compatible = "ti,tca9554";
+               reg = <0x20>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               gpio-line-names =
+                       "BOOT_RCVRY_TWI",
+                       "BOOT_RCVRY_UART",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "",
+                       "PE_SWITCH_RSTB_N";
+       };
+
+       temperature-sensor@4c {
+               compatible = "ti,tmp435";
+               reg = <0x4c>;
+       };
+
+       i2c-mux@75 {
+               compatible = "nxp,pca9849";
+               reg = <0x75>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               i2c-mux-idle-disconnect;
+
+               i2c11mux0chn0: i2c@0 {
+                       reg = <0>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               i2c11mux0chn1: i2c@1 {
+                       reg = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               i2c11mux0chn2: i2c@2 {
+                       reg = <2>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               i2c11mux0chn3: i2c@3 {
+                       reg = <3>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+       };
+};
+
+&i2c12 {
+       status = "okay";
+
+       tpm@2e {
+               compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
+               reg = <0x2e>;
+               memory-region = <&event_log>;
+       };
+
+       eeprom@50 {
+               compatible = "atmel,24c64";
+               reg = <0x50>;
+       };
+};
+
+&i2c13 {
+       status = "okay";
+
+       eeprom@50 {
+               compatible = "atmel,24c64";
+               reg = <0x50>;
+       };
+
+       led-controller@60 {
+               compatible = "nxp,pca9551";
+               reg = <0x60>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               gpio-controller;
+               #gpio-cells = <2>;
+
+               led@0 {
+                       reg = <0>;
+                       default-state = "keep";
+                       label = "nvme3";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@1 {
+                       reg = <1>;
+                       default-state = "keep";
+                       label = "nvme2";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@2 {
+                       reg = <2>;
+                       default-state = "keep";
+                       label = "nvme1";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+
+               led@3 {
+                       reg = <3>;
+                       default-state = "keep";
+                       label = "nvme0";
+                       retain-state-shutdown;
+                       type = <PCA955X_TYPE_LED>;
+               };
+       };
+};
+
+&i2c14 {
+       status = "okay";
+};
+
+&i2c15 {
+       status = "okay";
+};
+
+&ibt {
+       status = "okay";
+};
+
+&kcs2 {
+       aspeed,lpc-io-reg = <0xca8 0xcac>;
+       status = "okay";
+};
+
+&kcs3 {
+       aspeed,lpc-io-reg = <0xca2>;
+       aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+       status = "okay";
+};
+
+&lpc_ctrl {
+       memory-region = <&flash_memory>;
+       status = "okay";
+};
+
+&mac2 {
+       clocks = <&syscon ASPEED_CLK_GATE_MAC3CLK>,
+                <&syscon ASPEED_CLK_MAC3RCLK>;
+       clock-names = "MACCLK", "RCLK";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_rmii3_default>;
+       use-ncsi;
+       status = "okay";
+};
+
+&pinctrl_emmc_default {
+       bias-disable;
+};
+
+&uart2 {
+       status = "okay";
+};
+
+&uhci {
+       status = "okay";
+};
+
+&vuart1 {
+       status = "okay";
+};
+
+&vuart2 {
+       status = "okay";
+};
+
+&wdt1 {
+       aspeed,reset-type = "none";
+       aspeed,external-signal;
+       aspeed,ext-push-pull;
+       aspeed,ext-active-high;
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_wdtrst1_default>;
+};
+
+&wdt2 {
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/aspeed/ibm-power11-dual.dtsi b/arch/arm/boot/dts/aspeed/ibm-power11-dual.dtsi
new file mode 100644 (file)
index 0000000..6db02d4
--- /dev/null
@@ -0,0 +1,779 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright 2025 IBM Corp.
+
+/ {
+       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;
+
+               sbefifo100 = &sbefifo100;
+               sbefifo101 = &sbefifo101;
+               sbefifo110 = &sbefifo110;
+               sbefifo111 = &sbefifo111;
+               sbefifo112 = &sbefifo112;
+               sbefifo113 = &sbefifo113;
+               sbefifo114 = &sbefifo114;
+               sbefifo115 = &sbefifo115;
+               sbefifo202 = &sbefifo202;
+               sbefifo203 = &sbefifo203;
+               sbefifo210 = &sbefifo210;
+               sbefifo211 = &sbefifo211;
+               sbefifo214 = &sbefifo214;
+               sbefifo215 = &sbefifo215;
+               sbefifo216 = &sbefifo216;
+               sbefifo217 = &sbefifo217;
+
+               scom100 = &scom100;
+               scom101 = &scom101;
+               scom110 = &scom110;
+               scom111 = &scom111;
+               scom112 = &scom112;
+               scom113 = &scom113;
+               scom114 = &scom114;
+               scom115 = &scom115;
+               scom202 = &scom202;
+               scom203 = &scom203;
+               scom210 = &scom210;
+               scom211 = &scom211;
+               scom214 = &scom214;
+               scom215 = &scom215;
+               scom216 = &scom216;
+               scom217 = &scom217;
+
+               spi10 = &cfam0_spi0;
+               spi11 = &cfam0_spi1;
+               spi12 = &cfam0_spi2;
+               spi13 = &cfam0_spi3;
+               spi20 = &cfam1_spi0;
+               spi21 = &cfam1_spi1;
+               spi22 = &cfam1_spi2;
+               spi23 = &cfam1_spi3;
+       };
+};
+
+&fsim0 {
+       bus-frequency = <100000000>;
+       #address-cells = <2>;
+       #size-cells = <0>;
+       cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;
+       status = "okay";
+
+       cfam@0,0 {
+               reg = <0 0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               chip-id = <0>;
+
+               scom@1000 {
+                       compatible = "ibm,p9-scom";
+                       reg = <0x1000 0x400>;
+               };
+
+               i2c@1800 {
+                       compatible = "ibm,i2c-fsi";
+                       reg = <0x1800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam0_i2c0: i2c-bus@0 {
+                               reg = <0>;      /* OMI01 */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom100: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo100: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c1: i2c-bus@1 {
+                               reg = <1>;      /* OMI23 */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom101: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo101: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c10: i2c-bus@a {
+                               reg = <10>;     /* OP3A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom110: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo110: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c11: i2c-bus@b {
+                               reg = <11>;     /* OP3B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom111: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo111: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c12: i2c-bus@c {
+                               reg = <12>;     /* OP4A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom112: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo112: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c13: i2c-bus@d {
+                               reg = <13>;     /* OP4B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom113: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo113: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c14: i2c-bus@e {
+                               reg = <14>;     /* OP5A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom114: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo114: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam0_i2c15: i2c-bus@f {
+                               reg = <15>;     /* OP5B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom115: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo115: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+               };
+
+               fsi2spi@1c00 {
+                       compatible = "ibm,fsi2spi";
+                       reg = <0x1c00 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam0_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x0>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam0_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x20>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam0_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x40>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam0_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+               };
+
+               sbefifo@2400 {
+                       compatible = "ibm,p9-sbefifo";
+                       reg = <0x2400 0x400>;
+
+                       occ {
+                               compatible = "ibm,p10-occ";
+
+                               hwmon {
+                                       compatible = "ibm,p10-occ-hwmon";
+                                       ibm,no-poll-on-init;
+                               };
+                       };
+               };
+
+               fsi_hub0: fsi@3400 {
+                       compatible = "ibm,p9-fsi-controller";
+                       reg = <0x3400 0x400>;
+                       #address-cells = <2>;
+                       #size-cells = <0>;
+               };
+       };
+};
+
+&fsi_hub0 {
+       cfam@1,0 {
+               reg = <1 0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               chip-id = <1>;
+
+               scom@1000 {
+                       compatible = "ibm,p9-scom";
+                       reg = <0x1000 0x400>;
+               };
+
+               i2c@1800 {
+                       compatible = "ibm,i2c-fsi";
+                       reg = <0x1800 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam1_i2c2: i2c-bus@2 {
+                               reg = <2>;      /* OMI45 */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom202: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo202: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c3: i2c-bus@3 {
+                               reg = <3>;      /* OMI67 */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom203: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo203: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c10: i2c-bus@a {
+                               reg = <10>;     /* OP3A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom210: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo210: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c11: i2c-bus@b {
+                               reg = <11>;     /* OP3B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom211: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo211: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c14: i2c-bus@e {
+                               reg = <14>;     /* OP5A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom214: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo214: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c15: i2c-bus@f {
+                               reg = <15>;     /* OP5B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom215: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo215: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c16: i2c-bus@10 {
+                               reg = <16>;     /* OP6A */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom216: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo216: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+
+                       cfam1_i2c17: i2c-bus@11 {
+                               reg = <17>;     /* OP6B */
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               fsi@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>;
+
+                                               scom217: scom@1000 {
+                                                       compatible = "ibm,i2cr-scom";
+                                                       reg = <0x1000 0x400>;
+                                               };
+
+                                               sbefifo217: sbefifo@2400 {
+                                                       compatible = "ibm,odyssey-sbefifo";
+                                                       reg = <0x2400 0x400>;
+                                               };
+                                       };
+                               };
+                       };
+               };
+
+               fsi2spi@1c00 {
+                       compatible = "ibm,fsi2spi";
+                       reg = <0x1c00 0x400>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       cfam1_spi0: spi@0 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x0>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam1_spi1: spi@20 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x20>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam1_spi2: spi@40 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x40>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+
+                       cfam1_spi3: spi@60 {
+                               compatible = "ibm,spi-fsi";
+                               reg = <0x60>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+
+                               eeprom@0 {
+                                       compatible = "atmel,at25";
+                                       reg = <0>;
+                                       address-width = <24>;
+                                       pagesize = <256>;
+                                       size = <0x80000>;
+                                       spi-max-frequency = <10000000>;
+                               };
+                       };
+               };
+
+               sbefifo@2400 {
+                       compatible = "ibm,p9-sbefifo";
+                       reg = <0x2400 0x400>;
+
+                       occ {
+                               compatible = "ibm,p10-occ";
+
+                               hwmon {
+                                       compatible = "ibm,p10-occ-hwmon";
+                                       ibm,no-poll-on-init;
+                               };
+                       };
+               };
+
+               fsi@3400 {
+                       compatible = "ibm,p9-fsi-controller";
+                       reg = <0x3400 0x400>;
+                       #address-cells = <2>;
+                       #size-cells = <0>;
+                       no-scan-on-init;
+               };
+       };
+};
index 68c941a194b6438fb8a39d4c4ce53b8d20ed5fc1..7aa4113d302633e09d5ad6979a432b3c7356c80a 100644 (file)
@@ -1,24 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 // Copyright 2024 IBM Corp.
 
+#include "ibm-power11-dual.dtsi"
+
 / {
        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;
                i2c416 = &cfam3_i2c16;
                i2c417 = &cfam3_i2c17;
 
-               sbefifo100 = &sbefifo100;
-               sbefifo101 = &sbefifo101;
-               sbefifo110 = &sbefifo110;
-               sbefifo111 = &sbefifo111;
-               sbefifo112 = &sbefifo112;
-               sbefifo113 = &sbefifo113;
-               sbefifo114 = &sbefifo114;
-               sbefifo115 = &sbefifo115;
-               sbefifo202 = &sbefifo202;
-               sbefifo203 = &sbefifo203;
-               sbefifo210 = &sbefifo210;
-               sbefifo211 = &sbefifo211;
-               sbefifo214 = &sbefifo214;
-               sbefifo215 = &sbefifo215;
-               sbefifo216 = &sbefifo216;
-               sbefifo217 = &sbefifo217;
                sbefifo300 = &sbefifo300;
                sbefifo301 = &sbefifo301;
                sbefifo310 = &sbefifo310;
                sbefifo416 = &sbefifo416;
                sbefifo417 = &sbefifo417;
 
-               scom100 = &scom100;
-               scom101 = &scom101;
-               scom110 = &scom110;
-               scom111 = &scom111;
-               scom112 = &scom112;
-               scom113 = &scom113;
-               scom114 = &scom114;
-               scom115 = &scom115;
-               scom202 = &scom202;
-               scom203 = &scom203;
-               scom210 = &scom210;
-               scom211 = &scom211;
-               scom214 = &scom214;
-               scom215 = &scom215;
-               scom216 = &scom216;
-               scom217 = &scom217;
                scom300 = &scom300;
                scom301 = &scom301;
                scom310 = &scom310;
                scom416 = &scom416;
                scom417 = &scom417;
 
-               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;
        };
 };
 
-&fsim0 {
-       #address-cells = <2>;
-       #size-cells = <0>;
-       status = "okay";
-       bus-frequency = <100000000>;
-       cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;
-
-       cfam@0,0 {
-               reg = <0 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <0>;
-
-               scom@1000 {
-                       compatible = "ibm,p9-scom";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,i2c-fsi";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam0_i2c0: i2c-bus@0 {
-                               reg = <0>;      /* OMI01 */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom100: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo100: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c1: i2c-bus@1 {
-                               reg = <1>;      /* OMI23 */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom101: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo101: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom110: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo110: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom111: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo111: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c12: i2c-bus@c {
-                               reg = <12>;     /* OP4A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom112: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo112: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c13: i2c-bus@d {
-                               reg = <13>;     /* OP4B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom113: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo113: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom114: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo114: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam0_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom115: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo115: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam0_spi0: spi@0 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam0_spi1: spi@20 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x20>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam0_spi2: spi@40 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x40>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam0_spi3: spi@60 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x60>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-               };
-
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-
-                       occ {
-                               compatible = "ibm,p10-occ";
-
-                               hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
-                               };
-                       };
-               };
-
-               fsi_hub0: fsi@3400 {
-                       compatible = "ibm,p9-fsi-controller";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-               };
-       };
-};
-
 &fsi_hub0 {
-       cfam@1,0 {
-               reg = <1 0>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-               chip-id = <1>;
-
-               scom@1000 {
-                       compatible = "ibm,p9-scom";
-                       reg = <0x1000 0x400>;
-               };
-
-               i2c@1800 {
-                       compatible = "ibm,i2c-fsi";
-                       reg = <0x1800 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam1_i2c2: i2c-bus@2 {
-                               reg = <2>;      /* OMI45 */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom202: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo202: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c3: i2c-bus@3 {
-                               reg = <3>;      /* OMI67 */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom203: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo203: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c10: i2c-bus@a {
-                               reg = <10>;     /* OP3A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom210: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo210: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c11: i2c-bus@b {
-                               reg = <11>;     /* OP3B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom211: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo211: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c14: i2c-bus@e {
-                               reg = <14>;     /* OP5A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom214: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo214: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c15: i2c-bus@f {
-                               reg = <15>;     /* OP5B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom215: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo215: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c16: i2c-bus@10 {
-                               reg = <16>;     /* OP6A */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom216: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo216: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       cfam1_i2c17: i2c-bus@11 {
-                               reg = <17>;     /* OP6B */
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fsi@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>;
-
-                                               scom217: scom@1000 {
-                                                       compatible = "ibm,i2cr-scom";
-                                                       reg = <0x1000 0x400>;
-                                               };
-
-                                               sbefifo217: sbefifo@2400 {
-                                                       compatible = "ibm,odyssey-sbefifo";
-                                                       reg = <0x2400 0x400>;
-                                               };
-                                       };
-                               };
-                       };
-               };
-
-               fsi2spi@1c00 {
-                       compatible = "ibm,fsi2spi";
-                       reg = <0x1c00 0x400>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-
-                       cfam1_spi0: spi@0 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x0>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam1_spi1: spi@20 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x20>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam1_spi2: spi@40 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x40>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-
-                       cfam1_spi3: spi@60 {
-                               compatible = "ibm,spi-fsi";
-                               reg = <0x60>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               eeprom@0 {
-                                       compatible = "atmel,at25";
-                                       reg = <0>;
-                                       address-width = <24>;
-                                       pagesize = <256>;
-                                       size = <0x80000>;
-                                       spi-max-frequency = <10000000>;
-                               };
-                       };
-               };
-
-               sbefifo@2400 {
-                       compatible = "ibm,p9-sbefifo";
-                       reg = <0x2400 0x400>;
-
-                       occ {
-                               compatible = "ibm,p10-occ";
-
-                               hwmon {
-                                       compatible = "ibm,p10-occ-hwmon";
-                                       ibm,no-poll-on-init;
-                               };
-                       };
-               };
-
-               fsi@3400 {
-                       compatible = "ibm,p9-fsi-controller";
-                       reg = <0x3400 0x400>;
-                       #address-cells = <2>;
-                       #size-cells = <0>;
-                       no-scan-on-init;
-               };
-       };
-
        cfam@2,0 {
                reg = <2 0>;
                #address-cells = <1>;