Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-bmc-ibm-rainier.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 13f7aefe045e6d59581bcf4d37ed4e328917c507..6232cd726a7fecd54033f79b33611916c6508fe2 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -97,22 +97,22 @@
        status = "okay";
 
        power-supply@68 {
-               compatible = "ibm,cffps2";
+               compatible = "ibm,cffps";
                reg = <0x68>;
        };
 
        power-supply@69 {
-               compatible = "ibm,cffps2";
+               compatible = "ibm,cffps";
                reg = <0x69>;
        };
 
        power-supply@6a {
-               compatible = "ibm,cffps2";
+               compatible = "ibm,cffps";
                reg = <0x6a>;
        };
 
        power-supply@6b {
-               compatible = "ibm,cffps2";
+               compatible = "ibm,cffps";
                reg = <0x6b>;
        };
 };
@@ -352,18 +352,8 @@
 &i2c8 {
        status = "okay";
 
-       ucd90320@b {
-               compatible = "ti,ucd90160";
-               reg = <0x0b>;
-       };
-
-       ucd90320@c {
-               compatible = "ti,ucd90160";
-               reg = <0x0c>;
-       };
-
        ucd90320@11 {
-               compatible = "ti,ucd90160";
+               compatible = "ti,ucd90320";
                reg = <0x11>;
        };