Commit 9f1c2cb3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'aspeed-5.5-devicetree-fixes' of... 

Merge tag 'aspeed-5.5-devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/fixes

ASPEED device tree fixes for 5.5

Fixes for some badly applied patches that went in to 5.5. There is also
a fix for an incorrect i2c address.

* tag 'aspeed-5.5-devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: rainier: Fix fan fault and presence
  ARM: dts: aspeed: rainier: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
  ARM: dts: aspeed: tacoma: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Fix fsi master node
  ARM: dts: aspeed-g6: Fix FSI master location

Link: https://lore.kernel.org/r/CACPK8XcjazgORXNZBU1ECMukXG4HA8D9VeDxiSPifDk_iB7_dw@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fe013e21 ffcdc5df

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

+2 −367
Original line number Diff line number Diff line
@@ -258,9 +258,9 @@ 
		};

	};



	pca0: pca9552@60 {

	pca0: pca9552@61 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		reg = <0x61>;

		#address-cells = <1>;

		#size-cells = <0>;
@@ -519,371 +519,6 @@ 
	status = "okay";

};



&i2c13 {

	status = "okay";

};



&i2c14 {

	status = "okay";

};



&i2c15 {

	status = "okay";

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";



	power-supply@68 {

		compatible = "ibm,cffps2";

		reg = <0x68>;

	};



	power-supply@69 {

		compatible = "ibm,cffps2";

		reg = <0x69>;

	};



	power-supply@6a {

		compatible = "ibm,cffps2";

		reg = <0x6a>;

	};



	power-supply@6b {

		compatible = "ibm,cffps2";

		reg = <0x6b>;

	};

};



&i2c4 {

	status = "okay";



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tmp275@49 {

		compatible = "ti,tmp275";

		reg = <0x49>;

	};



	tmp275@4a {

		compatible = "ti,tmp275";

		reg = <0x4a>;

	};

};



&i2c5 {

	status = "okay";



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tmp275@49 {

		compatible = "ti,tmp275";

		reg = <0x49>;

	};

};



&i2c6 {

	status = "okay";



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tmp275@4a {

		compatible = "ti,tmp275";

		reg = <0x4a>;

	};



	tmp275@4b {

		compatible = "ti,tmp275";

		reg = <0x4b>;

	};

};



&i2c7 {

	status = "okay";



	si7021-a20@20 {

		compatible = "silabs,si7020";

		reg = <0x20>;

	};



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	max31785@52 {

		compatible = "maxim,max31785a";

		reg = <0x52>;

		#address-cells = <1>;

		#size-cells = <0>;



		fan@0 {

			compatible = "pmbus-fan";

			reg = <0>;

			tach-pulses = <2>;

		};



		fan@1 {

			compatible = "pmbus-fan";

			reg = <1>;

			tach-pulses = <2>;

		};



		fan@2 {

			compatible = "pmbus-fan";

			reg = <2>;

			tach-pulses = <2>;

		};



		fan@3 {

			compatible = "pmbus-fan";

			reg = <3>;

			tach-pulses = <2>;

		};

	};



	pca0: pca9552@60 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		#address-cells = <1>;

		#size-cells = <0>;



		gpio-controller;

		#gpio-cells = <2>;



		gpio@0 {

			reg = <0>;

		};



		gpio@1 {

			reg = <1>;

		};



		gpio@2 {

			reg = <2>;

		};



		gpio@3 {

			reg = <3>;

		};



		gpio@4 {

			reg = <4>;

		};



		gpio@5 {

			reg = <5>;

		};



		gpio@6 {

			reg = <6>;

		};



		gpio@7 {

			reg = <7>;

		};



		gpio@8 {

			reg = <8>;

		};



		gpio@9 {

			reg = <9>;

		};



		gpio@10 {

			reg = <10>;

		};



		gpio@11 {

			reg = <11>;

		};



		gpio@12 {

			reg = <12>;

		};



		gpio@13 {

			reg = <13>;

		};



		gpio@14 {

			reg = <14>;

		};



		gpio@15 {

			reg = <15>;

		};

	};



	dps: dps310@76 {

		compatible = "infineon,dps310";

		reg = <0x76>;

		#io-channel-cells = <0>;

	};

};



