aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/boot/dts/mpc8349emitx.dts
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-10-17 12:20:26 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-10-17 12:20:26 -0400
commit651dab4264e4ba0e563f5ff56f748127246e9065 (patch)
tree016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/powerpc/boot/dts/mpc8349emitx.dts
parent40b8606253552109815786e5d4b0de98782d31f5 (diff)
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
Merge commit 'linus/master' into merge-linus
Conflicts: arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8349emitx.dts')
-rw-r--r--arch/powerpc/boot/dts/mpc8349emitx.dts10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 700e076ef3f5..5cedf373a1d8 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -106,24 +106,28 @@
106 dma-channel@0 { 106 dma-channel@0 {
107 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel"; 107 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
108 reg = <0 0x80>; 108 reg = <0 0x80>;
109 cell-index = <0>;
109 interrupt-parent = <&ipic>; 110 interrupt-parent = <&ipic>;
110 interrupts = <71 8>; 111 interrupts = <71 8>;
111 }; 112 };
112 dma-channel@80 { 113 dma-channel@80 {
113 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel"; 114 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
114 reg = <0x80 0x80>; 115 reg = <0x80 0x80>;
116 cell-index = <1>;
115 interrupt-parent = <&ipic>; 117 interrupt-parent = <&ipic>;
116 interrupts = <71 8>; 118 interrupts = <71 8>;
117 }; 119 };
118 dma-channel@100 { 120 dma-channel@100 {
119 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel"; 121 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
120 reg = <0x100 0x80>; 122 reg = <0x100 0x80>;
123 cell-index = <2>;
121 interrupt-parent = <&ipic>; 124 interrupt-parent = <&ipic>;
122 interrupts = <71 8>; 125 interrupts = <71 8>;
123 }; 126 };
124 dma-channel@180 { 127 dma-channel@180 {
125 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel"; 128 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
126 reg = <0x180 0x28>; 129 reg = <0x180 0x28>;
130 cell-index = <3>;
127 interrupt-parent = <&ipic>; 131 interrupt-parent = <&ipic>;
128 interrupts = <71 8>; 132 interrupts = <71 8>;
129 }; 133 };
@@ -250,7 +254,8 @@
250 #interrupt-cells = <1>; 254 #interrupt-cells = <1>;
251 #size-cells = <2>; 255 #size-cells = <2>;
252 #address-cells = <3>; 256 #address-cells = <3>;
253 reg = <0xe0008500 0x100>; 257 reg = <0xe0008500 0x100 /* internal registers */
258 0xe0008300 0x8>; /* config space access registers */
254 compatible = "fsl,mpc8349-pci"; 259 compatible = "fsl,mpc8349-pci";
255 device_type = "pci"; 260 device_type = "pci";
256 }; 261 };
@@ -276,7 +281,8 @@
276 #interrupt-cells = <1>; 281 #interrupt-cells = <1>;
277 #size-cells = <2>; 282 #size-cells = <2>;
278 #address-cells = <3>; 283 #address-cells = <3>;
279 reg = <0xe0008600 0x100>; 284 reg = <0xe0008600 0x100 /* internal registers */
285 0xe0008380 0x8>; /* config space access registers */
280 compatible = "fsl,mpc8349-pci"; 286 compatible = "fsl,mpc8349-pci";
281 device_type = "pci"; 287 device_type = "pci";
282 }; 288 };