| Message ID | 20200102234451.301828-1-joel@jms.id.au |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | [linux,dev-5.4] ARM: dts: aspeed: rainier: Remove duplicate i2c busses | expand |
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@jms.id.au> Hi Joel, Looks good to me. Reviewed-by: Jim Wright <wrightj@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@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@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"; >
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@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";
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@jms.id.au> --- arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 365 ------------------- 1 file changed, 365 deletions(-)