Commit d028b508 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'bmc-5.13-devicetree-2' of... 

Merge tag 'bmc-5.13-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt

BMC device tree updates for 5.13, round two

 - Fixes to the first pull request for Rainier

 - Small changes for Rainier, EthanolX and Tiogapass

* tag 'bmc-5.13-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: tiogapass: add hotplug controller
  ARM: dts: aspeed: amd-ethanolx: Enable all used I2C busses
  ARM: dts: aspeed: Rainier: Update to pass 2 hardware
  ARM: dts: aspeed: Rainier 1S4U: Fix fan nodes
  ARM: dts: aspeed: Rainier: Fix humidity sensor bus address
  ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8

Link: https://lore.kernel.org/r/CACPK8XeJdHmxyJn43Ju5hmxJ7+rJgHmx=ANFaL17YUmp+gOtJg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a85a8d52 f0145db2

arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts

+30 −0
Original line number Diff line number Diff line
@@ -151,6 +151,31 @@ &i2c1 { 
	status = "okay";

};



//FPGA

&i2c2 {

	status = "okay";

};



//24LC128 EEPROM

&i2c3 {

	status = "okay";

};



//P0 Power regulators

&i2c4 {

	status = "okay";

};



//P1 Power regulators

&i2c5 {

	status = "okay";

};



//P0/P1 Thermal diode

&i2c6 {

	status = "okay";

};



// Thermal Sensors

&i2c7 {

	status = "okay";
@@ -196,6 +221,11 @@ lm75a@4f { 
	};

};



//BMC I2C

&i2c8 {

	status = "okay";

};



&kcs1 {

	status = "okay";

	aspeed,lpc-io-reg = <0x60>;

arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts

+5 −0
Original line number Diff line number Diff line
@@ -507,6 +507,11 @@ eeprom@54 { 
&i2c7 {

	status = "okay";

	//HSC, AirMax Conn A

	adm1278@45 {

		compatible = "adm1275";

		reg = <0x45>;

		shunt-resistor-micro-ohms = <250>;

	};

};



&i2c8 {

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

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ / { 
};



&max {

	/delete-node/ fan4;

	/delete-node/ fan3;

	/delete-node/ fan5;

};

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

+165 −141
Original line number Diff line number Diff line
@@ -50,6 +50,17 @@ aliases { 
		i2c17 = &i2c2mux1;

		i2c18 = &i2c2mux2;

		i2c19 = &i2c2mux3;

		i2c20 = &i2c4mux0chn0;

		i2c21 = &i2c4mux0chn1;

		i2c22 = &i2c4mux0chn2;

		i2c23 = &i2c5mux0chn0;

		i2c24 = &i2c5mux0chn1;

		i2c25 = &i2c6mux0chn0;

		i2c26 = &i2c6mux0chn1;

		i2c27 = &i2c6mux0chn2;

		i2c28 = &i2c6mux0chn3;

		i2c29 = &i2c11mux0chn0;

		i2c30 = &i2c11mux0chn1;



		spi10 = &cfam0_spi0;

		spi11 = &cfam0_spi1;
@@ -1118,21 +1129,48 @@ tmp275@4a { 
		reg = <0x4a>;

	};



	pca9546@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;



		i2c4mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c4mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@51 {

				compatible = "atmel,24c64";

				reg = <0x51>;

			};

		};



		i2c4mux0chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;



			eeprom@52 {

				compatible = "atmel,24c64";

				reg = <0x52>;

			};

		};

	};

};



&i2c5 {

	status = "okay";
@@ -1147,16 +1185,37 @@ tmp275@49 { 
		reg = <0x49>;

	};



	pca9546@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;



		i2c5mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c5mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@51 {

				compatible = "atmel,24c64";

				reg = <0x51>;

			};

		};

	};

};



&i2c6 {

	status = "okay";
@@ -1176,24 +1235,57 @@ tmp275@4b { 
		reg = <0x4b>;

	};



	eeprom@50 {

		compatible = "atmel,24c64";

		reg = <0x50>;

	};

	pca9546@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;



	eeprom@51 {

		i2c6mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@53 {

				compatible = "atmel,24c64";

		reg = <0x51>;

				reg = <0x53>;

			};

		};



		i2c6mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@52 {

				compatible = "atmel,24c64";

				reg = <0x52>;

			};

		};



	eeprom@53 {

		i2c6mux0chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;



			eeprom@50 {

				compatible = "atmel,24c64";

		reg = <0x53>;

				reg = <0x50>;

			};

		};



		i2c6mux0chn3: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;



			eeprom@51 {

				compatible = "atmel,24c64";

				reg = <0x51>;

			};

		};

	};

};
@@ -1201,9 +1293,9 @@ &i2c7 { 
	multi-master;

	status = "okay";



	si7021-a20@20 {

	si7021-a20@40 {

		compatible = "silabs,si7020";

		reg = <0x20>;

		reg = <0x40>;

	};



	tmp275@48 {
@@ -1399,7 +1491,7 @@ eeprom@51 { 
		reg = <0x51>;

	};



	pca1: pca9552@61 {

	pca_pres2: pca9552@61 {

		compatible = "nxp,pca9552";

		reg = <0x61>;

		#address-cells = <1>;
@@ -1407,6 +1499,15 @@ pca1: pca9552@61 { 
		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

			"SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD",

			"SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD",

			"SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD",

			"SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N",

			"SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N",

			"SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N",

			"", "", "", "";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;
@@ -1507,104 +1608,6 @@ eeprom@50 { 
		compatible = "atmel,24c128";

		reg = <0x50>;

	};



	pca_pres3: pca9552@61 {

		compatible = "nxp,pca9552";

		reg = <0x61>;

		#address-cells = <1>;

		#size-cells = <0>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names =

			"SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD",

			"SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD",

			"SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD",

			"SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N",

			"SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N",

			"SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N",

			"", "", "", "";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@10 {

			reg = <10>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@11 {

			reg = <11>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@12 {

			reg = <12>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@13 {

			reg = <13>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@14 {

			reg = <14>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@15 {

			reg = <15>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};

};



&i2c10 {
@@ -1639,16 +1642,37 @@ tmp275@49 { 
		reg = <0x49>;

	};



	pca9546@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;



		i2c11mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c11mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@51 {

				compatible = "atmel,24c64";

				reg = <0x51>;

			};

		};

	};

};



&i2c12 {

	status = "okay";