Skip to content

L
linux-davinci
Commit 5c1992f8 authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files
Options

[POWERPC] Removed hardcoded phandles from dts 

Remove explicit phandles and move to using references that autogenerate the
phandles when needed.
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent c0fabf75
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 168 deletions
arch/powerpc/boot/dts/kuroboxHD.dts
View file @ 5c1992f8
...@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" ...@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
*/ */
/ { / {
linux,phandle = <1000>;
model = "KuroboxHD"; model = "KuroboxHD";
compatible = "linkstation"; compatible = "linkstation";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
cpus { cpus {
linux,phandle = <2000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,603e { /* Really 8241 */ PowerPC,603e { /* Really 8241 */
linux,phandle = <2100>;
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
clock-frequency = <bebc200>; /* Fixed by bootwrapper */ clock-frequency = <bebc200>; /* Fixed by bootwrapper */
...@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" ...@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
}; };
memory { memory {
linux,phandle = <3000>;
device_type = "memory"; device_type = "memory";
reg = <00000000 04000000>; reg = <00000000 04000000>;
}; };
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
linux,phandle = <4000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
...@@ -69,38 +64,34 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" ...@@ -69,38 +64,34 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
fef00000 fef00000 00100000>; /* pci iack */ fef00000 fef00000 00100000>; /* pci iack */
i2c@80003000 { i2c@80003000 {
linux,phandle = <4300>;
device_type = "i2c"; device_type = "i2c";
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <80003000 1000>; reg = <80003000 1000>;
interrupts = <5 2>; interrupts = <5 2>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
serial@80004500 { serial@80004500 {
linux,phandle = <4511>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004500 8>; reg = <80004500 8>;
clock-frequency = <5d08d88>; clock-frequency = <5d08d88>;
current-speed = <2580>; current-speed = <2580>;
interrupts = <9 2>; interrupts = <9 2>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
serial@80004600 { serial@80004600 {
linux,phandle = <4512>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004600 8>; reg = <80004600 8>;
clock-frequency = <5d08d88>; clock-frequency = <5d08d88>;
current-speed = <e100>; current-speed = <e100>;
interrupts = <a 0>; interrupts = <a 0>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
pic@80040000 { mpic: pic@80040000 {
linux,phandle = <4400>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
#address-cells = <0>; #address-cells = <0>;
device_type = "open-pic"; device_type = "open-pic";
...@@ -111,7 +102,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" ...@@ -111,7 +102,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
}; };
pci@fec00000 { pci@fec00000 {
linux,phandle = <4500>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -122,24 +112,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts" ...@@ -122,24 +112,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
02000000 0 80000000 80000000 0 70000000>; 02000000 0 80000000 80000000 0 70000000>;
bus-range = <0 ff>; bus-range = <0 ff>;
clock-frequency = <7f28155>; clock-frequency = <7f28155>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 11 - IRQ0 ETH */ /* IDSEL 11 - IRQ0 ETH */
5800 0 0 1 4400 0 1 5800 0 0 1 &mpic 0 1
5800 0 0 2 4400 1 1 5800 0 0 2 &mpic 1 1
5800 0 0 3 4400 2 1 5800 0 0 3 &mpic 2 1
5800 0 0 4 4400 3 1 5800 0 0 4 &mpic 3 1
/* IDSEL 12 - IRQ1 IDE0 */ /* IDSEL 12 - IRQ1 IDE0 */
6000 0 0 1 4400 1 1 6000 0 0 1 &mpic 1 1
6000 0 0 2 4400 2 1 6000 0 0 2 &mpic 2 1
6000 0 0 3 4400 3 1 6000 0 0 3 &mpic 3 1
6000 0 0 4 4400 0 1 6000 0 0 4 &mpic 0 1
/* IDSEL 14 - IRQ3 USB2.0 */ /* IDSEL 14 - IRQ3 USB2.0 */
7000 0 0 1 4400 3 1 7000 0 0 1 &mpic 3 1
7000 0 0 2 4400 3 1 7000 0 0 2 &mpic 3 1
7000 0 0 3 4400 3 1 7000 0 0 3 &mpic 3 1
7000 0 0 4 4400 3 1 7000 0 0 4 &mpic 3 1
>; >;
}; };
}; };
......
arch/powerpc/boot/dts/kuroboxHG.dts
View file @ 5c1992f8
...@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" ...@@ -21,19 +21,16 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
*/ */
/ { / {
linux,phandle = <1000>;
model = "KuroboxHG"; model = "KuroboxHG";
compatible = "linkstation"; compatible = "linkstation";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
cpus { cpus {
linux,phandle = <2000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,603e { /* Really 8241 */ PowerPC,603e { /* Really 8241 */
linux,phandle = <2100>;
device_type = "cpu"; device_type = "cpu";
reg = <0>; reg = <0>;
clock-frequency = <fdad680>; /* Fixed by bootwrapper */ clock-frequency = <fdad680>; /* Fixed by bootwrapper */
...@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" ...@@ -48,13 +45,11 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
}; };
memory { memory {
linux,phandle = <3000>;
device_type = "memory"; device_type = "memory";
reg = <00000000 08000000>; reg = <00000000 08000000>;
}; };
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */ soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
linux,phandle = <4000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
...@@ -69,38 +64,35 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" ...@@ -69,38 +64,35 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
fef00000 fef00000 00100000>; /* pci iack */ fef00000 fef00000 00100000>; /* pci iack */
i2c@80003000 { i2c@80003000 {
linux,phandle = <4300>;
device_type = "i2c"; device_type = "i2c";
compatible = "fsl-i2c"; compatible = "fsl-i2c";
reg = <80003000 1000>; reg = <80003000 1000>;
interrupts = <5 2>; interrupts = <5 2>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
serial@80004500 { serial@80004500 {
linux,phandle = <4511>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004500 8>; reg = <80004500 8>;
clock-frequency = <7c044a8>; clock-frequency = <7c044a8>;
current-speed = <2580>; current-speed = <2580>;
interrupts = <9 2>; interrupts = <9 2>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
serial@80004600 { serial@80004600 {
linux,phandle = <4512>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004600 8>; reg = <80004600 8>;
clock-frequency = <7c044a8>; clock-frequency = <7c044a8>;
current-speed = <e100>; current-speed = <e100>;
interrupts = <a 0>; interrupts = <a 0>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
}; };
pic@80040000 { mpic: pic@80040000 {
linux,phandle = <4400>; interrupt-parent = <&mpic>;
#interrupt-cells = <2>; #interrupt-cells = <2>;
#address-cells = <0>; #address-cells = <0>;
device_type = "open-pic"; device_type = "open-pic";
...@@ -111,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" ...@@ -111,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
}; };
pci@fec00000 { pci@fec00000 {
linux,phandle = <4500>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -122,24 +113,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts" ...@@ -122,24 +113,24 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
02000000 0 80000000 80000000 0 70000000>; 02000000 0 80000000 80000000 0 70000000>;
bus-range = <0 ff>; bus-range = <0 ff>;
clock-frequency = <7f28155>; clock-frequency = <7f28155>;
interrupt-parent = <4400>; interrupt-parent = <&mpic>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 11 - IRQ0 ETH */ /* IDSEL 11 - IRQ0 ETH */
5800 0 0 1 4400 0 1 5800 0 0 1 &mpic 0 1
5800 0 0 2 4400 1 1 5800 0 0 2 &mpic 1 1
5800 0 0 3 4400 2 1 5800 0 0 3 &mpic 2 1
5800 0 0 4 4400 3 1 5800 0 0 4 &mpic 3 1
/* IDSEL 12 - IRQ1 IDE0 */ /* IDSEL 12 - IRQ1 IDE0 */
6000 0 0 1 4400 1 1 6000 0 0 1 &mpic 1 1
6000 0 0 2 4400 2 1 6000 0 0 2 &mpic 2 1
6000 0 0 3 4400 3 1 6000 0 0 3 &mpic 3 1
6000 0 0 4 4400 0 1 6000 0 0 4 &mpic 0 1
/* IDSEL 14 - IRQ3 USB2.0 */ /* IDSEL 14 - IRQ3 USB2.0 */
7000 0 0 1 4400 3 1 7000 0 0 1 &mpic 3 1
7000 0 0 2 4400 3 1 7000 0 0 2 &mpic 3 1
7000 0 0 3 4400 3 1 7000 0 0 3 &mpic 3 1
7000 0 0 4 4400 3 1 7000 0 0 4 &mpic 3 1
>; >;
}; };
}; };
......
arch/powerpc/boot/dts/lite5200.dts
View file @ 5c1992f8
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
soc5200@f0000000 { soc5200@f0000000 {
model = "fsl,mpc5200"; model = "fsl,mpc5200";
compatible = "mpc5200"; compatible = "mpc5200";
revision = "" // from bootloader revision = ""; // from bootloader
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "soc"; device_type = "soc";
ranges = <0 f0000000 f0010000>; ranges = <0 f0000000 f0010000>;
...@@ -62,13 +62,12 @@ ...@@ -62,13 +62,12 @@
reg = <200 38>; reg = <200 38>;
}; };
pic@500 { mpc5200_pic: pic@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
linux,phandle = <500>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200-pic"; compatible = "mpc5200_pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };
...@@ -79,7 +78,7 @@ ...@@ -79,7 +78,7 @@
cell-index = <0>; cell-index = <0>;
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
has-wdt; has-wdt;
}; };
...@@ -89,7 +88,7 @@ ...@@ -89,7 +88,7 @@
cell-index = <1>; cell-index = <1>;
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer gpt@620 { // General Purpose Timer
...@@ -98,7 +97,7 @@ ...@@ -98,7 +97,7 @@
cell-index = <2>; cell-index = <2>;
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer gpt@630 { // General Purpose Timer
...@@ -107,7 +106,7 @@ ...@@ -107,7 +106,7 @@
cell-index = <3>; cell-index = <3>;
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer gpt@640 { // General Purpose Timer
...@@ -116,7 +115,7 @@ ...@@ -116,7 +115,7 @@
cell-index = <4>; cell-index = <4>;
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer gpt@650 { // General Purpose Timer
...@@ -125,7 +124,7 @@ ...@@ -125,7 +124,7 @@
cell-index = <5>; cell-index = <5>;
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@660 { // General Purpose Timer gpt@660 { // General Purpose Timer
...@@ -134,7 +133,7 @@ ...@@ -134,7 +133,7 @@
cell-index = <6>; cell-index = <6>;
reg = <660 10>; reg = <660 10>;
interrupts = <1 f 0>; interrupts = <1 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@670 { // General Purpose Timer gpt@670 { // General Purpose Timer
...@@ -143,7 +142,7 @@ ...@@ -143,7 +142,7 @@
cell-index = <7>; cell-index = <7>;
reg = <670 10>; reg = <670 10>;
interrupts = <1 10 0>; interrupts = <1 10 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
...@@ -151,7 +150,7 @@ ...@@ -151,7 +150,7 @@
device_type = "rtc"; device_type = "rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
mscan@900 { mscan@900 {
...@@ -159,7 +158,7 @@ ...@@ -159,7 +158,7 @@
compatible = "mpc5200-mscan"; compatible = "mpc5200-mscan";
cell-index = <0>; cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
reg = <900 80>; reg = <900 80>;
}; };
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
compatible = "mpc5200-mscan"; compatible = "mpc5200-mscan";
cell-index = <1>; cell-index = <1>;
interrupts = <2 12 0>; interrupts = <2 12 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
reg = <980 80>; reg = <980 80>;
}; };
...@@ -176,14 +175,14 @@ ...@@ -176,14 +175,14 @@
compatible = "mpc5200-gpio"; compatible = "mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio-wkup@c00 {
compatible = "mpc5200-gpio-wkup"; compatible = "mpc5200-gpio-wkup";
reg = <c00 40>; reg = <c00 40>;
interrupts = <1 8 0 0 3 0>; interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
pci@0d00 { pci@0d00 {
...@@ -194,13 +193,13 @@ ...@@ -194,13 +193,13 @@
compatible = "mpc5200-pci"; compatible = "mpc5200-pci";
reg = <d00 100>; reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
c000 0 0 2 500 0 0 3 c000 0 0 2 &mpc5200_pic 0 0 3
c000 0 0 3 500 0 0 3 c000 0 0 3 &mpc5200_pic 0 0 3
c000 0 0 4 500 0 0 3>; c000 0 0 4 &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 a 0>; interrupts = <2 8 0 2 9 0 2 a 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <42000000 0 80000000 80000000 0 20000000 ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 10000000 02000000 0 a0000000 a0000000 0 10000000
...@@ -212,7 +211,7 @@ ...@@ -212,7 +211,7 @@
compatible = "mpc5200-spi"; compatible = "mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
...@@ -220,7 +219,7 @@ ...@@ -220,7 +219,7 @@
compatible = "mpc5200-ohci\0ohci-be"; compatible = "mpc5200-ohci\0ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
bestcomm@1200 { bestcomm@1200 {
...@@ -231,7 +230,7 @@ ...@@ -231,7 +230,7 @@
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
3 8 0 3 9 0 3 a 0 3 b 0 3 8 0 3 9 0 3 a 0 3 b 0
3 c 0 3 d 0 3 e 0 3 f 0>; 3 c 0 3 d 0 3 e 0 3 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
xlb@1f00 { xlb@1f00 {
...@@ -246,7 +245,7 @@ ...@@ -246,7 +245,7 @@
cell-index = <0>; cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
// PSC2 in ac97 mode example // PSC2 in ac97 mode example
...@@ -256,7 +255,7 @@ ...@@ -256,7 +255,7 @@
// cell-index = <1>; // cell-index = <1>;
// reg = <2200 100>; // reg = <2200 100>;
// interrupts = <2 2 0>; // interrupts = <2 2 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
...@@ -266,7 +265,7 @@ ...@@ -266,7 +265,7 @@
// cell-index = <2>; // cell-index = <2>;
// reg = <2400 100>; // reg = <2400 100>;
// interrupts = <2 3 0>; // interrupts = <2 3 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC4 in uart mode example // PSC4 in uart mode example
...@@ -276,7 +275,7 @@ ...@@ -276,7 +275,7 @@
// cell-index = <3>; // cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC5 in uart mode example // PSC5 in uart mode example
...@@ -286,7 +285,7 @@ ...@@ -286,7 +285,7 @@
// cell-index = <4>; // cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC6 in spi mode example // PSC6 in spi mode example
...@@ -296,7 +295,7 @@ ...@@ -296,7 +295,7 @@
// cell-index = <5>; // cell-index = <5>;
// reg = <2c00 100>; // reg = <2c00 100>;
// interrupts = <2 4 0>; // interrupts = <2 4 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
ethernet@3000 { ethernet@3000 {
...@@ -305,7 +304,7 @@ ...@@ -305,7 +304,7 @@
reg = <3000 800>; reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
ata@3a00 { ata@3a00 {
...@@ -313,7 +312,7 @@ ...@@ -313,7 +312,7 @@
compatible = "mpc5200-ata"; compatible = "mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
i2c@3d00 { i2c@3d00 {
...@@ -322,7 +321,7 @@ ...@@ -322,7 +321,7 @@
cell-index = <0>; cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking; fsl5200-clocking;
}; };
...@@ -332,7 +331,7 @@ ...@@ -332,7 +331,7 @@
cell-index = <1>; cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking; fsl5200-clocking;
}; };
sram@8000 { sram@8000 {
......
arch/powerpc/boot/dts/lite5200b.dts
View file @ 5c1992f8
...@@ -62,13 +62,12 @@ ...@@ -62,13 +62,12 @@
reg = <200 38>; reg = <200 38>;
}; };
pic@500 { mpc5200_pic: pic@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
linux,phandle = <500>;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200b-pic\0mpc5200-pic"; compatible = "mpc5200b-pic\0mpc5200_pic";
reg = <500 80>; reg = <500 80>;
built-in; built-in;
}; };
...@@ -79,7 +78,7 @@ ...@@ -79,7 +78,7 @@
cell-index = <0>; cell-index = <0>;
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
has-wdt; has-wdt;
}; };
...@@ -89,7 +88,7 @@ ...@@ -89,7 +88,7 @@
cell-index = <1>; cell-index = <1>;
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer gpt@620 { // General Purpose Timer
...@@ -98,7 +97,7 @@ ...@@ -98,7 +97,7 @@
cell-index = <2>; cell-index = <2>;
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer gpt@630 { // General Purpose Timer
...@@ -107,7 +106,7 @@ ...@@ -107,7 +106,7 @@
cell-index = <3>; cell-index = <3>;
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer gpt@640 { // General Purpose Timer
...@@ -116,7 +115,7 @@ ...@@ -116,7 +115,7 @@
cell-index = <4>; cell-index = <4>;
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer gpt@650 { // General Purpose Timer
...@@ -125,7 +124,7 @@ ...@@ -125,7 +124,7 @@
cell-index = <5>; cell-index = <5>;
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@660 { // General Purpose Timer gpt@660 { // General Purpose Timer
...@@ -134,7 +133,7 @@ ...@@ -134,7 +133,7 @@
cell-index = <6>; cell-index = <6>;
reg = <660 10>; reg = <660 10>;
interrupts = <1 f 0>; interrupts = <1 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@670 { // General Purpose Timer gpt@670 { // General Purpose Timer
...@@ -143,7 +142,7 @@ ...@@ -143,7 +142,7 @@
cell-index = <7>; cell-index = <7>;
reg = <670 10>; reg = <670 10>;
interrupts = <1 10 0>; interrupts = <1 10 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
...@@ -151,7 +150,7 @@ ...@@ -151,7 +150,7 @@
device_type = "rtc"; device_type = "rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
mscan@900 { mscan@900 {
...@@ -159,7 +158,7 @@ ...@@ -159,7 +158,7 @@
compatible = "mpc5200b-mscan\0mpc5200-mscan"; compatible = "mpc5200b-mscan\0mpc5200-mscan";
cell-index = <0>; cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
reg = <900 80>; reg = <900 80>;
}; };
...@@ -168,7 +167,7 @@ ...@@ -168,7 +167,7 @@
compatible = "mpc5200b-mscan\0mpc5200-mscan"; compatible = "mpc5200b-mscan\0mpc5200-mscan";
cell-index = <1>; cell-index = <1>;
interrupts = <2 12 0>; interrupts = <2 12 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
reg = <980 80>; reg = <980 80>;
}; };
...@@ -176,14 +175,14 @@ ...@@ -176,14 +175,14 @@
compatible = "mpc5200b-gpio\0mpc5200-gpio"; compatible = "mpc5200b-gpio\0mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio-wkup@c00 {
compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup"; compatible = "mpc5200b-gpio-wkup\0mpc5200-gpio-wkup";
reg = <c00 40>; reg = <c00 40>;
interrupts = <1 8 0 0 3 0>; interrupts = <1 8 0 0 3 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
pci@0d00 { pci@0d00 {
...@@ -194,18 +193,18 @@ ...@@ -194,18 +193,18 @@
compatible = "mpc5200b-pci\0mpc5200-pci"; compatible = "mpc5200b-pci\0mpc5200-pci";
reg = <d00 100>; reg = <d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 500 0 0 3 // 1st slot interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
c000 0 0 2 500 1 1 3 c000 0 0 2 &mpc5200_pic 1 1 3
c000 0 0 3 500 1 2 3 c000 0 0 3 &mpc5200_pic 1 2 3
c000 0 0 4 500 1 3 3 c000 0 0 4 &mpc5200_pic 1 3 3
c800 0 0 1 500 1 1 3 // 2nd slot c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
c800 0 0 2 500 1 2 3 c800 0 0 2 &mpc5200_pic 1 2 3
c800 0 0 3 500 1 3 3 c800 0 0 3 &mpc5200_pic 1 3 3
c800 0 0 4 500 0 0 3>; c800 0 0 4 &mpc5200_pic 0 0 3>;
clock-frequency = <0>; // From boot loader clock-frequency = <0>; // From boot loader
interrupts = <2 8 0 2 9 0 2 a 0>; interrupts = <2 8 0 2 9 0 2 a 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
bus-range = <0 0>; bus-range = <0 0>;
ranges = <42000000 0 80000000 80000000 0 20000000 ranges = <42000000 0 80000000 80000000 0 20000000
02000000 0 a0000000 a0000000 0 10000000 02000000 0 a0000000 a0000000 0 10000000
...@@ -217,7 +216,7 @@ ...@@ -217,7 +216,7 @@
compatible = "mpc5200b-spi\0mpc5200-spi"; compatible = "mpc5200b-spi\0mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
...@@ -225,7 +224,7 @@ ...@@ -225,7 +224,7 @@
compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be"; compatible = "mpc5200b-ohci\0mpc5200-ohci\0ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
bestcomm@1200 { bestcomm@1200 {
...@@ -236,7 +235,7 @@ ...@@ -236,7 +235,7 @@
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
3 8 0 3 9 0 3 a 0 3 b 0 3 8 0 3 9 0 3 a 0 3 b 0
3 c 0 3 d 0 3 e 0 3 f 0>; 3 c 0 3 d 0 3 e 0 3 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
xlb@1f00 { xlb@1f00 {
...@@ -251,7 +250,7 @@ ...@@ -251,7 +250,7 @@
cell-index = <0>; cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
// PSC2 in ac97 mode example // PSC2 in ac97 mode example
...@@ -261,7 +260,7 @@ ...@@ -261,7 +260,7 @@
// cell-index = <1>; // cell-index = <1>;
// reg = <2200 100>; // reg = <2200 100>;
// interrupts = <2 2 0>; // interrupts = <2 2 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
...@@ -271,7 +270,7 @@ ...@@ -271,7 +270,7 @@
// cell-index = <2>; // cell-index = <2>;
// reg = <2400 100>; // reg = <2400 100>;
// interrupts = <2 3 0>; // interrupts = <2 3 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC4 in uart mode example // PSC4 in uart mode example
...@@ -281,7 +280,7 @@ ...@@ -281,7 +280,7 @@
// cell-index = <3>; // cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC5 in uart mode example // PSC5 in uart mode example
...@@ -291,7 +290,7 @@ ...@@ -291,7 +290,7 @@
// cell-index = <4>; // cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
// PSC6 in spi mode example // PSC6 in spi mode example
...@@ -301,7 +300,7 @@ ...@@ -301,7 +300,7 @@
// cell-index = <5>; // cell-index = <5>;
// reg = <2c00 100>; // reg = <2c00 100>;
// interrupts = <2 4 0>; // interrupts = <2 4 0>;
// interrupt-parent = <500>; // interrupt-parent = <&mpc5200_pic>;
//}; //};
ethernet@3000 { ethernet@3000 {
...@@ -310,7 +309,7 @@ ...@@ -310,7 +309,7 @@
reg = <3000 800>; reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! mac-address = [ 02 03 04 05 06 07 ]; // Bad!
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
ata@3a00 { ata@3a00 {
...@@ -318,7 +317,7 @@ ...@@ -318,7 +317,7 @@
compatible = "mpc5200b-ata\0mpc5200-ata"; compatible = "mpc5200b-ata\0mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
}; };
i2c@3d00 { i2c@3d00 {
...@@ -327,7 +326,7 @@ ...@@ -327,7 +326,7 @@
cell-index = <0>; cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking; fsl5200-clocking;
}; };
...@@ -337,7 +336,7 @@ ...@@ -337,7 +336,7 @@
cell-index = <1>; cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <500>; interrupt-parent = <&mpc5200_pic>;
fsl5200-clocking; fsl5200-clocking;
}; };
sram@8000 { sram@8000 {
......
arch/powerpc/boot/dts/mpc7448hpc2.dts
View file @ 5c1992f8
...@@ -16,12 +16,10 @@ ...@@ -16,12 +16,10 @@
compatible = "mpc74xx"; compatible = "mpc74xx";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
linux,phandle = <100>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells =<0>; #size-cells =<0>;
linux,phandle = <200>;
PowerPC,7448@0 { PowerPC,7448@0 {
device_type = "cpu"; device_type = "cpu";
...@@ -34,13 +32,11 @@ ...@@ -34,13 +32,11 @@
clock-frequency = <0>; // From U-Boot clock-frequency = <0>; // From U-Boot
bus-frequency = <0>; // From U-Boot bus-frequency = <0>; // From U-Boot
32-bit; 32-bit;
linux,phandle = <201>;
}; };
}; };
memory { memory {
device_type = "memory"; device_type = "memory";
linux,phandle = <300>;
reg = <00000000 20000000 // DDR2 512M at 0 reg = <00000000 20000000 // DDR2 512M at 0
>; >;
}; };
...@@ -55,7 +51,7 @@ ...@@ -55,7 +51,7 @@
bus-frequency = <0>; bus-frequency = <0>;
i2c@7000 { i2c@7000 {
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
interrupts = <E 0>; interrupts = <E 0>;
reg = <7000 400>; reg = <7000 400>;
device_type = "i2c"; device_type = "i2c";
...@@ -66,18 +62,16 @@ ...@@ -66,18 +62,16 @@
device_type = "mdio"; device_type = "mdio";
compatible = "tsi-ethernet"; compatible = "tsi-ethernet";
ethernet-phy@6000 { phy8: ethernet-phy@6000 {
linux,phandle = <6000>; interrupt-parent = <&mpic>;
interrupt-parent = <7400>;
interrupts = <2 1>; interrupts = <2 1>;
reg = <6000 50>; reg = <6000 50>;
phy-id = <8>; phy-id = <8>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
}; };
ethernet-phy@6400 { phy9: ethernet-phy@6400 {
linux,phandle = <6400>; interrupt-parent = <&mpic>;
interrupt-parent = <7400>;
interrupts = <2 1>; interrupts = <2 1>;
reg = <6000 50>; reg = <6000 50>;
phy-id = <9>; phy-id = <9>;
...@@ -94,8 +88,8 @@ ...@@ -94,8 +88,8 @@
reg = <6000 200>; reg = <6000 200>;
address = [ 00 06 D2 00 00 01 ]; address = [ 00 06 D2 00 00 01 ];
interrupts = <10 2>; interrupts = <10 2>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
phy-handle = <6000>; phy-handle = <&phy8>;
}; };
ethernet@6600 { ethernet@6600 {
...@@ -107,8 +101,8 @@ ...@@ -107,8 +101,8 @@
reg = <6400 200>; reg = <6400 200>;
address = [ 00 06 D2 00 00 02 ]; address = [ 00 06 D2 00 00 02 ];
interrupts = <11 2>; interrupts = <11 2>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
phy-handle = <6400>; phy-handle = <&phy9>;
}; };
serial@7808 { serial@7808 {
...@@ -117,7 +111,7 @@ ...@@ -117,7 +111,7 @@
reg = <7808 200>; reg = <7808 200>;
clock-frequency = <3f6b5a00>; clock-frequency = <3f6b5a00>;
interrupts = <c 0>; interrupts = <c 0>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
}; };
serial@7c08 { serial@7c08 {
...@@ -126,11 +120,10 @@ ...@@ -126,11 +120,10 @@
reg = <7c08 200>; reg = <7c08 200>;
clock-frequency = <3f6b5a00>; clock-frequency = <3f6b5a00>;
interrupts = <d 0>; interrupts = <d 0>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
}; };
pic@7400 { mpic: pic@7400 {
linux,phandle = <7400>;
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
#address-cells = <0>; #address-cells = <0>;
...@@ -144,7 +137,6 @@ ...@@ -144,7 +137,6 @@
pci@1000 { pci@1000 {
compatible = "tsi10x"; compatible = "tsi10x";
device_type = "pci"; device_type = "pci";
linux,phandle = <1000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
...@@ -153,37 +145,37 @@ ...@@ -153,37 +145,37 @@
ranges = <02000000 0 e0000000 e0000000 0 1A000000 ranges = <02000000 0 e0000000 e0000000 0 1A000000
01000000 0 00000000 fa000000 0 00010000>; 01000000 0 00000000 fa000000 0 00010000>;
clock-frequency = <7f28154>; clock-frequency = <7f28154>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
interrupts = <17 2>; interrupts = <17 2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x11 */ /* IDSEL 0x11 */
0800 0 0 1 1180 24 0 0800 0 0 1 &RT0 24 0
0800 0 0 2 1180 25 0 0800 0 0 2 &RT0 25 0
0800 0 0 3 1180 26 0 0800 0 0 3 &RT0 26 0
0800 0 0 4 1180 27 0 0800 0 0 4 &RT0 27 0
/* IDSEL 0x12 */ /* IDSEL 0x12 */
1000 0 0 1 1180 25 0 1000 0 0 1 &RT0 25 0
1000 0 0 2 1180 26 0 1000 0 0 2 &RT0 26 0
1000 0 0 3 1180 27 0 1000 0 0 3 &RT0 27 0
1000 0 0 4 1180 24 0 1000 0 0 4 &RT0 24 0
/* IDSEL 0x13 */ /* IDSEL 0x13 */
1800 0 0 1 1180 26 0 1800 0 0 1 &RT0 26 0
1800 0 0 2 1180 27 0 1800 0 0 2 &RT0 27 0
1800 0 0 3 1180 24 0 1800 0 0 3 &RT0 24 0
1800 0 0 4 1180 25 0 1800 0 0 4 &RT0 25 0
/* IDSEL 0x14 */ /* IDSEL 0x14 */
2000 0 0 1 1180 27 0 2000 0 0 1 &RT0 27 0
2000 0 0 2 1180 24 0 2000 0 0 2 &RT0 24 0
2000 0 0 3 1180 25 0 2000 0 0 3 &RT0 25 0
2000 0 0 4 1180 26 0 2000 0 0 4 &RT0 26 0
>; >;
router@1180 {
linux,phandle = <1180>; RT0: router@1180 {
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
device_type = "pic-router"; device_type = "pic-router";
...@@ -192,7 +184,7 @@ ...@@ -192,7 +184,7 @@
built-in; built-in;
big-endian; big-endian;
interrupts = <17 2>; interrupts = <17 2>;
interrupt-parent = <7400>; interrupt-parent = <&mpic>;
}; };
}; };
}; };
......
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