diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:55:27 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:55:27 +1000 |
| commit | 5b0504c0d795d6b0a904ff861c043d7a231f67a4 (patch) | |
| tree | c988e8b614c55d0dae2be4b750a03eb0a4f4d355 /arch/powerpc/boot/dts/tqm5200.dts | |
| parent | 930074b6b9c4895d20cdadba5aff97907e28728d (diff) | |
| parent | 77a76369475801ab8cbb338b9d8cfa92a491badb (diff) | |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'arch/powerpc/boot/dts/tqm5200.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/tqm5200.dts | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts index 773a68e0005..3008bf8830c 100644 --- a/arch/powerpc/boot/dts/tqm5200.dts +++ b/arch/powerpc/boot/dts/tqm5200.dts @@ -70,6 +70,20 @@ fsl,has-wdt; }; + can@900 { + compatible = "fsl,mpc5200-mscan"; + interrupts = <2 17 0>; + interrupt-parent = <&mpc5200_pic>; + reg = <0x900 0x80>; + }; + + can@980 { + compatible = "fsl,mpc5200-mscan"; + interrupts = <2 18 0>; + interrupt-parent = <&mpc5200_pic>; + reg = <0x980 0x80>; + }; + gpio@b00 { compatible = "fsl,mpc5200-gpio"; reg = <0xb00 0x40>; |