Commit 6e050d4e authored by Jon Loeliger's avatar Jon Loeliger Committed by Kumar Gala

[POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.

Also fixed a few minor indent problems as well.
Signed-off-by: default avatarJon Loeliger <jdl@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent c42f3ad7
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
* by the Free Software Foundation. * by the Free Software Foundation.
*/ */
/dts-v1/;
/ { / {
model = "MPC8610HPCD"; model = "MPC8610HPCD";
...@@ -29,11 +30,11 @@ cpus { ...@@ -29,11 +30,11 @@ cpus {
PowerPC,8610@0 { PowerPC,8610@0 {
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
d-cache-line-size = <d# 32>; // bytes d-cache-line-size = <32>;
i-cache-line-size = <d# 32>; // bytes i-cache-line-size = <32>;
d-cache-size = <8000>; // L1, 32K d-cache-size = <32768>; // L1
i-cache-size = <8000>; // L1, 32K i-cache-size = <32768>; // L1
timebase-frequency = <0>; // 33 MHz, from uboot timebase-frequency = <0>; // From uboot
bus-frequency = <0>; // From uboot bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot clock-frequency = <0>; // From uboot
}; };
...@@ -41,7 +42,7 @@ PowerPC,8610@0 { ...@@ -41,7 +42,7 @@ PowerPC,8610@0 {
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <00000000 20000000>; // 512M at 0x0 reg = <0x00000000 0x20000000>; // 512M at 0x0
}; };
soc@e0000000 { soc@e0000000 {
...@@ -50,8 +51,8 @@ soc@e0000000 { ...@@ -50,8 +51,8 @@ soc@e0000000 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
device_type = "soc"; device_type = "soc";
compatible = "fsl,mpc8610-immr", "simple-bus"; compatible = "fsl,mpc8610-immr", "simple-bus";
ranges = <0 e0000000 00100000>; ranges = <0x0 0xe0000000 0x00100000>;
reg = <e0000000 1000>; reg = <0xe0000000 0x1000>;
bus-frequency = <0>; bus-frequency = <0>;
i2c@3000 { i2c@3000 {
...@@ -59,16 +60,16 @@ i2c@3000 { ...@@ -59,16 +60,16 @@ i2c@3000 {
#size-cells = <0>; #size-cells = <0>;
cell-index = <0>; cell-index = <0>;
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <0x3000 0x100>;
interrupts = <2b 2>; interrupts = <43 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
cs4270:codec@4f { cs4270:codec@4f {
compatible = "cirrus,cs4270"; compatible = "cirrus,cs4270";
reg = <4f>; reg = <0x4f>;
/* MCLK source is a stand-alone oscillator */ /* MCLK source is a stand-alone oscillator */
clock-frequency = <bb8000>; clock-frequency = <12288000>;
}; };
}; };
...@@ -77,8 +78,8 @@ i2c@3100 { ...@@ -77,8 +78,8 @@ i2c@3100 {
#size-cells = <0>; #size-cells = <0>;
cell-index = <1>; cell-index = <1>;
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3100 100>; reg = <0x3100 0x100>;
interrupts = <2b 2>; interrupts = <43 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -87,9 +88,9 @@ serial0: serial@4500 { ...@@ -87,9 +88,9 @@ serial0: serial@4500 {
cell-index = <0>; cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <0x4500 0x100>;
clock-frequency = <0>; clock-frequency = <0>;
interrupts = <2a 2>; interrupts = <42 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
...@@ -97,9 +98,9 @@ serial1: serial@4600 { ...@@ -97,9 +98,9 @@ serial1: serial@4600 {
cell-index = <1>; cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <0x4600 0x100>;
clock-frequency = <0>; clock-frequency = <0>;
interrupts = <1c 2>; interrupts = <28 2>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
...@@ -108,7 +109,7 @@ mpic: interrupt-controller@40000 { ...@@ -108,7 +109,7 @@ mpic: interrupt-controller@40000 {
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
reg = <40000 40000>; reg = <0x40000 0x40000>;
compatible = "chrp,open-pic"; compatible = "chrp,open-pic";
device_type = "open-pic"; device_type = "open-pic";
big-endian; big-endian;
...@@ -116,16 +117,16 @@ mpic: interrupt-controller@40000 { ...@@ -116,16 +117,16 @@ mpic: interrupt-controller@40000 {
global-utilities@e0000 { global-utilities@e0000 {
compatible = "fsl,mpc8610-guts"; compatible = "fsl,mpc8610-guts";
reg = <e0000 1000>; reg = <0xe0000 0x1000>;
fsl,has-rstcr; fsl,has-rstcr;
}; };
i2s@16000 { i2s@16000 {
compatible = "fsl,mpc8610-ssi"; compatible = "fsl,mpc8610-ssi";
cell-index = <0>; cell-index = <0>;
reg = <16000 100>; reg = <0x16000 0x100>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3e 2>; interrupts = <62 2>;
fsl,mode = "i2s-slave"; fsl,mode = "i2s-slave";
codec-handle = <&cs4270>; codec-handle = <&cs4270>;
}; };
...@@ -133,9 +134,9 @@ i2s@16000 { ...@@ -133,9 +134,9 @@ i2s@16000 {
ssi@16100 { ssi@16100 {
compatible = "fsl,mpc8610-ssi"; compatible = "fsl,mpc8610-ssi";
cell-index = <1>; cell-index = <1>;
reg = <16100 100>; reg = <0x16100 0x100>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3f 2>; interrupts = <63 2>;
}; };
dma@21300 { dma@21300 {
...@@ -143,40 +144,40 @@ dma@21300 { ...@@ -143,40 +144,40 @@ dma@21300 {
#size-cells = <1>; #size-cells = <1>;
compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma"; compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
cell-index = <0>; cell-index = <0>;
reg = <21300 4>; /* DMA general status register */ reg = <0x21300 0x4>; /* DMA general status register */
ranges = <0 21100 200>; ranges = <0x0 0x21100 0x200>;
dma-channel@0 { dma-channel@0 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel"; "fsl,eloplus-dma-channel";
cell-index = <0>; cell-index = <0>;
reg = <0 80>; reg = <0x0 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <14 2>; interrupts = <20 2>;
}; };
dma-channel@1 { dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel"; "fsl,eloplus-dma-channel";
cell-index = <1>; cell-index = <1>;
reg = <80 80>; reg = <0x80 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <15 2>; interrupts = <21 2>;
}; };
dma-channel@2 { dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel"; "fsl,eloplus-dma-channel";
cell-index = <2>; cell-index = <2>;
reg = <100 80>; reg = <0x100 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <16 2>; interrupts = <22 2>;
}; };
dma-channel@3 { dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,eloplus-dma-channel"; "fsl,eloplus-dma-channel";
cell-index = <3>; cell-index = <3>;
reg = <180 80>; reg = <0x180 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <17 2>; interrupts = <23 2>;
}; };
}; };
...@@ -185,40 +186,40 @@ dma@c300 { ...@@ -185,40 +186,40 @@ dma@c300 {
#size-cells = <1>; #size-cells = <1>;
compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma"; compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
cell-index = <1>; cell-index = <1>;
reg = <c300 4>; /* DMA general status register */ reg = <0xc300 0x4>; /* DMA general status register */
ranges = <0 c100 200>; ranges = <0x0 0xc100 0x200>;
dma-channel@0 { dma-channel@0 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel"; "fsl,mpc8540-dma-channel";
cell-index = <0>; cell-index = <0>;
reg = <0 80>; reg = <0x0 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3c 2>; interrupts = <60 2>;
}; };
dma-channel@1 { dma-channel@1 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel"; "fsl,mpc8540-dma-channel";
cell-index = <1>; cell-index = <1>;
reg = <80 80>; reg = <0x80 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3d 2>; interrupts = <61 2>;
}; };
dma-channel@2 { dma-channel@2 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel"; "fsl,mpc8540-dma-channel";
cell-index = <2>; cell-index = <2>;
reg = <100 80>; reg = <0x100 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3e 2>; interrupts = <62 2>;
}; };
dma-channel@3 { dma-channel@3 {
compatible = "fsl,mpc8610-dma-channel", compatible = "fsl,mpc8610-dma-channel",
"fsl,mpc8540-dma-channel"; "fsl,mpc8540-dma-channel";
cell-index = <3>; cell-index = <3>;
reg = <180 80>; reg = <0x180 0x80>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <3f 2>; interrupts = <63 2>;
}; };
}; };
...@@ -231,26 +232,26 @@ pci0: pci@e0008000 { ...@@ -231,26 +232,26 @@ pci0: pci@e0008000 {
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
reg = <e0008000 1000>; reg = <0xe0008000 0x1000>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 10000000 ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
01000000 0 00000000 e1000000 0 00100000>; 0x01000000 0x0 0x00000000 0xe1000000 0x0 0x00100000>;
clock-frequency = <1fca055>; clock-frequency = <33333333>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <18 2>; interrupts = <24 2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x11 */ /* IDSEL 0x11 */
8800 0 0 1 &mpic 4 1 0x8800 0 0 1 &mpic 4 1
8800 0 0 2 &mpic 5 1 0x8800 0 0 2 &mpic 5 1
8800 0 0 3 &mpic 6 1 0x8800 0 0 3 &mpic 6 1
8800 0 0 4 &mpic 7 1 0x8800 0 0 4 &mpic 7 1
/* IDSEL 0x12 */ /* IDSEL 0x12 */
9000 0 0 1 &mpic 5 1 0x9000 0 0 1 &mpic 5 1
9000 0 0 2 &mpic 6 1 0x9000 0 0 2 &mpic 6 1
9000 0 0 3 &mpic 7 1 0x9000 0 0 3 &mpic 7 1
9000 0 0 4 &mpic 4 1 0x9000 0 0 4 &mpic 4 1
>; >;
}; };
...@@ -261,28 +262,28 @@ pci1: pcie@e000a000 { ...@@ -261,28 +262,28 @@ pci1: pcie@e000a000 {
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
reg = <e000a000 1000>; reg = <0xe000a000 0x1000>;
bus-range = <1 3>; bus-range = <1 3>;
ranges = <02000000 0 a0000000 a0000000 0 10000000 ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
01000000 0 00000000 e3000000 0 00100000>; 0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
clock-frequency = <1fca055>; clock-frequency = <33333333>;
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
interrupts = <1a 2>; interrupts = <26 2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <0xf800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x1b */ /* IDSEL 0x1b */
d800 0 0 1 &mpic 2 1 0xd800 0 0 1 &mpic 2 1
/* IDSEL 0x1c*/ /* IDSEL 0x1c*/
e000 0 0 1 &mpic 1 1 0xe000 0 0 1 &mpic 1 1
e000 0 0 2 &mpic 1 1 0xe000 0 0 2 &mpic 1 1
e000 0 0 3 &mpic 1 1 0xe000 0 0 3 &mpic 1 1
e000 0 0 4 &mpic 1 1 0xe000 0 0 4 &mpic 1 1
/* IDSEL 0x1f */ /* IDSEL 0x1f */
f800 0 0 1 &mpic 3 0 0xf800 0 0 1 &mpic 3 0
f800 0 0 2 &mpic 0 1 0xf800 0 0 2 &mpic 0 1
>; >;
pcie@0 { pcie@0 {
...@@ -290,22 +291,22 @@ pcie@0 { ...@@ -290,22 +291,22 @@ pcie@0 {
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
ranges = <02000000 0 a0000000 ranges = <0x02000000 0x0 0xa0000000
02000000 0 a0000000 0x02000000 0x0 0xa0000000
0 10000000 0x0 0x10000000
01000000 0 00000000 0x01000000 0x0 0x00000000
01000000 0 00000000 0x01000000 0x0 0x00000000
0 00100000>; 0x0 0x00100000>;
uli1575@0 { uli1575@0 {
reg = <0 0 0 0 0>; reg = <0 0 0 0 0>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
ranges = <02000000 0 a0000000 ranges = <0x02000000 0x0 0xa0000000
02000000 0 a0000000 0x02000000 0x0 0xa0000000
0 10000000 0x0 0x10000000
01000000 0 00000000 0x01000000 0x0 0x00000000
01000000 0 00000000 0x01000000 0x0 0x00000000
0 00100000>; 0x0 0x00100000>;
}; };
}; };
}; };
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment