Skip to content

L
linux
Commit 56d7b794 authored by Kumar Gala's avatar Kumar Gala
Browse files
Options

Merge branch '85xx' into for_paulus

parents ffd84881 23f510bc
Show whitespace changes
Inline Side-by-side
Showing with 386 additions and 456 deletions
arch/powerpc/boot/dts/mpc8540ads.dts
View file @ 56d7b794
...@@ -12,16 +12,14 @@ ...@@ -12,16 +12,14 @@
/ { / {
model = "MPC8540ADS"; model = "MPC8540ADS";
compatible = "MPC85xxADS"; compatible = "MPC8540ADS", "MPC85xxADS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8540@0 { PowerPC,8540@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ PowerPC,8540@0 { ...@@ -34,13 +32,11 @@ PowerPC,8540@0 {
bus-frequency = <0>; // 166 MHz bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot clock-frequency = <0>; // 825 MHz, from uboot
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 08000000>; // 128M at 0x0 reg = <00000000 08000000>; // 128M at 0x0
}; };
...@@ -58,7 +54,7 @@ i2c@3000 { ...@@ -58,7 +54,7 @@ i2c@3000 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <3000 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -68,24 +64,20 @@ mdio@24520 { ...@@ -68,24 +64,20 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>; phy0: ethernet-phy@0 {
ethernet-phy@0 { interrupt-parent = <&mpic>;
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <35 1>; interrupts = <35 1>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 1>; interrupts = <35 1>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@3 { phy3: ethernet-phy@3 {
linux,phandle = <2452003>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <37 1>; interrupts = <37 1>;
reg = <3>; reg = <3>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -102,8 +94,8 @@ ethernet@24000 { ...@@ -102,8 +94,8 @@ ethernet@24000 {
address = [ 00 E0 0C 00 73 00 ]; address = [ 00 E0 0C 00 73 00 ];
local-mac-address = [ 00 E0 0C 00 73 00 ]; local-mac-address = [ 00 E0 0C 00 73 00 ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452000>; phy-handle = <&phy0>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -116,8 +108,8 @@ ethernet@25000 { ...@@ -116,8 +108,8 @@ ethernet@25000 {
address = [ 00 E0 0C 00 73 01 ]; address = [ 00 E0 0C 00 73 01 ];
local-mac-address = [ 00 E0 0C 00 73 01 ]; local-mac-address = [ 00 E0 0C 00 73 01 ];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy1>;
}; };
ethernet@26000 { ethernet@26000 {
...@@ -130,8 +122,8 @@ ethernet@26000 { ...@@ -130,8 +122,8 @@ ethernet@26000 {
address = [ 00 E0 0C 00 73 02 ]; address = [ 00 E0 0C 00 73 02 ];
local-mac-address = [ 00 E0 0C 00 73 02 ]; local-mac-address = [ 00 E0 0C 00 73 02 ];
interrupts = <19 2>; interrupts = <19 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452003>; phy-handle = <&phy3>;
}; };
serial@4500 { serial@4500 {
...@@ -140,7 +132,7 @@ serial@4500 { ...@@ -140,7 +132,7 @@ serial@4500 {
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial@4600 {
...@@ -149,85 +141,84 @@ serial@4600 { ...@@ -149,85 +141,84 @@ serial@4600 {
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
pci@8000 { pci@8000 {
linux,phandle = <8000>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x02 */ /* IDSEL 0x02 */
1000 0 0 1 40000 31 1 1000 0 0 1 &mpic 31 1
1000 0 0 2 40000 32 1 1000 0 0 2 &mpic 32 1
1000 0 0 3 40000 33 1 1000 0 0 3 &mpic 33 1
1000 0 0 4 40000 34 1 1000 0 0 4 &mpic 34 1
/* IDSEL 0x03 */ /* IDSEL 0x03 */
1800 0 0 1 40000 34 1 1800 0 0 1 &mpic 34 1
1800 0 0 2 40000 31 1 1800 0 0 2 &mpic 31 1
1800 0 0 3 40000 32 1 1800 0 0 3 &mpic 32 1
1800 0 0 4 40000 33 1 1800 0 0 4 &mpic 33 1
/* IDSEL 0x04 */ /* IDSEL 0x04 */
2000 0 0 1 40000 33 1 2000 0 0 1 &mpic 33 1
2000 0 0 2 40000 34 1 2000 0 0 2 &mpic 34 1
2000 0 0 3 40000 31 1 2000 0 0 3 &mpic 31 1
2000 0 0 4 40000 32 1 2000 0 0 4 &mpic 32 1
/* IDSEL 0x05 */ /* IDSEL 0x05 */
2800 0 0 1 40000 32 1 2800 0 0 1 &mpic 32 1
2800 0 0 2 40000 33 1 2800 0 0 2 &mpic 33 1
2800 0 0 3 40000 34 1 2800 0 0 3 &mpic 34 1
2800 0 0 4 40000 31 1 2800 0 0 4 &mpic 31 1
/* IDSEL 0x0c */ /* IDSEL 0x0c */
6000 0 0 1 40000 31 1 6000 0 0 1 &mpic 31 1
6000 0 0 2 40000 32 1 6000 0 0 2 &mpic 32 1
6000 0 0 3 40000 33 1 6000 0 0 3 &mpic 33 1
6000 0 0 4 40000 34 1 6000 0 0 4 &mpic 34 1
/* IDSEL 0x0d */ /* IDSEL 0x0d */
6800 0 0 1 40000 34 1 6800 0 0 1 &mpic 34 1
6800 0 0 2 40000 31 1 6800 0 0 2 &mpic 31 1
6800 0 0 3 40000 32 1 6800 0 0 3 &mpic 32 1
6800 0 0 4 40000 33 1 6800 0 0 4 &mpic 33 1
/* IDSEL 0x0e */ /* IDSEL 0x0e */
7000 0 0 1 40000 33 1 7000 0 0 1 &mpic 33 1
7000 0 0 2 40000 34 1 7000 0 0 2 &mpic 34 1
7000 0 0 3 40000 31 1 7000 0 0 3 &mpic 31 1
7000 0 0 4 40000 32 1 7000 0 0 4 &mpic 32 1
/* IDSEL 0x0f */ /* IDSEL 0x0f */
7800 0 0 1 40000 32 1 7800 0 0 1 &mpic 32 1
7800 0 0 2 40000 33 1 7800 0 0 2 &mpic 33 1
7800 0 0 3 40000 34 1 7800 0 0 3 &mpic 34 1
7800 0 0 4 40000 31 1 7800 0 0 4 &mpic 31 1
/* IDSEL 0x12 */ /* IDSEL 0x12 */
9000 0 0 1 40000 31 1 9000 0 0 1 &mpic 31 1
9000 0 0 2 40000 32 1 9000 0 0 2 &mpic 32 1
9000 0 0 3 40000 33 1 9000 0 0 3 &mpic 33 1
9000 0 0 4 40000 34 1 9000 0 0 4 &mpic 34 1
/* IDSEL 0x13 */ /* IDSEL 0x13 */
9800 0 0 1 40000 34 1 9800 0 0 1 &mpic 34 1
9800 0 0 2 40000 31 1 9800 0 0 2 &mpic 31 1
9800 0 0 3 40000 32 1 9800 0 0 3 &mpic 32 1
9800 0 0 4 40000 33 1 9800 0 0 4 &mpic 33 1
/* IDSEL 0x14 */ /* IDSEL 0x14 */
a000 0 0 1 40000 33 1 a000 0 0 1 &mpic 33 1
a000 0 0 2 40000 34 1 a000 0 0 2 &mpic 34 1
a000 0 0 3 40000 31 1 a000 0 0 3 &mpic 31 1
a000 0 0 4 40000 32 1 a000 0 0 4 &mpic 32 1
/* IDSEL 0x15 */ /* IDSEL 0x15 */
a800 0 0 1 40000 32 1 a800 0 0 1 &mpic 32 1
a800 0 0 2 40000 33 1 a800 0 0 2 &mpic 33 1
a800 0 0 3 40000 34 1 a800 0 0 3 &mpic 34 1
a800 0 0 4 40000 31 1>; a800 0 0 4 &mpic 31 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <08 2>; interrupts = <08 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 20000000 ranges = <02000000 0 80000000 80000000 0 20000000
...@@ -241,8 +232,7 @@ a800 0 0 3 40000 34 1 ...@@ -241,8 +232,7 @@ a800 0 0 3 40000 34 1
device_type = "pci"; device_type = "pci";
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
......
arch/powerpc/boot/dts/mpc8541cds.dts
View file @ 56d7b794
...@@ -12,16 +12,14 @@ ...@@ -12,16 +12,14 @@
/ { / {
model = "MPC8541CDS"; model = "MPC8541CDS";
compatible = "MPC85xxCDS"; compatible = "MPC8541CDS", "MPC85xxCDS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8541@0 { PowerPC,8541@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ PowerPC,8541@0 { ...@@ -34,13 +32,11 @@ PowerPC,8541@0 {
bus-frequency = <0>; // 166 MHz bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot clock-frequency = <0>; // 825 MHz, from uboot
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 08000000>; // 128M at 0x0 reg = <00000000 08000000>; // 128M at 0x0
}; };
...@@ -58,7 +54,7 @@ i2c@3000 { ...@@ -58,7 +54,7 @@ i2c@3000 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <3000 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -68,17 +64,14 @@ mdio@24520 { ...@@ -68,17 +64,14 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>; phy0: ethernet-phy@0 {
ethernet-phy@0 { interrupt-parent = <&mpic>;
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -94,8 +87,8 @@ ethernet@24000 { ...@@ -94,8 +87,8 @@ ethernet@24000 {
reg = <24000 1000>; reg = <24000 1000>;
local-mac-address = [ 00 E0 0C 00 73 00 ]; local-mac-address = [ 00 E0 0C 00 73 00 ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452000>; phy-handle = <&phy0>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -107,8 +100,8 @@ ethernet@25000 { ...@@ -107,8 +100,8 @@ ethernet@25000 {
reg = <25000 1000>; reg = <25000 1000>;
local-mac-address = [ 00 E0 0C 00 73 01 ]; local-mac-address = [ 00 E0 0C 00 73 01 ];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy1>;
}; };
serial@4500 { serial@4500 {
...@@ -117,7 +110,7 @@ serial@4500 { ...@@ -117,7 +110,7 @@ serial@4500 {
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial@4600 {
...@@ -126,57 +119,56 @@ serial@4600 { ...@@ -126,57 +119,56 @@ serial@4600 {
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
pci@8000 { pci1: pci@8000 {
linux,phandle = <8000>;
interrupt-map-mask = <1f800 0 0 7>; interrupt-map-mask = <1f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x10 */ /* IDSEL 0x10 */
08000 0 0 1 40000 30 1 08000 0 0 1 &mpic 30 1
08000 0 0 2 40000 31 1 08000 0 0 2 &mpic 31 1
08000 0 0 3 40000 32 1 08000 0 0 3 &mpic 32 1
08000 0 0 4 40000 33 1 08000 0 0 4 &mpic 33 1
/* IDSEL 0x11 */ /* IDSEL 0x11 */
08800 0 0 1 40000 30 1 08800 0 0 1 &mpic 30 1
08800 0 0 2 40000 31 1 08800 0 0 2 &mpic 31 1
08800 0 0 3 40000 32 1 08800 0 0 3 &mpic 32 1
08800 0 0 4 40000 33 1 08800 0 0 4 &mpic 33 1
/* IDSEL 0x12 (Slot 1) */ /* IDSEL 0x12 (Slot 1) */
09000 0 0 1 40000 30 1 09000 0 0 1 &mpic 30 1
09000 0 0 2 40000 31 1 09000 0 0 2 &mpic 31 1
09000 0 0 3 40000 32 1 09000 0 0 3 &mpic 32 1
09000 0 0 4 40000 33 1 09000 0 0 4 &mpic 33 1
/* IDSEL 0x13 (Slot 2) */ /* IDSEL 0x13 (Slot 2) */
09800 0 0 1 40000 31 1 09800 0 0 1 &mpic 31 1
09800 0 0 2 40000 32 1 09800 0 0 2 &mpic 32 1
09800 0 0 3 40000 33 1 09800 0 0 3 &mpic 33 1
09800 0 0 4 40000 30 1 09800 0 0 4 &mpic 30 1
/* IDSEL 0x14 (Slot 3) */ /* IDSEL 0x14 (Slot 3) */
0a000 0 0 1 40000 32 1 0a000 0 0 1 &mpic 32 1
0a000 0 0 2 40000 33 1 0a000 0 0 2 &mpic 33 1
0a000 0 0 3 40000 30 1 0a000 0 0 3 &mpic 30 1
0a000 0 0 4 40000 31 1 0a000 0 0 4 &mpic 31 1
/* IDSEL 0x15 (Slot 4) */ /* IDSEL 0x15 (Slot 4) */
0a800 0 0 1 40000 33 1 0a800 0 0 1 &mpic 33 1
0a800 0 0 2 40000 30 1 0a800 0 0 2 &mpic 30 1
0a800 0 0 3 40000 31 1 0a800 0 0 3 &mpic 31 1
0a800 0 0 4 40000 32 1 0a800 0 0 4 &mpic 32 1
/* Bus 1 (Tundra Bridge) */ /* Bus 1 (Tundra Bridge) */
/* IDSEL 0x12 (ISA bridge) */ /* IDSEL 0x12 (ISA bridge) */
19000 0 0 1 40000 30 1 19000 0 0 1 &mpic 30 1
19000 0 0 2 40000 31 1 19000 0 0 2 &mpic 31 1
19000 0 0 3 40000 32 1 19000 0 0 3 &mpic 32 1
19000 0 0 4 40000 33 1>; 19000 0 0 4 &mpic 33 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <08 2>; interrupts = <08 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 20000000 ranges = <02000000 0 80000000 80000000 0 20000000
...@@ -200,21 +192,20 @@ i8259@19000 { ...@@ -200,21 +192,20 @@ i8259@19000 {
compatible = "chrp,iic"; compatible = "chrp,iic";
big-endian; big-endian;
interrupts = <1>; interrupts = <1>;
interrupt-parent = <8000>; interrupt-parent = <&pci1>;
}; };
}; };
pci@9000 { pci@9000 {
linux,phandle = <9000>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x15 */ /* IDSEL 0x15 */
a800 0 0 1 40000 3b 1 a800 0 0 1 &mpic 3b 1
a800 0 0 2 40000 3b 1 a800 0 0 2 &mpic 3b 1
a800 0 0 3 40000 3b 1 a800 0 0 3 &mpic 3b 1
a800 0 0 4 40000 3b 1>; a800 0 0 4 &mpic 3b 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <09 2>; interrupts = <09 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 a0000000 a0000000 0 20000000 ranges = <02000000 0 a0000000 a0000000 0 20000000
...@@ -228,8 +219,7 @@ a800 0 0 3 40000 3b 1 ...@@ -228,8 +219,7 @@ a800 0 0 3 40000 3b 1
device_type = "pci"; device_type = "pci";
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
......
arch/powerpc/boot/dts/mpc8548cds.dts
View file @ 56d7b794
...@@ -12,16 +12,14 @@ ...@@ -12,16 +12,14 @@
/ { / {
model = "MPC8548CDS"; model = "MPC8548CDS";
compatible = "MPC85xxCDS"; compatible = "MPC8548CDS", "MPC85xxCDS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8548@0 { PowerPC,8548@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ PowerPC,8548@0 { ...@@ -34,13 +32,11 @@ PowerPC,8548@0 {
bus-frequency = <0>; // 166 MHz bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot clock-frequency = <0>; // 825 MHz, from uboot
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 08000000>; // 128M at 0x0 reg = <00000000 08000000>; // 128M at 0x0
}; };
...@@ -58,7 +54,7 @@ i2c@3000 { ...@@ -58,7 +54,7 @@ i2c@3000 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <3000 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -68,32 +64,26 @@ mdio@24520 { ...@@ -68,32 +64,26 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>; phy0: ethernet-phy@0 {
ethernet-phy@0 { interrupt-parent = <&mpic>;
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
phy2: ethernet-phy@2 {
ethernet-phy@2 { interrupt-parent = <&mpic>;
linux,phandle = <2452002>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <2>; reg = <2>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@3 { phy3: ethernet-phy@3 {
linux,phandle = <2452003>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <3>; reg = <3>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -109,8 +99,8 @@ ethernet@24000 { ...@@ -109,8 +99,8 @@ ethernet@24000 {
reg = <24000 1000>; reg = <24000 1000>;
local-mac-address = [ 00 E0 0C 00 73 00 ]; local-mac-address = [ 00 E0 0C 00 73 00 ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452000>; phy-handle = <&phy0>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -122,10 +112,11 @@ ethernet@25000 { ...@@ -122,10 +112,11 @@ ethernet@25000 {
reg = <25000 1000>; reg = <25000 1000>;
local-mac-address = [ 00 E0 0C 00 73 01 ]; local-mac-address = [ 00 E0 0C 00 73 01 ];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy1>;
}; };
/* eTSEC 3/4 are currently broken
ethernet@26000 { ethernet@26000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -135,11 +126,10 @@ ethernet@26000 { ...@@ -135,11 +126,10 @@ ethernet@26000 {
reg = <26000 1000>; reg = <26000 1000>;
local-mac-address = [ 00 E0 0C 00 73 02 ]; local-mac-address = [ 00 E0 0C 00 73 02 ];
interrupts = <f 2 10 2 11 2>; interrupts = <f 2 10 2 11 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy2>;
}; };
/* eTSEC 4 is currently broken
ethernet@27000 { ethernet@27000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -149,8 +139,8 @@ ethernet@27000 { ...@@ -149,8 +139,8 @@ ethernet@27000 {
reg = <27000 1000>; reg = <27000 1000>;
local-mac-address = [ 00 E0 0C 00 73 03 ]; local-mac-address = [ 00 E0 0C 00 73 03 ];
interrupts = <15 2 16 2 17 2>; interrupts = <15 2 16 2 17 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy3>;
}; };
*/ */
...@@ -160,7 +150,7 @@ serial@4500 { ...@@ -160,7 +150,7 @@ serial@4500 {
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial@4600 {
...@@ -169,57 +159,56 @@ serial@4600 { ...@@ -169,57 +159,56 @@ serial@4600 {
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
pci@8000 { pci1: pci@8000 {
linux,phandle = <8000>;
interrupt-map-mask = <1f800 0 0 7>; interrupt-map-mask = <1f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x10 */ /* IDSEL 0x10 */
08000 0 0 1 40000 30 1 08000 0 0 1 &mpic 30 1
08000 0 0 2 40000 31 1 08000 0 0 2 &mpic 31 1
08000 0 0 3 40000 32 1 08000 0 0 3 &mpic 32 1
08000 0 0 4 40000 33 1 08000 0 0 4 &mpic 33 1
/* IDSEL 0x11 */ /* IDSEL 0x11 */
08800 0 0 1 40000 30 1 08800 0 0 1 &mpic 30 1
08800 0 0 2 40000 31 1 08800 0 0 2 &mpic 31 1
08800 0 0 3 40000 32 1 08800 0 0 3 &mpic 32 1
08800 0 0 4 40000 33 1 08800 0 0 4 &mpic 33 1
/* IDSEL 0x12 (Slot 1) */ /* IDSEL 0x12 (Slot 1) */
09000 0 0 1 40000 30 1 09000 0 0 1 &mpic 30 1
09000 0 0 2 40000 31 1 09000 0 0 2 &mpic 31 1
09000 0 0 3 40000 32 1 09000 0 0 3 &mpic 32 1
09000 0 0 4 40000 33 1 09000 0 0 4 &mpic 33 1
/* IDSEL 0x13 (Slot 2) */ /* IDSEL 0x13 (Slot 2) */
09800 0 0 1 40000 31 1 09800 0 0 1 &mpic 31 1
09800 0 0 2 40000 32 1 09800 0 0 2 &mpic 32 1
09800 0 0 3 40000 33 1 09800 0 0 3 &mpic 33 1
09800 0 0 4 40000 30 1 09800 0 0 4 &mpic 30 1
/* IDSEL 0x14 (Slot 3) */ /* IDSEL 0x14 (Slot 3) */
0a000 0 0 1 40000 32 1 0a000 0 0 1 &mpic 32 1
0a000 0 0 2 40000 33 1 0a000 0 0 2 &mpic 33 1
0a000 0 0 3 40000 30 1 0a000 0 0 3 &mpic 30 1
0a000 0 0 4 40000 31 1 0a000 0 0 4 &mpic 31 1
/* IDSEL 0x15 (Slot 4) */ /* IDSEL 0x15 (Slot 4) */
0a800 0 0 1 40000 33 1 0a800 0 0 1 &mpic 33 1
0a800 0 0 2 40000 30 1 0a800 0 0 2 &mpic 30 1
0a800 0 0 3 40000 31 1 0a800 0 0 3 &mpic 31 1
0a800 0 0 4 40000 32 1 0a800 0 0 4 &mpic 32 1
/* Bus 1 (Tundra Bridge) */ /* Bus 1 (Tundra Bridge) */
/* IDSEL 0x12 (ISA bridge) */ /* IDSEL 0x12 (ISA bridge) */
19000 0 0 1 40000 30 1 19000 0 0 1 &mpic 30 1
19000 0 0 2 40000 31 1 19000 0 0 2 &mpic 31 1
19000 0 0 3 40000 32 1 19000 0 0 3 &mpic 32 1
19000 0 0 4 40000 33 1>; 19000 0 0 4 &mpic 33 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <08 2>; interrupts = <08 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 20000000 ranges = <02000000 0 80000000 80000000 0 20000000
...@@ -243,21 +232,20 @@ i8259@19000 { ...@@ -243,21 +232,20 @@ i8259@19000 {
compatible = "chrp,iic"; compatible = "chrp,iic";
big-endian; big-endian;
interrupts = <1>; interrupts = <1>;
interrupt-parent = <8000>; interrupt-parent = <&pci1>;
}; };
}; };
pci@9000 { pci@9000 {
linux,phandle = <9000>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x15 */ /* IDSEL 0x15 */
a800 0 0 1 40000 3b 1 a800 0 0 1 &mpic 3b 1
a800 0 0 2 40000 3b 1 a800 0 0 2 &mpic 3b 1
a800 0 0 3 40000 3b 1 a800 0 0 3 &mpic 3b 1
a800 0 0 4 40000 3b 1>; a800 0 0 4 &mpic 3b 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <09 2>; interrupts = <09 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 a0000000 a0000000 0 20000000 ranges = <02000000 0 a0000000 a0000000 0 20000000
...@@ -271,8 +259,7 @@ a800 0 0 3 40000 3b 1 ...@@ -271,8 +259,7 @@ a800 0 0 3 40000 3b 1
device_type = "pci"; device_type = "pci";
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
......
arch/powerpc/boot/dts/mpc8555cds.dts
View file @ 56d7b794
...@@ -12,16 +12,14 @@ ...@@ -12,16 +12,14 @@
/ { / {
model = "MPC8555CDS"; model = "MPC8555CDS";
compatible = "MPC85xxCDS"; compatible = "MPC8555CDS", "MPC85xxCDS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8555@0 { PowerPC,8555@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ PowerPC,8555@0 { ...@@ -34,13 +32,11 @@ PowerPC,8555@0 {
bus-frequency = <0>; // 166 MHz bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot clock-frequency = <0>; // 825 MHz, from uboot
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 08000000>; // 128M at 0x0 reg = <00000000 08000000>; // 128M at 0x0
}; };
...@@ -58,7 +54,7 @@ i2c@3000 { ...@@ -58,7 +54,7 @@ i2c@3000 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <3000 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -68,17 +64,14 @@ mdio@24520 { ...@@ -68,17 +64,14 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>; phy0: ethernet-phy@0 {
ethernet-phy@0 { interrupt-parent = <&mpic>;
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 0>; interrupts = <35 0>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -94,8 +87,8 @@ ethernet@24000 { ...@@ -94,8 +87,8 @@ ethernet@24000 {
reg = <24000 1000>; reg = <24000 1000>;
local-mac-address = [ 00 E0 0C 00 73 00 ]; local-mac-address = [ 00 E0 0C 00 73 00 ];
interrupts = <0d 2 0e 2 12 2>; interrupts = <0d 2 0e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452000>; phy-handle = <&phy0>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -107,8 +100,8 @@ ethernet@25000 { ...@@ -107,8 +100,8 @@ ethernet@25000 {
reg = <25000 1000>; reg = <25000 1000>;
local-mac-address = [ 00 E0 0C 00 73 01 ]; local-mac-address = [ 00 E0 0C 00 73 01 ];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy1>;
}; };
serial@4500 { serial@4500 {
...@@ -117,7 +110,7 @@ serial@4500 { ...@@ -117,7 +110,7 @@ serial@4500 {
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial@4600 {
...@@ -126,57 +119,56 @@ serial@4600 { ...@@ -126,57 +119,56 @@ serial@4600 {
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot? clock-frequency = <0>; // should we fill in in uboot?
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
pci@8000 { pci1: pci@8000 {
linux,phandle = <8000>;
interrupt-map-mask = <1f800 0 0 7>; interrupt-map-mask = <1f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x10 */ /* IDSEL 0x10 */
08000 0 0 1 40000 30 1 08000 0 0 1 &mpic 30 1
08000 0 0 2 40000 31 1 08000 0 0 2 &mpic 31 1
08000 0 0 3 40000 32 1 08000 0 0 3 &mpic 32 1
08000 0 0 4 40000 33 1 08000 0 0 4 &mpic 33 1
/* IDSEL 0x11 */ /* IDSEL 0x11 */
08800 0 0 1 40000 30 1 08800 0 0 1 &mpic 30 1
08800 0 0 2 40000 31 1 08800 0 0 2 &mpic 31 1
08800 0 0 3 40000 32 1 08800 0 0 3 &mpic 32 1
08800 0 0 4 40000 33 1 08800 0 0 4 &mpic 33 1
/* IDSEL 0x12 (Slot 1) */ /* IDSEL 0x12 (Slot 1) */
09000 0 0 1 40000 30 1 09000 0 0 1 &mpic 30 1
09000 0 0 2 40000 31 1 09000 0 0 2 &mpic 31 1
09000 0 0 3 40000 32 1 09000 0 0 3 &mpic 32 1
09000 0 0 4 40000 33 1 09000 0 0 4 &mpic 33 1
/* IDSEL 0x13 (Slot 2) */ /* IDSEL 0x13 (Slot 2) */
09800 0 0 1 40000 31 1 09800 0 0 1 &mpic 31 1
09800 0 0 2 40000 32 1 09800 0 0 2 &mpic 32 1
09800 0 0 3 40000 33 1 09800 0 0 3 &mpic 33 1
09800 0 0 4 40000 30 1 09800 0 0 4 &mpic 30 1
/* IDSEL 0x14 (Slot 3) */ /* IDSEL 0x14 (Slot 3) */
0a000 0 0 1 40000 32 1 0a000 0 0 1 &mpic 32 1
0a000 0 0 2 40000 33 1 0a000 0 0 2 &mpic 33 1
0a000 0 0 3 40000 30 1 0a000 0 0 3 &mpic 30 1
0a000 0 0 4 40000 31 1 0a000 0 0 4 &mpic 31 1
/* IDSEL 0x15 (Slot 4) */ /* IDSEL 0x15 (Slot 4) */
0a800 0 0 1 40000 33 1 0a800 0 0 1 &mpic 33 1
0a800 0 0 2 40000 30 1 0a800 0 0 2 &mpic 30 1
0a800 0 0 3 40000 31 1 0a800 0 0 3 &mpic 31 1
0a800 0 0 4 40000 32 1 0a800 0 0 4 &mpic 32 1
/* Bus 1 (Tundra Bridge) */ /* Bus 1 (Tundra Bridge) */
/* IDSEL 0x12 (ISA bridge) */ /* IDSEL 0x12 (ISA bridge) */
19000 0 0 1 40000 30 1 19000 0 0 1 &mpic 30 1
19000 0 0 2 40000 31 1 19000 0 0 2 &mpic 31 1
19000 0 0 3 40000 32 1 19000 0 0 3 &mpic 32 1
19000 0 0 4 40000 33 1>; 19000 0 0 4 &mpic 33 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <08 2>; interrupts = <08 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 20000000 ranges = <02000000 0 80000000 80000000 0 20000000
...@@ -200,21 +192,20 @@ i8259@19000 { ...@@ -200,21 +192,20 @@ i8259@19000 {
compatible = "chrp,iic"; compatible = "chrp,iic";
big-endian; big-endian;
interrupts = <1>; interrupts = <1>;
interrupt-parent = <8000>; interrupt-parent = <&pci1>;
}; };
}; };
pci@9000 { pci@9000 {
linux,phandle = <9000>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x15 */ /* IDSEL 0x15 */
a800 0 0 1 40000 3b 1 a800 0 0 1 &mpic 3b 1
a800 0 0 2 40000 3b 1 a800 0 0 2 &mpic 3b 1
a800 0 0 3 40000 3b 1 a800 0 0 3 &mpic 3b 1
a800 0 0 4 40000 3b 1>; a800 0 0 4 &mpic 3b 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <09 2>; interrupts = <09 2>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 a0000000 a0000000 0 20000000 ranges = <02000000 0 a0000000 a0000000 0 20000000
...@@ -228,8 +219,7 @@ a800 0 0 3 40000 3b 1 ...@@ -228,8 +219,7 @@ a800 0 0 3 40000 3b 1
device_type = "pci"; device_type = "pci";
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
......
arch/powerpc/boot/dts/mpc8560ads.dts
View file @ 56d7b794
...@@ -12,16 +12,14 @@ ...@@ -12,16 +12,14 @@
/ { / {
model = "MPC8560ADS"; model = "MPC8560ADS";
compatible = "MPC85xxADS"; compatible = "MPC8560ADS", "MPC85xxADS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8560@0 { PowerPC,8560@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ PowerPC,8560@0 { ...@@ -34,13 +32,11 @@ PowerPC,8560@0 {
bus-frequency = <13ab6680>; bus-frequency = <13ab6680>;
clock-frequency = <312c8040>; clock-frequency = <312c8040>;
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 10000000>; reg = <00000000 10000000>;
}; };
...@@ -57,33 +53,28 @@ mdio@24520 { ...@@ -57,33 +53,28 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
ethernet-phy@0 { phy0: ethernet-phy@0 {
linux,phandle = <2452000>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 1>; interrupts = <35 1>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <35 1>; interrupts = <35 1>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@2 { phy2: ethernet-phy@2 {
linux,phandle = <2452002>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <37 1>; interrupts = <37 1>;
reg = <2>; reg = <2>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@3 { phy3: ethernet-phy@3 {
linux,phandle = <2452003>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <37 1>; interrupts = <37 1>;
reg = <3>; reg = <3>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -97,8 +88,8 @@ ethernet@24000 { ...@@ -97,8 +88,8 @@ ethernet@24000 {
reg = <24000 1000>; reg = <24000 1000>;
address = [ 00 00 0C 00 00 FD ]; address = [ 00 00 0C 00 00 FD ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452000>; phy-handle = <&phy0>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -110,12 +101,11 @@ ethernet@25000 { ...@@ -110,12 +101,11 @@ ethernet@25000 {
reg = <25000 1000>; reg = <25000 1000>;
address = [ 00 00 0C 00 01 FD ]; address = [ 00 00 0C 00 01 FD ];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452001>; phy-handle = <&phy1>;
}; };
pci@8000 { pci@8000 {
linux,phandle = <8000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
...@@ -127,96 +117,94 @@ pci@8000 { ...@@ -127,96 +117,94 @@ pci@8000 {
interrupt-map = < interrupt-map = <
/* IDSEL 0x2 */ /* IDSEL 0x2 */
1000 0 0 1 40000 31 1 1000 0 0 1 &mpic 31 1
1000 0 0 2 40000 32 1 1000 0 0 2 &mpic 32 1
1000 0 0 3 40000 33 1 1000 0 0 3 &mpic 33 1
1000 0 0 4 40000 34 1 1000 0 0 4 &mpic 34 1
/* IDSEL 0x3 */ /* IDSEL 0x3 */
1800 0 0 1 40000 34 1 1800 0 0 1 &mpic 34 1
1800 0 0 2 40000 31 1 1800 0 0 2 &mpic 31 1
1800 0 0 3 40000 32 1 1800 0 0 3 &mpic 32 1
1800 0 0 4 40000 33 1 1800 0 0 4 &mpic 33 1
/* IDSEL 0x4 */ /* IDSEL 0x4 */
2000 0 0 1 40000 33 1 2000 0 0 1 &mpic 33 1
2000 0 0 2 40000 34 1 2000 0 0 2 &mpic 34 1
2000 0 0 3 40000 31 1 2000 0 0 3 &mpic 31 1
2000 0 0 4 40000 32 1 2000 0 0 4 &mpic 32 1
/* IDSEL 0x5 */ /* IDSEL 0x5 */
2800 0 0 1 40000 32 1 2800 0 0 1 &mpic 32 1
2800 0 0 2 40000 33 1 2800 0 0 2 &mpic 33 1
2800 0 0 3 40000 34 1 2800 0 0 3 &mpic 34 1
2800 0 0 4 40000 31 1 2800 0 0 4 &mpic 31 1
/* IDSEL 12 */ /* IDSEL 12 */
6000 0 0 1 40000 31 1 6000 0 0 1 &mpic 31 1
6000 0 0 2 40000 32 1 6000 0 0 2 &mpic 32 1
6000 0 0 3 40000 33 1 6000 0 0 3 &mpic 33 1
6000 0 0 4 40000 34 1 6000 0 0 4 &mpic 34 1
/* IDSEL 13 */ /* IDSEL 13 */
6800 0 0 1 40000 34 1 6800 0 0 1 &mpic 34 1
6800 0 0 2 40000 31 1 6800 0 0 2 &mpic 31 1
6800 0 0 3 40000 32 1 6800 0 0 3 &mpic 32 1
6800 0 0 4 40000 33 1 6800 0 0 4 &mpic 33 1
/* IDSEL 14*/ /* IDSEL 14*/
7000 0 0 1 40000 33 1 7000 0 0 1 &mpic 33 1
7000 0 0 2 40000 34 1 7000 0 0 2 &mpic 34 1
7000 0 0 3 40000 31 1 7000 0 0 3 &mpic 31 1
7000 0 0 4 40000 32 1 7000 0 0 4 &mpic 32 1
/* IDSEL 15 */ /* IDSEL 15 */
7800 0 0 1 40000 32 1 7800 0 0 1 &mpic 32 1
7800 0 0 2 40000 33 1 7800 0 0 2 &mpic 33 1
7800 0 0 3 40000 34 1 7800 0 0 3 &mpic 34 1
7800 0 0 4 40000 31 1 7800 0 0 4 &mpic 31 1
/* IDSEL 18 */ /* IDSEL 18 */
9000 0 0 1 40000 31 1 9000 0 0 1 &mpic 31 1
9000 0 0 2 40000 32 1 9000 0 0 2 &mpic 32 1
9000 0 0 3 40000 33 1 9000 0 0 3 &mpic 33 1
9000 0 0 4 40000 34 1 9000 0 0 4 &mpic 34 1
/* IDSEL 19 */ /* IDSEL 19 */
9800 0 0 1 40000 34 1 9800 0 0 1 &mpic 34 1
9800 0 0 2 40000 31 1 9800 0 0 2 &mpic 31 1
9800 0 0 3 40000 32 1 9800 0 0 3 &mpic 32 1
9800 0 0 4 40000 33 1 9800 0 0 4 &mpic 33 1
/* IDSEL 20 */ /* IDSEL 20 */
a000 0 0 1 40000 33 1 a000 0 0 1 &mpic 33 1
a000 0 0 2 40000 34 1 a000 0 0 2 &mpic 34 1
a000 0 0 3 40000 31 1 a000 0 0 3 &mpic 31 1
a000 0 0 4 40000 32 1 a000 0 0 4 &mpic 32 1
/* IDSEL 21 */ /* IDSEL 21 */
a800 0 0 1 40000 32 1 a800 0 0 1 &mpic 32 1
a800 0 0 2 40000 33 1 a800 0 0 2 &mpic 33 1
a800 0 0 3 40000 34 1 a800 0 0 3 &mpic 34 1
a800 0 0 4 40000 31 1>; a800 0 0 4 &mpic 31 1>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
interrupts = <8 0>; interrupts = <8 0>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <02000000 0 80000000 80000000 0 20000000 ranges = <02000000 0 80000000 80000000 0 20000000
01000000 0 00000000 e2000000 0 01000000>; 01000000 0 00000000 e2000000 0 01000000>;
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
reg = <40000 20100>; reg = <40000 40000>;
built-in; built-in;
device_type = "open-pic"; device_type = "open-pic";
}; };
cpm@e0000000 { cpm@e0000000 {
linux,phandle = <e0000000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
...@@ -227,13 +215,12 @@ cpm@e0000000 { ...@@ -227,13 +215,12 @@ cpm@e0000000 {
command-proc = <919c0>; command-proc = <919c0>;
brg-frequency = <9d5b340>; brg-frequency = <9d5b340>;
pic@90c00 { cpmpic: pic@90c00 {
linux,phandle = <90c00>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupts = <1e 0>; interrupts = <1e 0>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
reg = <90c00 80>; reg = <90c00 80>;
built-in; built-in;
device_type = "cpm-pic"; device_type = "cpm-pic";
...@@ -250,7 +237,7 @@ scc@91a00 { ...@@ -250,7 +237,7 @@ scc@91a00 {
tx-clock = <1>; tx-clock = <1>;
current-speed = <1c200>; current-speed = <1c200>;
interrupts = <28 8>; interrupts = <28 8>;
interrupt-parent = <90c00>; interrupt-parent = <&cpmpic>;
}; };
scc@91a20 { scc@91a20 {
...@@ -264,7 +251,7 @@ scc@91a20 { ...@@ -264,7 +251,7 @@ scc@91a20 {
tx-clock = <2>; tx-clock = <2>;
current-speed = <1c200>; current-speed = <1c200>;
interrupts = <29 8>; interrupts = <29 8>;
interrupt-parent = <90c00>; interrupt-parent = <&cpmpic>;
}; };
fcc@91320 { fcc@91320 {
...@@ -278,8 +265,8 @@ fcc@91320 { ...@@ -278,8 +265,8 @@ fcc@91320 {
rx-clock = <15>; rx-clock = <15>;
tx-clock = <16>; tx-clock = <16>;
interrupts = <21 8>; interrupts = <21 8>;
interrupt-parent = <90c00>; interrupt-parent = <&cpmpic>;
phy-handle = <2452002>; phy-handle = <&phy2>;
}; };
fcc@91340 { fcc@91340 {
...@@ -293,8 +280,8 @@ fcc@91340 { ...@@ -293,8 +280,8 @@ fcc@91340 {
rx-clock = <17>; rx-clock = <17>;
tx-clock = <18>; tx-clock = <18>;
interrupts = <22 8>; interrupts = <22 8>;
interrupt-parent = <90c00>; interrupt-parent = <&cpmpic>;
phy-handle = <2452003>; phy-handle = <&phy3>;
}; };
}; };
}; };
......
arch/powerpc/boot/dts/mpc8568mds.dts
View file @ 56d7b794
...@@ -16,16 +16,14 @@ ...@@ -16,16 +16,14 @@
/ { / {
model = "MPC8568EMDS"; model = "MPC8568EMDS";
compatible = "MPC85xxMDS"; compatible = "MPC8568EMDS", "MPC85xxMDS";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
linux,phandle = <200>;
PowerPC,8568@0 { PowerPC,8568@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -38,13 +36,11 @@ PowerPC,8568@0 { ...@@ -38,13 +36,11 @@ PowerPC,8568@0 {
bus-frequency = <0>; bus-frequency = <0>;
clock-frequency = <0>; clock-frequency = <0>;
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 10000000>; reg = <00000000 10000000>;
}; };
...@@ -67,7 +63,7 @@ i2c@3000 { ...@@ -67,7 +63,7 @@ i2c@3000 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3000 100>; reg = <3000 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -76,7 +72,7 @@ i2c@3100 { ...@@ -76,7 +72,7 @@ i2c@3100 {
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <3100 100>; reg = <3100 100>;
interrupts = <1b 2>; interrupts = <1b 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
dfsrr; dfsrr;
}; };
...@@ -86,32 +82,26 @@ mdio@24520 { ...@@ -86,32 +82,26 @@ mdio@24520 {
device_type = "mdio"; device_type = "mdio";
compatible = "gianfar"; compatible = "gianfar";
reg = <24520 20>; reg = <24520 20>;
linux,phandle = <24520>; phy0: ethernet-phy@0 {
ethernet-phy@0 { interrupt-parent = <&mpic>;
linux,phandle = <2452000>;
interrupt-parent = <40000>;
interrupts = <31 1>; interrupts = <31 1>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@1 { phy1: ethernet-phy@1 {
linux,phandle = <2452001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <32 1>; interrupts = <32 1>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
phy2: ethernet-phy@2 {
ethernet-phy@2 { interrupt-parent = <&mpic>;
linux,phandle = <2452002>;
interrupt-parent = <40000>;
interrupts = <31 1>; interrupts = <31 1>;
reg = <2>; reg = <2>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@3 { phy3: ethernet-phy@3 {
linux,phandle = <2452003>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <32 1>; interrupts = <32 1>;
reg = <3>; reg = <3>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -127,8 +117,8 @@ ethernet@24000 { ...@@ -127,8 +117,8 @@ ethernet@24000 {
reg = <24000 1000>; reg = <24000 1000>;
mac-address = [ 00 00 00 00 00 00 ]; mac-address = [ 00 00 00 00 00 00 ];
interrupts = <d 2 e 2 12 2>; interrupts = <d 2 e 2 12 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452002>; phy-handle = <&phy2>;
}; };
ethernet@25000 { ethernet@25000 {
...@@ -140,8 +130,8 @@ ethernet@25000 { ...@@ -140,8 +130,8 @@ ethernet@25000 {
reg = <25000 1000>; reg = <25000 1000>;
mac-address = [ 00 00 00 00 00 00]; mac-address = [ 00 00 00 00 00 00];
interrupts = <13 2 14 2 18 2>; interrupts = <13 2 14 2 18 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
phy-handle = <2452003>; phy-handle = <&phy3>;
}; };
serial@4500 { serial@4500 {
...@@ -150,7 +140,7 @@ serial@4500 { ...@@ -150,7 +140,7 @@ serial@4500 {
reg = <4500 100>; reg = <4500 100>;
clock-frequency = <0>; clock-frequency = <0>;
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial@4600 {
...@@ -159,7 +149,7 @@ serial@4600 { ...@@ -159,7 +149,7 @@ serial@4600 {
reg = <4600 100>; reg = <4600 100>;
clock-frequency = <0>; clock-frequency = <0>;
interrupts = <1a 2>; interrupts = <1a 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
crypto@30000 { crypto@30000 {
...@@ -168,15 +158,14 @@ crypto@30000 { ...@@ -168,15 +158,14 @@ crypto@30000 {
compatible = "talitos"; compatible = "talitos";
reg = <30000 f000>; reg = <30000 f000>;
interrupts = <1d 2>; interrupts = <1d 2>;
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
num-channels = <4>; num-channels = <4>;
channel-fifo-len = <18>; channel-fifo-len = <18>;
exec-units-mask = <000000fe>; exec-units-mask = <000000fe>;
descriptor-types-mask = <012b0ebf>; descriptor-types-mask = <012b0ebf>;
}; };
pic@40000 { mpic: pic@40000 {
linux,phandle = <40000>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
...@@ -192,8 +181,7 @@ par_io@e0100 { ...@@ -192,8 +181,7 @@ par_io@e0100 {
device_type = "par_io"; device_type = "par_io";
num-ports = <7>; num-ports = <7>;
ucc_pin@01 { pio1: ucc_pin@01 {
linux,phandle = <e010001>;
pio-map = < pio-map = <
/* port pin dir open_drain assignment has_irq */ /* port pin dir open_drain assignment has_irq */
4 0a 1 0 2 0 /* TxD0 */ 4 0a 1 0 2 0 /* TxD0 */
...@@ -220,8 +208,7 @@ ucc_pin@01 { ...@@ -220,8 +208,7 @@ ucc_pin@01 {
4 13 1 0 2 0 /* GTX_CLK */ 4 13 1 0 2 0 /* GTX_CLK */
1 1f 2 0 3 0>; /* GTX125 */ 1 1f 2 0 3 0>; /* GTX125 */
}; };
ucc_pin@02 { pio2: ucc_pin@02 {
linux,phandle = <e010002>;
pio-map = < pio-map = <
/* port pin dir open_drain assignment has_irq */ /* port pin dir open_drain assignment has_irq */
5 0a 1 0 2 0 /* TxD0 */ 5 0a 1 0 2 0 /* TxD0 */
...@@ -277,7 +264,7 @@ spi@4c0 { ...@@ -277,7 +264,7 @@ spi@4c0 {
compatible = "fsl_spi"; compatible = "fsl_spi";
reg = <4c0 40>; reg = <4c0 40>;
interrupts = <2>; interrupts = <2>;
interrupt-parent = <80>; interrupt-parent = <&qeic>;
mode = "cpu"; mode = "cpu";
}; };
...@@ -286,7 +273,7 @@ spi@500 { ...@@ -286,7 +273,7 @@ spi@500 {
compatible = "fsl_spi"; compatible = "fsl_spi";
reg = <500 40>; reg = <500 40>;
interrupts = <1>; interrupts = <1>;
interrupt-parent = <80>; interrupt-parent = <&qeic>;
mode = "cpu"; mode = "cpu";
}; };
...@@ -297,12 +284,12 @@ ucc@2000 { ...@@ -297,12 +284,12 @@ ucc@2000 {
device-id = <1>; device-id = <1>;
reg = <2000 200>; reg = <2000 200>;
interrupts = <20>; interrupts = <20>;
interrupt-parent = <80>; interrupt-parent = <&qeic>;
mac-address = [ 00 04 9f 00 23 23 ]; mac-address = [ 00 04 9f 00 23 23 ];
rx-clock = <0>; rx-clock = <0>;
tx-clock = <19>; tx-clock = <19>;
phy-handle = <212000>; phy-handle = <&qe_phy0>;
pio-handle = <e010001>; pio-handle = <&pio1>;
}; };
ucc@3000 { ucc@3000 {
...@@ -312,12 +299,12 @@ ucc@3000 { ...@@ -312,12 +299,12 @@ ucc@3000 {
device-id = <2>; device-id = <2>;
reg = <3000 200>; reg = <3000 200>;
interrupts = <21>; interrupts = <21>;
interrupt-parent = <80>; interrupt-parent = <&qeic>;
mac-address = [ 00 11 22 33 44 55 ]; mac-address = [ 00 11 22 33 44 55 ];
rx-clock = <0>; rx-clock = <0>;
tx-clock = <14>; tx-clock = <14>;
phy-handle = <212001>; phy-handle = <&qe_phy1>;
pio-handle = <e010002>; pio-handle = <&pio2>;
}; };
mdio@2120 { mdio@2120 {
...@@ -329,33 +316,29 @@ mdio@2120 { ...@@ -329,33 +316,29 @@ mdio@2120 {
/* These are the same PHYs as on /* These are the same PHYs as on
* gianfar's MDIO bus */ * gianfar's MDIO bus */
ethernet-phy@00 { qe_phy0: ethernet-phy@00 {
linux,phandle = <212000>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <31 1>; interrupts = <31 1>;
reg = <0>; reg = <0>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
interface = <6>; //ENET_1000_GMII interface = <6>; //ENET_1000_GMII
}; };
ethernet-phy@01 { qe_phy1: ethernet-phy@01 {
linux,phandle = <212001>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <32 1>; interrupts = <32 1>;
reg = <1>; reg = <1>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
interface = <6>; interface = <6>;
}; };
ethernet-phy@02 { qe_phy2: ethernet-phy@02 {
linux,phandle = <212002>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <31 1>; interrupts = <31 1>;
reg = <2>; reg = <2>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
interface = <6>; //ENET_1000_GMII interface = <6>; //ENET_1000_GMII
}; };
ethernet-phy@03 { qe_phy3: ethernet-phy@03 {
linux,phandle = <212003>; interrupt-parent = <&mpic>;
interrupt-parent = <40000>;
interrupts = <32 1>; interrupts = <32 1>;
reg = <3>; reg = <3>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
...@@ -363,8 +346,7 @@ ethernet-phy@03 { ...@@ -363,8 +346,7 @@ ethernet-phy@03 {
}; };
}; };
qeic@80 { qeic: qeic@80 {
linux,phandle = <80>;
interrupt-controller; interrupt-controller;
device_type = "qeic"; device_type = "qeic";
#address-cells = <0>; #address-cells = <0>;
...@@ -373,7 +355,7 @@ qeic@80 { ...@@ -373,7 +355,7 @@ qeic@80 {
built-in; built-in;
big-endian; big-endian;
interrupts = <1e 2 1e 2>; //high:30 low:30 interrupts = <1e 2 1e 2>; //high:30 low:30
interrupt-parent = <40000>; interrupt-parent = <&mpic>;
}; };
}; };
......
arch/powerpc/configs/mpc8568mds_defconfig
View file @ 56d7b794
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux kernel version: 2.6.20-rc5 # Linux kernel version: 2.6.20
# Wed Feb 7 23:54:25 2007 # Sat Feb 17 16:26:53 2007
# #
# CONFIG_PPC64 is not set # CONFIG_PPC64 is not set
CONFIG_PPC32=y CONFIG_PPC32=y
...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y ...@@ -34,9 +34,9 @@ CONFIG_DEFAULT_UIMAGE=y
# CONFIG_PPC_83xx is not set # CONFIG_PPC_83xx is not set
CONFIG_PPC_85xx=y CONFIG_PPC_85xx=y
# CONFIG_PPC_86xx is not set # CONFIG_PPC_86xx is not set
# CONFIG_PPC_8xx is not set
# CONFIG_40x is not set # CONFIG_40x is not set
# CONFIG_44x is not set # CONFIG_44x is not set
# CONFIG_8xx is not set
# CONFIG_E200 is not set # CONFIG_E200 is not set
CONFIG_85xx=y CONFIG_85xx=y
CONFIG_E500=y CONFIG_E500=y
...@@ -63,6 +63,7 @@ CONFIG_LOCALVERSION_AUTO=y ...@@ -63,6 +63,7 @@ CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y CONFIG_SWAP=y
CONFIG_SYSVIPC=y CONFIG_SYSVIPC=y
# CONFIG_IPC_NS is not set # CONFIG_IPC_NS is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set # CONFIG_POSIX_MQUEUE is not set
# CONFIG_BSD_PROCESS_ACCT is not set # CONFIG_BSD_PROCESS_ACCT is not set
# CONFIG_TASKSTATS is not set # CONFIG_TASKSTATS is not set
...@@ -130,7 +131,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" ...@@ -130,7 +131,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
# CONFIG_MPC8540_ADS is not set # CONFIG_MPC8540_ADS is not set
# CONFIG_MPC8560_ADS is not set # CONFIG_MPC8560_ADS is not set
# CONFIG_MPC85xx_CDS is not set # CONFIG_MPC85xx_CDS is not set
CONFIG_MPC8568_MDS=y CONFIG_MPC85xx_MDS=y
CONFIG_MPC85xx=y CONFIG_MPC85xx=y
CONFIG_PPC_INDIRECT_PCI_BE=y CONFIG_PPC_INDIRECT_PCI_BE=y
CONFIG_MPIC=y CONFIG_MPIC=y
...@@ -162,6 +163,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y ...@@ -162,6 +163,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set # CONFIG_SPARSEMEM_STATIC is not set
CONFIG_SPLIT_PTLOCK_CPUS=4 CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_RESOURCES_64BIT is not set # CONFIG_RESOURCES_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_PROC_DEVICETREE=y CONFIG_PROC_DEVICETREE=y
# CONFIG_CMDLINE_BOOL is not set # CONFIG_CMDLINE_BOOL is not set
# CONFIG_PM is not set # CONFIG_PM is not set
...@@ -171,6 +173,7 @@ CONFIG_ISA_DMA_API=y ...@@ -171,6 +173,7 @@ CONFIG_ISA_DMA_API=y
# #
# Bus options # Bus options
# #
CONFIG_ZONE_DMA=y
# CONFIG_MPIC_WEIRD is not set # CONFIG_MPIC_WEIRD is not set
# CONFIG_PPC_I8259 is not set # CONFIG_PPC_I8259 is not set
CONFIG_PPC_INDIRECT_PCI=y CONFIG_PPC_INDIRECT_PCI=y
...@@ -216,6 +219,7 @@ CONFIG_UNIX=y ...@@ -216,6 +219,7 @@ CONFIG_UNIX=y
CONFIG_XFRM=y CONFIG_XFRM=y
# CONFIG_XFRM_USER is not set # CONFIG_XFRM_USER is not set
# CONFIG_XFRM_SUB_POLICY is not set # CONFIG_XFRM_SUB_POLICY is not set
# CONFIG_XFRM_MIGRATE is not set
# CONFIG_NET_KEY is not set # CONFIG_NET_KEY is not set
CONFIG_INET=y CONFIG_INET=y
CONFIG_IP_MULTICAST=y CONFIG_IP_MULTICAST=y
...@@ -301,6 +305,7 @@ CONFIG_STANDALONE=y ...@@ -301,6 +305,7 @@ CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_PREVENT_FIRMWARE_BUILD=y
# CONFIG_FW_LOADER is not set # CONFIG_FW_LOADER is not set
# CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYS_HYPERVISOR is not set
# #
...@@ -341,7 +346,6 @@ CONFIG_BLK_DEV_INITRD=y ...@@ -341,7 +346,6 @@ CONFIG_BLK_DEV_INITRD=y
# #
# Misc devices # Misc devices
# #
# CONFIG_TIFM_CORE is not set
# #
# ATA/ATAPI/MFM/RLL support # ATA/ATAPI/MFM/RLL support
...@@ -543,6 +547,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 ...@@ -543,6 +547,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
# CONFIG_SERIAL_UARTLITE is not set # CONFIG_SERIAL_UARTLITE is not set
CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_CORE_CONSOLE=y
# CONFIG_SERIAL_OF_PLATFORM is not set
CONFIG_UNIX98_PTYS=y CONFIG_UNIX98_PTYS=y
CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTYS=y
CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LEGACY_PTY_COUNT=256
...@@ -698,6 +703,7 @@ CONFIG_FIRMWARE_EDID=y ...@@ -698,6 +703,7 @@ CONFIG_FIRMWARE_EDID=y
# HID Devices # HID Devices
# #
CONFIG_HID=y CONFIG_HID=y
# CONFIG_HID_DEBUG is not set
# #
# USB support # USB support
...@@ -759,6 +765,10 @@ CONFIG_HID=y ...@@ -759,6 +765,10 @@ CONFIG_HID=y
# DMA Devices # DMA Devices
# #
#
# Auxiliary Display support
#
# #
# Virtualization # Virtualization
# #
...@@ -896,7 +906,8 @@ CONFIG_BITREVERSE=y ...@@ -896,7 +906,8 @@ CONFIG_BITREVERSE=y
CONFIG_CRC32=y CONFIG_CRC32=y
# CONFIG_LIBCRC32C is not set # CONFIG_LIBCRC32C is not set
CONFIG_PLIST=y CONFIG_PLIST=y
CONFIG_IOMAP_COPY=y CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT=y
# #
# Instrumentation Support # Instrumentation Support
...@@ -914,6 +925,7 @@ CONFIG_ENABLE_MUST_CHECK=y ...@@ -914,6 +925,7 @@ CONFIG_ENABLE_MUST_CHECK=y
# CONFIG_DEBUG_FS is not set # CONFIG_DEBUG_FS is not set
# CONFIG_HEADERS_CHECK is not set # CONFIG_HEADERS_CHECK is not set
CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KERNEL=y
# CONFIG_DEBUG_SHIRQ is not set
CONFIG_LOG_BUF_SHIFT=14 CONFIG_LOG_BUF_SHIFT=14
CONFIG_DETECT_SOFTLOCKUP=y CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_SCHEDSTATS is not set # CONFIG_SCHEDSTATS is not set
...@@ -922,7 +934,6 @@ CONFIG_DETECT_SOFTLOCKUP=y ...@@ -922,7 +934,6 @@ CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_RT_MUTEX_TESTER is not set # CONFIG_RT_MUTEX_TESTER is not set
# CONFIG_DEBUG_SPINLOCK is not set # CONFIG_DEBUG_SPINLOCK is not set
# CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_MUTEXES is not set
# CONFIG_DEBUG_RWSEMS is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
# CONFIG_DEBUG_KOBJECT is not set # CONFIG_DEBUG_KOBJECT is not set
...@@ -932,6 +943,8 @@ CONFIG_DETECT_SOFTLOCKUP=y ...@@ -932,6 +943,8 @@ CONFIG_DETECT_SOFTLOCKUP=y
# CONFIG_DEBUG_LIST is not set # CONFIG_DEBUG_LIST is not set
CONFIG_FORCED_INLINING=y CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_DEBUG_STACKOVERFLOW is not set
# CONFIG_DEBUG_STACK_USAGE is not set
CONFIG_DEBUGGER=y CONFIG_DEBUGGER=y
# CONFIG_XMON is not set # CONFIG_XMON is not set
# CONFIG_BDI_SWITCH is not set # CONFIG_BDI_SWITCH is not set
...@@ -943,6 +956,8 @@ CONFIG_PPC_EARLY_DEBUG=y ...@@ -943,6 +956,8 @@ CONFIG_PPC_EARLY_DEBUG=y
# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set # CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set # CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set # CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
# #
# Security options # Security options
...@@ -970,8 +985,10 @@ CONFIG_CRYPTO_MD5=y ...@@ -970,8 +985,10 @@ CONFIG_CRYPTO_MD5=y
# CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_GF128MUL is not set
CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_ECB=m
CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CBC=y
CONFIG_CRYPTO_PCBC=m
# CONFIG_CRYPTO_LRW is not set # CONFIG_CRYPTO_LRW is not set
CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_FCRYPT is not set
# CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_BLOWFISH is not set
# CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_TWOFISH is not set
# CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_SERPENT is not set
...@@ -985,6 +1002,7 @@ CONFIG_CRYPTO_DES=y ...@@ -985,6 +1002,7 @@ CONFIG_CRYPTO_DES=y
# CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DEFLATE is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set # CONFIG_CRYPTO_MICHAEL_MIC is not set
# CONFIG_CRYPTO_CRC32C is not set # CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_CAMELLIA is not set
# CONFIG_CRYPTO_TEST is not set # CONFIG_CRYPTO_TEST is not set
# #
......
arch/powerpc/platforms/85xx/Kconfig
View file @ 56d7b794
...@@ -23,12 +23,12 @@ config MPC85xx_CDS ...@@ -23,12 +23,12 @@ config MPC85xx_CDS
help help
This option enables support for the MPC85xx CDS board This option enables support for the MPC85xx CDS board
config MPC8568_MDS config MPC85xx_MDS
bool "Freescale MPC8568 MDS" bool "Freescale MPC85xx MDS"
select DEFAULT_UIMAGE select DEFAULT_UIMAGE
# select QUICC_ENGINE # select QUICC_ENGINE
help help
This option enables support for the MPC8568 MDS board This option enables support for the MPC85xx MDS board
endchoice endchoice
...@@ -47,7 +47,7 @@ config MPC85xx ...@@ -47,7 +47,7 @@ config MPC85xx
bool bool
select PPC_UDBG_16550 select PPC_UDBG_16550
select PPC_INDIRECT_PCI select PPC_INDIRECT_PCI
default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC8568_MDS default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS || MPC85xx_MDS
config PPC_INDIRECT_PCI_BE config PPC_INDIRECT_PCI_BE
bool bool
......
arch/powerpc/platforms/85xx/Makefile
View file @ 56d7b794
...@@ -5,4 +5,4 @@ obj-$(CONFIG_PPC_85xx) += misc.o pci.o ...@@ -5,4 +5,4 @@ obj-$(CONFIG_PPC_85xx) += misc.o pci.o
obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
obj-$(CONFIG_MPC8568_MDS) += mpc8568_mds.o obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
arch/powerpc/platforms/85xx/mpc85xx_ads.c
View file @ 56d7b794
...@@ -272,10 +272,9 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m) ...@@ -272,10 +272,9 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
*/ */
static int __init mpc85xx_ads_probe(void) static int __init mpc85xx_ads_probe(void)
{ {
/* We always match for now, eventually we should look at the flat unsigned long root = of_get_flat_dt_root();
dev tree to ensure this is the board we are suppose to run on
*/ return of_flat_dt_is_compatible(root, "MPC85xxADS");
return 1;
} }
define_machine(mpc85xx_ads) { define_machine(mpc85xx_ads) {
......
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View file @ 56d7b794
...@@ -291,11 +291,9 @@ static void mpc85xx_cds_show_cpuinfo(struct seq_file *m) ...@@ -291,11 +291,9 @@ static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
*/ */
static int __init mpc85xx_cds_probe(void) static int __init mpc85xx_cds_probe(void)
{ {
/* We always match for now, eventually we should look at unsigned long root = of_get_flat_dt_root();
* the flat dev tree to ensure this is the board we are
* supposed to run on return of_flat_dt_is_compatible(root, "MPC85xxCDS");
*/
return 1;
} }
define_machine(mpc85xx_cds) { define_machine(mpc85xx_cds) {
......
arch/powerpc/platforms/85xx/mpc8568_mds.c → arch/powerpc/platforms/85xx/mpc85xx_mds.c
View file @ 56d7b794
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Yin Olivia <Hong-hua.Yin@freescale.com> * Yin Olivia <Hong-hua.Yin@freescale.com>
* *
* Description: * Description:
* MPC8568E MDS PB board specific routines. * MPC85xx MDS board specific routines.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
...@@ -69,14 +69,13 @@ unsigned long isa_mem_base = 0; ...@@ -69,14 +69,13 @@ unsigned long isa_mem_base = 0;
* Setup the architecture * Setup the architecture
* *
*/ */
static void __init mpc8568_mds_setup_arch(void) static void __init mpc85xx_mds_setup_arch(void)
{ {
struct device_node *np; struct device_node *np;
static u8 *bcsr_regs = NULL; static u8 *bcsr_regs = NULL;
if (ppc_md.progress) if (ppc_md.progress)
ppc_md.progress("mpc8568_mds_setup_arch()", 0); ppc_md.progress("mpc85xx_mds_setup_arch()", 0);
np = of_find_node_by_type(NULL, "cpu"); np = of_find_node_by_type(NULL, "cpu");
if (np != NULL) { if (np != NULL) {
...@@ -144,26 +143,26 @@ static void __init mpc8568_mds_setup_arch(void) ...@@ -144,26 +143,26 @@ static void __init mpc8568_mds_setup_arch(void)
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
} }
static struct of_device_id mpc8568_ids[] = { static struct of_device_id mpc85xx_ids[] = {
{ .type = "soc", }, { .type = "soc", },
{ .compatible = "soc", }, { .compatible = "soc", },
{ .type = "qe", }, { .type = "qe", },
{}, {},
}; };
static int __init mpc8568_publish_devices(void) static int __init mpc85xx_publish_devices(void)
{ {
if (!machine_is(mpc8568_mds)) if (!machine_is(mpc85xx_mds))
return 0; return 0;
/* Publish the QE devices */ /* Publish the QE devices */
of_platform_bus_probe(NULL,mpc8568_ids,NULL); of_platform_bus_probe(NULL,mpc85xx_ids,NULL);
return 0; return 0;
} }
device_initcall(mpc8568_publish_devices); device_initcall(mpc85xx_publish_devices);
static void __init mpc8568_mds_pic_init(void) static void __init mpc85xx_mds_pic_init(void)
{ {
struct mpic *mpic; struct mpic *mpic;
struct resource r; struct resource r;
...@@ -206,7 +205,6 @@ static void __init mpc8568_mds_pic_init(void) ...@@ -206,7 +205,6 @@ static void __init mpc8568_mds_pic_init(void)
mpic_init(mpic); mpic_init(mpic);
#ifdef CONFIG_QUICC_ENGINE #ifdef CONFIG_QUICC_ENGINE
np = of_find_node_by_type(NULL, "qeic"); np = of_find_node_by_type(NULL, "qeic");
if (!np) if (!np)
...@@ -217,27 +215,18 @@ static void __init mpc8568_mds_pic_init(void) ...@@ -217,27 +215,18 @@ static void __init mpc8568_mds_pic_init(void)
#endif /* CONFIG_QUICC_ENGINE */ #endif /* CONFIG_QUICC_ENGINE */
} }
static int __init mpc85xx_mds_probe(void)
static int __init mpc8568_mds_probe(void)
{ {
char *model = of_get_flat_dt_prop(of_get_flat_dt_root(), unsigned long root = of_get_flat_dt_root();
"model", NULL);
if (model == NULL)
return 0;
if (strcmp(model, "MPC8568EMDS"))
return 0;
DBG("MPC8568EMDS found\n");
return 1; return of_flat_dt_is_compatible(root, "MPC85xxMDS");
} }
define_machine(mpc85xx_mds) {
define_machine(mpc8568_mds) { .name = "MPC85xx MDS",
.name = "MPC8568E MDS", .probe = mpc85xx_mds_probe,
.probe = mpc8568_mds_probe, .setup_arch = mpc85xx_mds_setup_arch,
.setup_arch = mpc8568_mds_setup_arch, .init_IRQ = mpc85xx_mds_pic_init,
.init_IRQ = mpc8568_mds_pic_init,
.get_irq = mpic_get_irq, .get_irq = mpic_get_irq,
.restart = mpc85xx_restart, .restart = mpc85xx_restart,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7