diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-03 12:52:33 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-03 12:52:33 +0200 |
commit | 56f68556d7bbb51dd158c74deb09c783345bfbbd (patch) | |
tree | 536e6e3c7063b1eee927194dda257602bd3dc66f /arch/powerpc/boot/dts/tqm8548.dts | |
parent | Merge branch 'omap2-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
parent | [ARM] omap: fix a load of "warning: symbol 'xxx' was not declared. Should it ... (diff) | |
download | linux-56f68556d7bbb51dd158c74deb09c783345bfbbd.tar.xz linux-56f68556d7bbb51dd158c74deb09c783345bfbbd.zip |
Merge unstable branch 'omap-rmk'
Merge branch 'omap-rmk' into omap-all
Diffstat (limited to 'arch/powerpc/boot/dts/tqm8548.dts')
-rw-r--r-- | arch/powerpc/boot/dts/tqm8548.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts index 2563112cabd3..58ee4185454b 100644 --- a/arch/powerpc/boot/dts/tqm8548.dts +++ b/arch/powerpc/boot/dts/tqm8548.dts @@ -50,13 +50,14 @@ reg = <0x00000000 0x00000000>; // Filled in by U-Boot }; - soc8548@e0000000 { + soc@e0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; ranges = <0x0 0xe0000000 0x100000>; reg = <0xe0000000 0x1000>; // CCSRBAR bus-frequency = <0>; + compatible = "fsl,mpc8548-immr", "simple-bus"; memory-controller@2000 { compatible = "fsl,mpc8548-memory-controller"; |