diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:07:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:07:27 -0700 |
| commit | 811da237ba39d86846645379763655ddf0f7907e (patch) | |
| tree | e06cf5f94139fa9f9b40d9e285bc089bfdef219b /arch/powerpc/boot/dts/tqm8548-bigflash.dts | |
| parent | b8e6c91c74e9f0279b7c51048779b3d62da60b88 (diff) | |
| parent | 9bdbb9633281b58ff483ede723f8c4a6344cab2f (diff) | |
| download | op-kernel-dev-811da237ba39d86846645379763655ddf0f7907e.zip op-kernel-dev-811da237ba39d86846645379763655ddf0f7907e.tar.gz | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Update defconfigs for most non-embedded platforms
powerpc: Export CMO_PageSize
powerpc/ps3: Fix ioremap of spu shadow regs
powerpc/ps3: Rework htab code to remove ioremap
powerpc/ps3: Update ps3_defconfig
powerpc/cell/oprofile: Avoid double vfree of profile buffer
powerpc: Update defconfigs for FSL PPC boards
powerpc: Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target
cpm2: Fix race condition in CPM2 GPIO library.
powerpc: fix memory leaks in QE library
powerpc/85xx: TQM8548: DTS file fixes and cleanup
powerpc: Fix whitespace merge in mpc8641 hpcn device tree
Diffstat (limited to 'arch/powerpc/boot/dts/tqm8548-bigflash.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8548-bigflash.dts | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts index 64d2d5b..4199e89 100644 --- a/arch/powerpc/boot/dts/tqm8548-bigflash.dts +++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts @@ -50,13 +50,14 @@ reg = <0x00000000 0x00000000>; // Filled in by U-Boot }; - soc8548@a0000000 { + soc@a0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; ranges = <0x0 0xa0000000 0x100000>; reg = <0xa0000000 0x1000>; // CCSRBAR bus-frequency = <0>; + compatible = "fsl,mpc8548-immr", "simple-bus"; memory-controller@2000 { compatible = "fsl,mpc8548-memory-controller"; @@ -83,6 +84,11 @@ interrupts = <43 2>; interrupt-parent = <&mpic>; dfsrr; + + rtc@68 { + compatible = "dallas,ds1337"; + reg = <0x68>; + }; }; i2c@3100 { |