&i2c8 {

	status = "okay";



	ucd90320@b {

		compatible = "ti,ucd90160";

		reg = <0x0b>;

	};



	ucd90320@c {

		compatible = "ti,ucd90160";

		reg = <0x0c>;

	};



	ucd90320@11 {

		compatible = "ti,ucd90160";

		reg = <0x11>;

	};



	rtc@32 {

		compatible = "epson,rx8900";

		reg = <0x32>;

	};



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tmp275@4a {

		compatible = "ti,tmp275";

		reg = <0x4a>;

	};

};



&i2c9 {

	status = "okay";



	ir35221@42 {

		compatible = "infineon,ir35221";

		reg = <0x42>;

	};



	ir35221@43 {

		compatible = "infineon,ir35221";

		reg = <0x43>;

	};



	ir35221@44 {

		compatible = "infineon,ir35221";

		reg = <0x44>;

	};



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	tmp423b@4d {

		compatible = "ti,tmp423";

		reg = <0x4d>;

	};



	ir35221@72 {

		compatible = "infineon,ir35221";

		reg = <0x72>;

	};



	ir35221@73 {

		compatible = "infineon,ir35221";

		reg = <0x73>;

	};



	ir35221@74 {

		compatible = "infineon,ir35221";

		reg = <0x74>;

	};

};



&i2c10 {

	status = "okay";



	ir35221@42 {

		compatible = "infineon,ir35221";

		reg = <0x42>;

	};



	ir35221@43 {

		compatible = "infineon,ir35221";

		reg = <0x43>;

	};



	ir35221@44 {

		compatible = "infineon,ir35221";

		reg = <0x44>;

	};



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	tmp423b@4d {

		compatible = "ti,tmp423";

		reg = <0x4d>;

	};



	ir35221@72 {

		compatible = "infineon,ir35221";

		reg = <0x72>;

	};



	ir35221@73 {

		compatible = "infineon,ir35221";

		reg = <0x73>;

	};



	ir35221@74 {

		compatible = "infineon,ir35221";

		reg = <0x74>;

	};

};



&i2c11 {

	status = "okay";



	tmp275@48 {

		compatible = "ti,tmp275";

		reg = <0x48>;

	};



	tmp275@49 {

		compatible = "ti,tmp275";

		reg = <0x49>;

	};

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts

+5 −398
Original line number Diff line number Diff line
@@ -122,37 +122,6 @@ 
	};

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

		spi-max-frequency = <50000000>;

#include "openbmc-flash-layout-128.dtsi"

	};



	flash@1 {

		status = "okay";

		m25p,fast-read;

		label = "alt-bmc";

		spi-max-frequency = <50000000>;

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;



	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "pnor";

		spi-max-frequency = <100000000>;

	};

};



&mac2 {

	status = "okay";

	pinctrl-names = "default";
@@ -165,6 +134,11 @@ 


&emmc {

	status = "okay";

};



&fsim0 {

	status = "okay";



	#address-cells = <2>;

	#size-cells = <0>;
@@ -820,373 +794,6 @@ 
	status = "okay";

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";



	bmp: bmp280@77 {

		compatible = "bosch,bmp280";

		reg = <0x77>;

		#io-channel-cells = <1>;

	};



	max31785@52 {

		compatible = "maxim,max31785a";

		reg = <0x52>;

		#address-cells = <1>;

		#size-cells = <0>;



		fan@0 {

			compatible = "pmbus-fan";

			reg = <0>;

			tach-pulses = <2>;

			maxim,fan-rotor-input = "tach";

			maxim,fan-pwm-freq = <25000>;

			maxim,fan-dual-tach;

			maxim,fan-no-watchdog;

			maxim,fan-no-fault-ramp;

			maxim,fan-ramp = <2>;

			maxim,fan-fault-pin-mon;

		};



		fan@1 {

			compatible = "pmbus-fan";

			reg = <1>;

			tach-pulses = <2>;

			maxim,fan-rotor-input = "tach";

			maxim,fan-pwm-freq = <25000>;

			maxim,fan-dual-tach;

			maxim,fan-no-watchdog;

			maxim,fan-no-fault-ramp;

			maxim,fan-ramp = <2>;

			maxim,fan-fault-pin-mon;

		};



		fan@2 {

			compatible = "pmbus-fan";

			reg = <2>;

			tach-pulses = <2>;

			maxim,fan-rotor-input = "tach";

			maxim,fan-pwm-freq = <25000>;

			maxim,fan-dual-tach;

			maxim,fan-no-watchdog;

			maxim,fan-no-fault-ramp;

			maxim,fan-ramp = <2>;

			maxim,fan-fault-pin-mon;

		};



		fan@3 {

			compatible = "pmbus-fan";

			reg = <3>;

			tach-pulses = <2>;

			maxim,fan-rotor-input = "tach";

			maxim,fan-pwm-freq = <25000>;

			maxim,fan-dual-tach;

			maxim,fan-no-watchdog;

			maxim,fan-no-fault-ramp;

			maxim,fan-ramp = <2>;

			maxim,fan-fault-pin-mon;

		};

	};



	dps: dps310@76 {

		compatible = "infineon,dps310";

		reg = <0x76>;

		#io-channel-cells = <0>;

	};



	pca0: pca9552@60 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		#address-cells = <1>;

		#size-cells = <0>;



		gpio-controller;

		#gpio-cells = <2>;



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

		};

	};



	power-supply@68 {

		compatible = "ibm,cffps1";

		reg = <0x68>;

	};



	power-supply@69 {

		compatible = "ibm,cffps1";

		reg = <0x69>;

	};

};



