diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-09-21 18:17:25 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-09-21 18:17:25 -0500 |
| commit | ff4be78bb70f5e8381fa68b374a506fecc17d833 (patch) | |
| tree | 7be467d317a94048cbf15f398b7c26f3e5f5295d /arch/powerpc/boot | |
| parent | a501d8f30e4fcca563e4ee462be00f96e51181d5 (diff) | |
| parent | 423da26997497f5938c0b169f1cc9762b5f3fa9f (diff) | |
| download | kernel-crypto-ff4be78bb70f5e8381fa68b374a506fecc17d833.tar.gz kernel-crypto-ff4be78bb70f5e8381fa68b374a506fecc17d833.tar.xz kernel-crypto-ff4be78bb70f5e8381fa68b374a506fecc17d833.zip | |
Merge branch 'next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/glacier.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/sequoia.dts | 9 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/yosemite.dts | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts index 24cf0dba120..f3787a27f63 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 72d15f075d3..3b295e8df53 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 e39422aa0d8..1fa3cb4c4eb 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 { |