Commit 71354f77 authored by Joel Stanley's avatar Joel Stanley
Browse files

ARM: dts: aspeed: rainier: Reorganise FSI description 

Use the P10 quad FSI CFAM description to reduce duplication.

Link: https://lore.kernel.org/r/20230809074921.116987-4-joel@jms.id.au


Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
parent f868aab8

arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts

+2 −676
Original line number Diff line number Diff line
@@ -12,39 +12,6 @@ / { 
	compatible = "ibm,rainier-bmc", "aspeed,ast2600";



	aliases {

		i2c100 = &cfam0_i2c0;

		i2c101 = &cfam0_i2c1;

		i2c110 = &cfam0_i2c10;

		i2c111 = &cfam0_i2c11;

		i2c112 = &cfam0_i2c12;

		i2c113 = &cfam0_i2c13;

		i2c114 = &cfam0_i2c14;

		i2c115 = &cfam0_i2c15;

		i2c202 = &cfam1_i2c2;

		i2c203 = &cfam1_i2c3;

		i2c210 = &cfam1_i2c10;

		i2c211 = &cfam1_i2c11;

		i2c214 = &cfam1_i2c14;

		i2c215 = &cfam1_i2c15;

		i2c216 = &cfam1_i2c16;

		i2c217 = &cfam1_i2c17;

		i2c300 = &cfam2_i2c0;

		i2c301 = &cfam2_i2c1;

		i2c310 = &cfam2_i2c10;

		i2c311 = &cfam2_i2c11;

		i2c312 = &cfam2_i2c12;

		i2c313 = &cfam2_i2c13;

		i2c314 = &cfam2_i2c14;

		i2c315 = &cfam2_i2c15;

		i2c402 = &cfam3_i2c2;

		i2c403 = &cfam3_i2c3;

		i2c410 = &cfam3_i2c10;

		i2c411 = &cfam3_i2c11;

		i2c414 = &cfam3_i2c14;

		i2c415 = &cfam3_i2c15;

		i2c416 = &cfam3_i2c16;

		i2c417 = &cfam3_i2c17;



		serial4 = &uart5;

		i2c16 = &i2c2mux0;

		i2c17 = &i2c2mux1;
@@ -61,23 +28,6 @@ aliases { 
		i2c28 = &i2c6mux0chn3;

		i2c29 = &i2c11mux0chn0;

		i2c30 = &i2c11mux0chn1;



		spi10 = &cfam0_spi0;

		spi11 = &cfam0_spi1;

		spi12 = &cfam0_spi2;

		spi13 = &cfam0_spi3;

		spi20 = &cfam1_spi0;

		spi21 = &cfam1_spi1;

		spi22 = &cfam1_spi2;

		spi23 = &cfam1_spi3;

		spi30 = &cfam2_spi0;

		spi31 = &cfam2_spi1;

		spi32 = &cfam2_spi2;

		spi33 = &cfam2_spi3;

		spi40 = &cfam3_spi0;

		spi41 = &cfam3_spi1;

		spi42 = &cfam3_spi2;

		spi43 = &cfam3_spi3;

	};



	chosen {
@@ -301,632 +251,6 @@ &emmc { 
	clk-phase-mmc-hs200 = <180>, <180>;

};



&fsim0 {

	status = "okay";



	#address-cells = <2>;

	#size-cells = <0>;



	/*

	 * CFAM Reset is supposed to be active low but pass1 hardware is wired

	 * active high.

	 */

	cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;



	cfam@0,0 {

		reg = <0 0>;

		#address-cells = <1>;

		#size-cells = <1>;

		chip-id = <0>;



		scom@1000 {

			compatible = "ibm,fsi2pib";

			reg = <0x1000 0x400>;

		};



		i2c@1800 {

			compatible = "ibm,fsi-i2c-master";

			reg = <0x1800 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam0_i2c0: i2c-bus@0 {

				reg = <0>;	/* OMI01 */

			};



			cfam0_i2c1: i2c-bus@1 {

				reg = <1>;	/* OMI23 */

			};



			cfam0_i2c10: i2c-bus@a {

				reg = <10>;	/* OP3A */

			};



			cfam0_i2c11: i2c-bus@b {

				reg = <11>;	/* OP3B */

			};



			cfam0_i2c12: i2c-bus@c {

				reg = <12>;	/* OP4A */

			};



			cfam0_i2c13: i2c-bus@d {

				reg = <13>;	/* OP4B */

			};



			cfam0_i2c14: i2c-bus@e {

				reg = <14>;	/* OP5A */

			};



			cfam0_i2c15: i2c-bus@f {

				reg = <15>;	/* OP5B */

			};

		};



		fsi2spi@1c00 {

			compatible = "ibm,fsi2spi";

			reg = <0x1c00 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam0_spi0: spi@0 {

				reg = <0x0>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam0_spi1: spi@20 {

				reg = <0x20>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



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

				};

			};



			cfam0_spi3: spi@60 {

				reg = <0x60>;

				compatible = "ibm,fsi2spi-restricted";

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};

                };



		sbefifo@2400 {

			compatible = "ibm,p9-sbefifo";

			reg = <0x2400 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			fsi_occ0: occ {

				compatible = "ibm,p10-occ";



				occ-hwmon {

					compatible = "ibm,p10-occ-hwmon";

					ibm,no-poll-on-init;

				};

			};

		};



		fsi_hub0: hub@3400 {

			compatible = "fsi-master-hub";

			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,fsi2pib";

			reg = <0x1000 0x400>;

		};



		i2c@1800 {

			compatible = "ibm,fsi-i2c-master";

			reg = <0x1800 0x400>;

			#address-cells = <1>;

			#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 {

				reg = <14>;	/* OP5A */

			};



			cfam1_i2c15: i2c-bus@f {

				reg = <15>;	/* OP5B */

			};



			cfam1_i2c16: i2c-bus@10 {

				reg = <16>;	/* OP6A */

			};



			cfam1_i2c17: i2c-bus@11 {

				reg = <17>;	/* OP6B */

			};

		};



		fsi2spi@1c00 {

			compatible = "ibm,fsi2spi";

			reg = <0x1c00 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam1_spi0: spi@0 {

				reg = <0x0>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam1_spi1: spi@20 {

				reg = <0x20>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



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

				};

			};



			cfam1_spi3: spi@60 {

				reg = <0x60>;

				compatible = "ibm,fsi2spi-restricted";

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};

                };



		sbefifo@2400 {

			compatible = "ibm,p9-sbefifo";

			reg = <0x2400 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			fsi_occ1: occ {

				compatible = "ibm,p10-occ";



				occ-hwmon {

					compatible = "ibm,p10-occ-hwmon";

					ibm,no-poll-on-init;

				};

			};

		};



		fsi_hub1: hub@3400 {

			compatible = "fsi-master-hub";

			reg = <0x3400 0x400>;

			#address-cells = <2>;

			#size-cells = <0>;



			no-scan-on-init;

		};

	};



	cfam@2,0 {

		reg = <2 0>;

		#address-cells = <1>;

		#size-cells = <1>;

		chip-id = <2>;



		scom@1000 {

			compatible = "ibm,fsi2pib";

			reg = <0x1000 0x400>;

		};



		i2c@1800 {

			compatible = "ibm,fsi-i2c-master";

			reg = <0x1800 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam2_i2c0: i2c-bus@0 {

				reg = <0>;	/* OM01 */

			};



			cfam2_i2c1: i2c-bus@1 {

				reg = <1>;	/* OM23 */

			};



			cfam2_i2c10: i2c-bus@a {

				reg = <10>;	/* OP3A */

			};



			cfam2_i2c11: i2c-bus@b {

				reg = <11>;	/* OP3B */

			};



			cfam2_i2c12: i2c-bus@c {

				reg = <12>;	/* OP4A */

			};



			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 {

			compatible = "ibm,fsi2spi";

			reg = <0x1c00 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam2_spi0: spi@0 {

				reg = <0x0>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam2_spi1: spi@20 {

				reg = <0x20>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



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

				};

			};



			cfam2_spi3: spi@60 {

				reg = <0x60>;

				compatible = "ibm,fsi2spi-restricted";

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};

		};



		sbefifo@2400 {

			compatible = "ibm,p9-sbefifo";

			reg = <0x2400 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			fsi_occ2: occ {

				compatible = "ibm,p10-occ";



				occ-hwmon {

					compatible = "ibm,p10-occ-hwmon";

					ibm,no-poll-on-init;

				};

			};

		};



		fsi_hub2: hub@3400 {

			compatible = "fsi-master-hub";

			reg = <0x3400 0x400>;

			#address-cells = <2>;

			#size-cells = <0>;



			no-scan-on-init;

		};

	};



	cfam@3,0 {

		reg = <3 0>;

		#address-cells = <1>;

		#size-cells = <1>;

		chip-id = <3>;



		scom@1000 {

			compatible = "ibm,fsi2pib";

			reg = <0x1000 0x400>;

		};



		i2c@1800 {

			compatible = "ibm,fsi-i2c-master";

			reg = <0x1800 0x400>;

			#address-cells = <1>;

			#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 {

				reg = <14>;	/* OP5A */

			};



			cfam3_i2c15: i2c-bus@f {

				reg = <15>;	/* OP5B */

			};



			cfam3_i2c16: i2c-bus@10 {

				reg = <16>;	/* OP6A */

			};



			cfam3_i2c17: i2c-bus@11 {

				reg = <17>;	/* OP6B */

			};

		};



		fsi2spi@1c00 {

			compatible = "ibm,fsi2spi";

			reg = <0x1c00 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			cfam3_spi0: spi@0 {

				reg = <0x0>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam3_spi1: spi@20 {

				reg = <0x20>;

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam3_spi2: spi@40 {

				reg = <0x40>;

				compatible = "ibm,fsi2spi-restricted";

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};



			cfam3_spi3: spi@60 {

				reg = <0x60>;

				compatible = "ibm,fsi2spi-restricted";

				#address-cells = <1>;

				#size-cells = <0>;



				eeprom@0 {

					at25,byte-len = <0x80000>;

					at25,addr-mode = <4>;

					at25,page-size = <256>;



					compatible = "atmel,at25";

					reg = <0>;

					spi-max-frequency = <1000000>;

				};

			};

		};



		sbefifo@2400 {

			compatible = "ibm,p9-sbefifo";

			reg = <0x2400 0x400>;

			#address-cells = <1>;

			#size-cells = <0>;



			fsi_occ3: occ {

				compatible = "ibm,p10-occ";



				occ-hwmon {

					compatible = "ibm,p10-occ-hwmon";

					ibm,no-poll-on-init;

				};

			};

		};



		fsi_hub3: hub@3400 {

			compatible = "fsi-master-hub";

			reg = <0x3400 0x400>;

			#address-cells = <2>;

			#size-cells = <0>;



			no-scan-on-init;

		};

	};

};



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

};



&ibt {

	status = "okay";

};
@@ -2413,3 +1737,5 @@ &kcs3 { 
	aspeed,lpc-io-reg = <0xca2>;

	aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

};



#include "ibm-power10-quad.dtsi"