&i2c4 {

	status = "okay";



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	ir35221@70 {

		compatible = "infineon,ir35221";

		reg = <0x70>;

	};



	ir35221@71 {

		compatible = "infineon,ir35221";

		reg = <0x71>;

	};

};



&i2c5 {

	status = "okay";



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	ir35221@70 {

		compatible = "infineon,ir35221";

		reg = <0x70>;

	};



	ir35221@71 {

		compatible = "infineon,ir35221";

		reg = <0x71>;

	};

};



&i2c7 {

	status = "okay";

};



&i2c9 {

	status = "okay";



	tmp275@4a {

		compatible = "ti,tmp275";

		reg = <0x4a>;

	};

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";



	pca9552: pca9552@60 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		#address-cells = <1>;

		#size-cells = <0>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names = "PS_SMBUS_RESET_N", "APSS_RESET_N",

			"GPU0_TH_OVERT_N_BUFF",	"GPU1_TH_OVERT_N_BUFF",

			"GPU2_TH_OVERT_N_BUFF", "GPU3_TH_OVERT_N_BUFF",

			"GPU4_TH_OVERT_N_BUFF",	"GPU5_TH_OVERT_N_BUFF",

			"GPU0_PWR_GOOD_BUFF", "GPU1_PWR_GOOD_BUFF",

			"GPU2_PWR_GOOD_BUFF", "GPU3_PWR_GOOD_BUFF",

			"GPU4_PWR_GOOD_BUFF", "GPU5_PWR_GOOD_BUFF",

			"12V_BREAKER_FLT_N", "THROTTLE_UNLATCHED_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>;

		};

	};



	rtc@32 {

		compatible = "epson,rx8900";

		reg = <0x32>;

	};



	eeprom@51 {

		compatible = "atmel,24c64";

		reg = <0x51>;

	};



	ucd90160@64 {

		compatible = "ti,ucd90160";

		reg = <0x64>;

	};

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&pinctrl {

	/* Hog these as no driver is probed for the entire LPC block */

	pinctrl-names = "default";

arch/arm/boot/dts/aspeed-g6.dtsi

+19 −20
Original line number Diff line number Diff line
@@ -163,26 +163,6 @@ 
				spi-max-frequency = <50000000>;

				status = "disabled";

			};



			fsim0: fsi@1e79b000 {

				compatible = "aspeed,ast2600-fsi-master", "fsi-master";

				reg = <0x1e79b000 0x94>;

				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_fsi1_default>;

				clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;

				status = "disabled";

			};



			fsim1: fsi@1e79b100 {

				compatible = "aspeed,ast2600-fsi-master", "fsi-master";

				reg = <0x1e79b100 0x94>;

				interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_fsi2_default>;

				clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;

				status = "disabled";

			};

		};



		mdio0: mdio@1e650000 {
@@ -595,6 +575,25 @@ 
				ranges = <0 0x1e78a000 0x1000>;

			};



			fsim0: fsi@1e79b000 {

				compatible = "aspeed,ast2600-fsi-master", "fsi-master";

				reg = <0x1e79b000 0x94>;

				interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_fsi1_default>;

				clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;

				status = "disabled";

			};



			fsim1: fsi@1e79b100 {

				compatible = "aspeed,ast2600-fsi-master", "fsi-master";

				reg = <0x1e79b100 0x94>;

				interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_fsi2_default>;

				clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;

				status = "disabled";

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE