Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

3 files changed, 11 insertions, 2 deletions

diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 24cf0dba120c..f3787a27f634 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -14,7 +14,7 @@
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,glacier";
-        compatible = "amcc,glacier", "amcc,canyonlands";
+        compatible = "amcc,glacier";
         dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 72d15f075d34..3b295e8df53f 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -246,13 +246,22 @@
                         };
 
                         IIC0: i2c@ef600700 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
                                 compatible = "ibm,iic-440epx", "ibm,iic";
                                 reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
                                 interrupts = <0x2 0x4>;
+
+                                hwmon@48 {
+                                        compatible = "adi,ad7414";
+                                        reg = <0x48>;
+                                };
                         };
 
                         IIC1: i2c@ef600800 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
                                 compatible = "ibm,iic-440epx", "ibm,iic";
                                 reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts
index e39422aa0d85..1fa3cb4c4ebb 100644
--- a/arch/powerpc/boot/dts/yosemite.dts
+++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -15,7 +15,7 @@
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,yosemite";
-        compatible = "amcc,yosemite","amcc,bamboo";
+        compatible = "amcc,yosemite";
         dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {