[PATCH linux dev-5.4] ARM: dts: aspeed: rainier: Remove duplicate i2c busses

[Jim Wright]

On 1/2/2020 5:44 PM, Joel Stanley wrote:
> This is a revert of "ARM: dts: aspeed: rainier: Add i2c devices", which
> was already applied to the tree.
>
> Signed-off-by: Joel Stanley <joel at jms.id.au>
Hi Joel,

Looks good to me.

Reviewed-by: Jim Wright <wrightj at linux.vnet.ibm.com>

I built this patch into an image and ran it in the simulator. Verified 
that the UCD device driver worked as expected.

Tested-by: Jim Wright <wrightj at linux.vnet.ibm.com>
> ---
>   arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 365 -------------------
>   1 file changed, 365 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> index e1d931a0907b..1edeb8a415b5 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
> @@ -591,371 +591,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 at 68 {
> -		compatible = "ibm,cffps2";
> -		reg = <0x68>;
> -	};
> -
> -	power-supply at 69 {
> -		compatible = "ibm,cffps2";
> -		reg = <0x69>;
> -	};
> -
> -	power-supply at 6a {
> -		compatible = "ibm,cffps2";
> -		reg = <0x6a>;
> -	};
> -
> -	power-supply at 6b {
> -		compatible = "ibm,cffps2";
> -		reg = <0x6b>;
> -	};
> -};
> -
> -&i2c4 {
> -	status = "okay";
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	tmp275 at 49 {
> -		compatible = "ti,tmp275";
> -		reg = <0x49>;
> -	};
> -
> -	tmp275 at 4a {
> -		compatible = "ti,tmp275";
> -		reg = <0x4a>;
> -	};
> -};
> -
> -&i2c5 {
> -	status = "okay";
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	tmp275 at 49 {
> -		compatible = "ti,tmp275";
> -		reg = <0x49>;
> -	};
> -};
> -
> -&i2c6 {
> -	status = "okay";
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	tmp275 at 4a {
> -		compatible = "ti,tmp275";
> -		reg = <0x4a>;
> -	};
> -
> -	tmp275 at 4b {
> -		compatible = "ti,tmp275";
> -		reg = <0x4b>;
> -	};
> -};
> -
> -&i2c7 {
> -	status = "okay";
> -
> -	si7021-a20 at 20 {
> -		compatible = "silabs,si7020";
> -		reg = <0x20>;
> -	};
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	max31785 at 52 {
> -		compatible = "maxim,max31785a";
> -		reg = <0x52>;
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -
> -		fan at 0 {
> -			compatible = "pmbus-fan";
> -			reg = <0>;
> -			tach-pulses = <2>;
> -		};
> -
> -		fan at 1 {
> -			compatible = "pmbus-fan";
> -			reg = <1>;
> -			tach-pulses = <2>;
> -		};
> -
> -		fan at 2 {
> -			compatible = "pmbus-fan";
> -			reg = <2>;
> -			tach-pulses = <2>;
> -		};
> -
> -		fan at 3 {
> -			compatible = "pmbus-fan";
> -			reg = <3>;
> -			tach-pulses = <2>;
> -		};
> -	};
> -
> -	pca0: pca9552 at 60 {
> -		compatible = "nxp,pca9552";
> -		reg = <0x60>;
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -
> -		gpio-controller;
> -		#gpio-cells = <2>;
> -
> -		gpio at 0 {
> -			reg = <0>;
> -		};
> -
> -		gpio at 1 {
> -			reg = <1>;
> -		};
> -
> -		gpio at 2 {
> -			reg = <2>;
> -		};
> -
> -		gpio at 3 {
> -			reg = <3>;
> -		};
> -
> -		gpio at 4 {
> -			reg = <4>;
> -		};
> -
> -		gpio at 5 {
> -			reg = <5>;
> -		};
> -
> -		gpio at 6 {
> -			reg = <6>;
> -		};
> -
> -		gpio at 7 {
> -			reg = <7>;
> -		};
> -
> -		gpio at 8 {
> -			reg = <8>;
> -		};
> -
> -		gpio at 9 {
> -			reg = <9>;
> -		};
> -
> -		gpio at 10 {
> -			reg = <10>;
> -		};
> -
> -		gpio at 11 {
> -			reg = <11>;
> -		};
> -
> -		gpio at 12 {
> -			reg = <12>;
> -		};
> -
> -		gpio at 13 {
> -			reg = <13>;
> -		};
> -
> -		gpio at 14 {
> -			reg = <14>;
> -		};
> -
> -		gpio at 15 {
> -			reg = <15>;
> -		};
> -	};
> -
> -	dps: dps310 at 76 {
> -		compatible = "infineon,dps310";
> -		reg = <0x76>;
> -		#io-channel-cells = <0>;
> -	};
> -};
> -
> -&i2c8 {
> -	status = "okay";
> -
> -	ucd90320 at b {
> -		compatible = "ti,ucd90160";
> -		reg = <0x0b>;
> -	};
> -
> -	ucd90320 at c {
> -		compatible = "ti,ucd90160";
> -		reg = <0x0c>;
> -	};
> -
> -	ucd90320 at 11 {
> -		compatible = "ti,ucd90160";
> -		reg = <0x11>;
> -	};
> -
> -	rtc at 32 {
> -		compatible = "epson,rx8900";
> -		reg = <0x32>;
> -	};
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	tmp275 at 4a {
> -		compatible = "ti,tmp275";
> -		reg = <0x4a>;
> -	};
> -};
> -
> -&i2c9 {
> -	status = "okay";
> -
> -	ir35221 at 42 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x42>;
> -	};
> -
> -	ir35221 at 43 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x43>;
> -	};
> -
> -	ir35221 at 44 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x44>;
> -	};
> -
> -	tmp423a at 4c {
> -		compatible = "ti,tmp423";
> -		reg = <0x4c>;
> -	};
> -
> -	tmp423b at 4d {
> -		compatible = "ti,tmp423";
> -		reg = <0x4d>;
> -	};
> -
> -	ir35221 at 72 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x72>;
> -	};
> -
> -	ir35221 at 73 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x73>;
> -	};
> -
> -	ir35221 at 74 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x74>;
> -	};
> -};
> -
> -&i2c10 {
> -	status = "okay";
> -
> -	ir35221 at 42 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x42>;
> -	};
> -
> -	ir35221 at 43 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x43>;
> -	};
> -
> -	ir35221 at 44 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x44>;
> -	};
> -
> -	tmp423a at 4c {
> -		compatible = "ti,tmp423";
> -		reg = <0x4c>;
> -	};
> -
> -	tmp423b at 4d {
> -		compatible = "ti,tmp423";
> -		reg = <0x4d>;
> -	};
> -
> -	ir35221 at 72 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x72>;
> -	};
> -
> -	ir35221 at 73 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x73>;
> -	};
> -
> -	ir35221 at 74 {
> -		compatible = "infineon,ir35221";
> -		reg = <0x74>;
> -	};
> -};
> -
> -&i2c11 {
> -	status = "okay";
> -
> -	tmp275 at 48 {
> -		compatible = "ti,tmp275";
> -		reg = <0x48>;
> -	};
> -
> -	tmp275 at 49 {
> -		compatible = "ti,tmp275";
> -		reg = <0x49>;
> -	};
> -};
> -
> -&i2c12 {
> -	status = "okay";
> -};
> -
>   &i2c13 {
>   	status = "okay";
>