Skip to content

L
linux
Commit 24ce6bc4 authored by Grant Likely's avatar Grant Likely
Browse files
Options

[POWERPC] mpc5200: make dts files conform to generic names recommended practice 

Modify mpc5200 dts files to match Open Firmware's Generic Names recommended
practice.
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 66ffbe49
Show whitespace changes
Inline Side-by-side
Showing with 150 additions and 204 deletions
arch/powerpc/boot/dts/cm5200.dts
View file @ 24ce6bc4
...@@ -47,17 +47,14 @@ memory { ...@@ -47,17 +47,14 @@ memory {
soc5200@f0000000 { soc5200@f0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "fsl,mpc5200b"; compatible = "fsl,mpc5200b-immr";
compatible = "fsl,mpc5200b";
revision = ""; // from bootloader
device_type = "soc";
ranges = <0 f0000000 0000c000>; ranges = <0 f0000000 0000c000>;
reg = <f0000000 00000100>; reg = <f0000000 00000100>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200b-cdm","mpc5200-cdm"; compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
...@@ -65,11 +62,11 @@ mpc5200_pic: pic@500 { ...@@ -65,11 +62,11 @@ mpc5200_pic: pic@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
compatible = "mpc5200b-pic","mpc5200-pic"; compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
reg = <500 80>; reg = <500 80>;
}; };
gpt@600 { // General Purpose Timer timer@600 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
...@@ -77,49 +74,49 @@ gpt@600 { // General Purpose Timer ...@@ -77,49 +74,49 @@ gpt@600 { // General Purpose Timer
fsl,has-wdt; fsl,has-wdt;
}; };
gpt@610 { // General Purpose Timer timer@610 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer timer@620 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer timer@630 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer timer@640 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer timer@650 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@660 { // General Purpose Timer timer@660 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <660 10>; reg = <660 10>;
interrupts = <1 f 0>; interrupts = <1 f 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@670 { // General Purpose Timer timer@670 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <670 10>; reg = <670 10>;
interrupts = <1 10 0>; interrupts = <1 10 0>;
...@@ -127,43 +124,42 @@ gpt@670 { // General Purpose Timer ...@@ -127,43 +124,42 @@ gpt@670 { // General Purpose Timer
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200b-rtc","mpc5200-rtc"; compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200b-gpio","mpc5200-gpio"; compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio@c00 {
compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup"; compatible = "fsl,mpc5200b-gpio-wkup","fsl,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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
spi@f00 { spi@f00 {
compatible = "mpc5200b-spi","mpc5200-spi"; compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
device_type = "usb-ohci-be"; compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
dma-controller@1200 { dma-controller@1200 {
compatible = "mpc5200b-bestcomm","mpc5200-bestcomm"; compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -173,13 +169,13 @@ dma-controller@1200 { ...@@ -173,13 +169,13 @@ dma-controller@1200 {
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200b-xlb","mpc5200-xlb"; compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
...@@ -188,7 +184,7 @@ serial@2000 { // PSC1 ...@@ -188,7 +184,7 @@ serial@2000 { // PSC1
serial@2200 { // PSC2 serial@2200 { // PSC2
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <1>; // Logical port assignment port-number = <1>; // Logical port assignment
reg = <2200 100>; reg = <2200 100>;
interrupts = <2 2 0>; interrupts = <2 2 0>;
...@@ -197,7 +193,7 @@ serial@2200 { // PSC2 ...@@ -197,7 +193,7 @@ serial@2200 { // PSC2
serial@2400 { // PSC3 serial@2400 { // PSC3
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <2>; // Logical port assignment port-number = <2>; // Logical port assignment
reg = <2400 100>; reg = <2400 100>;
interrupts = <2 3 0>; interrupts = <2 3 0>;
...@@ -206,7 +202,7 @@ serial@2400 { // PSC3 ...@@ -206,7 +202,7 @@ serial@2400 { // PSC3
serial@2c00 { // PSC6 serial@2c00 { // PSC6
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
port-number = <5>; // Logical port assignment port-number = <5>; // Logical port assignment
reg = <2c00 100>; reg = <2c00 100>;
interrupts = <2 4 0>; interrupts = <2 4 0>;
...@@ -215,15 +211,15 @@ serial@2c00 { // PSC6 ...@@ -215,15 +211,15 @@ serial@2c00 { // PSC6
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200b-fec","mpc5200-fec"; compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */ local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
i2c@3d40 { i2c@3d40 {
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -231,7 +227,7 @@ i2c@3d40 { ...@@ -231,7 +227,7 @@ i2c@3d40 {
}; };
sram@8000 { sram@8000 {
compatible = "mpc5200b-sram","mpc5200-sram"; compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
......
arch/powerpc/boot/dts/lite5200.dts
View file @ 24ce6bc4
...@@ -10,15 +10,8 @@ ...@@ -10,15 +10,8 @@
* option) any later version. * option) any later version.
*/ */
/*
* WARNING: Do not depend on this tree layout remaining static just yet.
* The MPC5200 device tree conventions are still in flux
* Keep an eye on the linuxppc-dev mailing list for more details
*/
/ { / {
model = "fsl,lite5200"; model = "fsl,lite5200";
// revision = "1.0";
compatible = "fsl,lite5200"; compatible = "fsl,lite5200";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -48,30 +41,27 @@ memory { ...@@ -48,30 +41,27 @@ memory {
soc5200@f0000000 { soc5200@f0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "fsl,mpc5200"; compatible = "fsl,mpc5200-immr";
compatible = "mpc5200";
revision = ""; // from bootloader
device_type = "soc";
ranges = <0 f0000000 0000c000>; ranges = <0 f0000000 0000c000>;
reg = <f0000000 00000100>; reg = <f0000000 00000100>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200-cdm"; compatible = "fsl,mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
mpc5200_pic: pic@500 { mpc5200_pic: interrupt-controller@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200-pic"; compatible = "fsl,mpc5200-pic";
reg = <500 80>; reg = <500 80>;
}; };
gpt@600 { // General Purpose Timer timer@600 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <0>; cell-index = <0>;
reg = <600 10>; reg = <600 10>;
...@@ -80,7 +70,7 @@ gpt@600 { // General Purpose Timer ...@@ -80,7 +70,7 @@ gpt@600 { // General Purpose Timer
fsl,has-wdt; fsl,has-wdt;
}; };
gpt@610 { // General Purpose Timer timer@610 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <1>; cell-index = <1>;
reg = <610 10>; reg = <610 10>;
...@@ -88,7 +78,7 @@ gpt@610 { // General Purpose Timer ...@@ -88,7 +78,7 @@ gpt@610 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer timer@620 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <2>; cell-index = <2>;
reg = <620 10>; reg = <620 10>;
...@@ -96,7 +86,7 @@ gpt@620 { // General Purpose Timer ...@@ -96,7 +86,7 @@ gpt@620 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer timer@630 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <3>; cell-index = <3>;
reg = <630 10>; reg = <630 10>;
...@@ -104,7 +94,7 @@ gpt@630 { // General Purpose Timer ...@@ -104,7 +94,7 @@ gpt@630 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer timer@640 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <4>; cell-index = <4>;
reg = <640 10>; reg = <640 10>;
...@@ -112,7 +102,7 @@ gpt@640 { // General Purpose Timer ...@@ -112,7 +102,7 @@ gpt@640 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer timer@650 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <5>; cell-index = <5>;
reg = <650 10>; reg = <650 10>;
...@@ -120,7 +110,7 @@ gpt@650 { // General Purpose Timer ...@@ -120,7 +110,7 @@ gpt@650 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@660 { // General Purpose Timer timer@660 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <6>; cell-index = <6>;
reg = <660 10>; reg = <660 10>;
...@@ -128,7 +118,7 @@ gpt@660 { // General Purpose Timer ...@@ -128,7 +118,7 @@ gpt@660 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@670 { // General Purpose Timer timer@670 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
cell-index = <7>; cell-index = <7>;
reg = <670 10>; reg = <670 10>;
...@@ -137,25 +127,23 @@ gpt@670 { // General Purpose Timer ...@@ -137,25 +127,23 @@ gpt@670 { // General Purpose Timer
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200-rtc"; compatible = "fsl,mpc5200-rtc";
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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
mscan@900 { can@900 {
device_type = "mscan"; compatible = "fsl,mpc5200-mscan";
compatible = "mpc5200-mscan";
cell-index = <0>; cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
reg = <900 80>; reg = <900 80>;
}; };
mscan@980 { can@980 {
device_type = "mscan"; compatible = "fsl,mpc5200-mscan";
compatible = "mpc5200-mscan";
cell-index = <1>; cell-index = <1>;
interrupts = <2 12 0>; interrupts = <2 12 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -163,38 +151,36 @@ mscan@980 { ...@@ -163,38 +151,36 @@ mscan@980 {
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200-gpio"; compatible = "fsl,mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio@c00 {
compatible = "mpc5200-gpio-wkup"; compatible = "fsl,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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
spi@f00 { spi@f00 {
device_type = "spi"; compatible = "fsl,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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
device_type = "usb-ohci-be"; compatible = "fsl,mpc5200-ohci","ohci-be";
compatible = "mpc5200-ohci","ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
bestcomm@1200 { dma-controller@1200 {
device_type = "dma-controller"; device_type = "dma-controller";
compatible = "mpc5200-bestcomm"; compatible = "fsl,mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -204,13 +190,13 @@ bestcomm@1200 { ...@@ -204,13 +190,13 @@ bestcomm@1200 {
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200-xlb"; compatible = "fsl,mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
cell-index = <0>; cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
...@@ -220,8 +206,7 @@ serial@2000 { // PSC1 ...@@ -220,8 +206,7 @@ serial@2000 { // PSC1
// PSC2 in ac97 mode example // PSC2 in ac97 mode example
//ac97@2200 { // PSC2 //ac97@2200 { // PSC2
// device_type = "sound"; // compatible = "fsl,mpc5200-psc-ac97";
// compatible = "mpc5200-psc-ac97";
// cell-index = <1>; // cell-index = <1>;
// reg = <2200 100>; // reg = <2200 100>;
// interrupts = <2 2 0>; // interrupts = <2 2 0>;
...@@ -230,8 +215,7 @@ serial@2000 { // PSC1 ...@@ -230,8 +215,7 @@ serial@2000 { // PSC1
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
//i2s@2400 { // PSC3 //i2s@2400 { // PSC3
// device_type = "sound"; // compatible = "fsl,mpc5200-psc-i2s";
// compatible = "mpc5200-psc-i2s";
// cell-index = <2>; // cell-index = <2>;
// reg = <2400 100>; // reg = <2400 100>;
// interrupts = <2 3 0>; // interrupts = <2 3 0>;
...@@ -241,7 +225,7 @@ serial@2000 { // PSC1 ...@@ -241,7 +225,7 @@ serial@2000 { // PSC1
// PSC4 in uart mode example // PSC4 in uart mode example
//serial@2600 { // PSC4 //serial@2600 { // PSC4
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200-psc-uart"; // compatible = "fsl,mpc5200-psc-uart";
// cell-index = <3>; // cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
...@@ -251,7 +235,7 @@ serial@2000 { // PSC1 ...@@ -251,7 +235,7 @@ serial@2000 { // PSC1
// PSC5 in uart mode example // PSC5 in uart mode example
//serial@2800 { // PSC5 //serial@2800 { // PSC5
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200-psc-uart"; // compatible = "fsl,mpc5200-psc-uart";
// cell-index = <4>; // cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
...@@ -260,8 +244,7 @@ serial@2000 { // PSC1 ...@@ -260,8 +244,7 @@ serial@2000 { // PSC1
// PSC6 in spi mode example // PSC6 in spi mode example
//spi@2c00 { // PSC6 //spi@2c00 { // PSC6
// device_type = "spi"; // compatible = "fsl,mpc5200-psc-spi";
// compatible = "mpc5200-psc-spi";
// cell-index = <5>; // cell-index = <5>;
// reg = <2c00 100>; // reg = <2c00 100>;
// interrupts = <2 4 0>; // interrupts = <2 4 0>;
...@@ -270,16 +253,16 @@ serial@2000 { // PSC1 ...@@ -270,16 +253,16 @@ serial@2000 { // PSC1
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200-fec"; compatible = "fsl,mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
ata@3a00 { ata@3a00 {
device_type = "ata"; device_type = "ata";
compatible = "mpc5200-ata"; compatible = "fsl,mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -288,7 +271,7 @@ ata@3a00 { ...@@ -288,7 +271,7 @@ ata@3a00 {
i2c@3d00 { i2c@3d00 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200-i2c","fsl-i2c";
cell-index = <0>; cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
...@@ -299,7 +282,7 @@ i2c@3d00 { ...@@ -299,7 +282,7 @@ i2c@3d00 {
i2c@3d40 { i2c@3d40 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200-i2c","fsl-i2c";
cell-index = <1>; cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
...@@ -307,8 +290,7 @@ i2c@3d40 { ...@@ -307,8 +290,7 @@ i2c@3d40 {
fsl5200-clocking; fsl5200-clocking;
}; };
sram@8000 { sram@8000 {
device_type = "sram"; compatible = "fsl,mpc5200-sram","sram";
compatible = "mpc5200-sram","sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
...@@ -318,7 +300,7 @@ pci@f0000d00 { ...@@ -318,7 +300,7 @@ pci@f0000d00 {
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
compatible = "mpc5200-pci"; compatible = "fsl,mpc5200-pci";
reg = <f0000d00 100>; reg = <f0000d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
......
arch/powerpc/boot/dts/lite5200b.dts
View file @ 24ce6bc4
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
/ { / {
model = "fsl,lite5200b"; model = "fsl,lite5200b";
// revision = "1.0";
compatible = "fsl,lite5200b"; compatible = "fsl,lite5200b";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -48,30 +47,27 @@ memory { ...@@ -48,30 +47,27 @@ memory {
soc5200@f0000000 { soc5200@f0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "fsl,mpc5200b"; compatible = "fsl,mpc5200b-immr";
compatible = "mpc5200";
revision = ""; // from bootloader
device_type = "soc";
ranges = <0 f0000000 0000c000>; ranges = <0 f0000000 0000c000>;
reg = <f0000000 00000100>; reg = <f0000000 00000100>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200b-cdm","mpc5200-cdm"; compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
mpc5200_pic: pic@500 { mpc5200_pic: interrupt-controller@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
device_type = "interrupt-controller"; device_type = "interrupt-controller";
compatible = "mpc5200b-pic","mpc5200-pic"; compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
reg = <500 80>; reg = <500 80>;
}; };
gpt@600 { // General Purpose Timer timer@600 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <0>; cell-index = <0>;
reg = <600 10>; reg = <600 10>;
...@@ -80,7 +76,7 @@ gpt@600 { // General Purpose Timer ...@@ -80,7 +76,7 @@ gpt@600 { // General Purpose Timer
fsl,has-wdt; fsl,has-wdt;
}; };
gpt@610 { // General Purpose Timer timer@610 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <1>; cell-index = <1>;
reg = <610 10>; reg = <610 10>;
...@@ -88,7 +84,7 @@ gpt@610 { // General Purpose Timer ...@@ -88,7 +84,7 @@ gpt@610 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer timer@620 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <2>; cell-index = <2>;
reg = <620 10>; reg = <620 10>;
...@@ -96,7 +92,7 @@ gpt@620 { // General Purpose Timer ...@@ -96,7 +92,7 @@ gpt@620 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer timer@630 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <3>; cell-index = <3>;
reg = <630 10>; reg = <630 10>;
...@@ -104,7 +100,7 @@ gpt@630 { // General Purpose Timer ...@@ -104,7 +100,7 @@ gpt@630 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer timer@640 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <4>; cell-index = <4>;
reg = <640 10>; reg = <640 10>;
...@@ -112,7 +108,7 @@ gpt@640 { // General Purpose Timer ...@@ -112,7 +108,7 @@ gpt@640 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer timer@650 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <5>; cell-index = <5>;
reg = <650 10>; reg = <650 10>;
...@@ -120,7 +116,7 @@ gpt@650 { // General Purpose Timer ...@@ -120,7 +116,7 @@ gpt@650 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@660 { // General Purpose Timer timer@660 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <6>; cell-index = <6>;
reg = <660 10>; reg = <660 10>;
...@@ -128,7 +124,7 @@ gpt@660 { // General Purpose Timer ...@@ -128,7 +124,7 @@ gpt@660 { // General Purpose Timer
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@670 { // General Purpose Timer timer@670 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
cell-index = <7>; cell-index = <7>;
reg = <670 10>; reg = <670 10>;
...@@ -137,25 +133,23 @@ gpt@670 { // General Purpose Timer ...@@ -137,25 +133,23 @@ gpt@670 { // General Purpose Timer
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200b-rtc","mpc5200-rtc"; compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
mscan@900 { can@900 {
device_type = "mscan"; compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
compatible = "mpc5200b-mscan","mpc5200-mscan";
cell-index = <0>; cell-index = <0>;
interrupts = <2 11 0>; interrupts = <2 11 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
reg = <900 80>; reg = <900 80>;
}; };
mscan@980 { can@980 {
device_type = "mscan"; compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
compatible = "mpc5200b-mscan","mpc5200-mscan";
cell-index = <1>; cell-index = <1>;
interrupts = <2 12 0>; interrupts = <2 12 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -163,38 +157,36 @@ mscan@980 { ...@@ -163,38 +157,36 @@ mscan@980 {
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200b-gpio","mpc5200-gpio"; compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio@c00 {
compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup"; compatible = "fsl,mpc5200b-gpio-wkup","fsl,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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
spi@f00 { spi@f00 {
device_type = "spi"; compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
compatible = "mpc5200b-spi","mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
device_type = "usb-ohci-be"; compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
bestcomm@1200 { dma-controller@1200 {
device_type = "dma-controller"; device_type = "dma-controller";
compatible = "mpc5200b-bestcomm","mpc5200-bestcomm"; compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -204,13 +196,13 @@ bestcomm@1200 { ...@@ -204,13 +196,13 @@ bestcomm@1200 {
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200b-xlb","mpc5200-xlb"; compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
cell-index = <0>; cell-index = <0>;
reg = <2000 100>; reg = <2000 100>;
...@@ -220,8 +212,7 @@ serial@2000 { // PSC1 ...@@ -220,8 +212,7 @@ serial@2000 { // PSC1
// PSC2 in ac97 mode example // PSC2 in ac97 mode example
//ac97@2200 { // PSC2 //ac97@2200 { // PSC2
// device_type = "sound"; // compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97";
// compatible = "mpc5200b-psc-ac97","mpc5200-psc-ac97";
// cell-index = <1>; // cell-index = <1>;
// reg = <2200 100>; // reg = <2200 100>;
// interrupts = <2 2 0>; // interrupts = <2 2 0>;
...@@ -230,8 +221,7 @@ serial@2000 { // PSC1 ...@@ -230,8 +221,7 @@ serial@2000 { // PSC1
// PSC3 in CODEC mode example // PSC3 in CODEC mode example
//i2s@2400 { // PSC3 //i2s@2400 { // PSC3
// device_type = "sound"; // compatible = "fsl,mpc5200b-psc-i2s"; //not 5200 compatible
// compatible = "mpc5200b-psc-i2s"; //not 5200 compatible
// cell-index = <2>; // cell-index = <2>;
// reg = <2400 100>; // reg = <2400 100>;
// interrupts = <2 3 0>; // interrupts = <2 3 0>;
...@@ -241,7 +231,7 @@ serial@2000 { // PSC1 ...@@ -241,7 +231,7 @@ serial@2000 { // PSC1
// PSC4 in uart mode example // PSC4 in uart mode example
//serial@2600 { // PSC4 //serial@2600 { // PSC4
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; // compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
// cell-index = <3>; // cell-index = <3>;
// reg = <2600 100>; // reg = <2600 100>;
// interrupts = <2 b 0>; // interrupts = <2 b 0>;
...@@ -251,7 +241,7 @@ serial@2000 { // PSC1 ...@@ -251,7 +241,7 @@ serial@2000 { // PSC1
// PSC5 in uart mode example // PSC5 in uart mode example
//serial@2800 { // PSC5 //serial@2800 { // PSC5
// device_type = "serial"; // device_type = "serial";
// compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; // compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
// cell-index = <4>; // cell-index = <4>;
// reg = <2800 100>; // reg = <2800 100>;
// interrupts = <2 c 0>; // interrupts = <2 c 0>;
...@@ -260,8 +250,7 @@ serial@2000 { // PSC1 ...@@ -260,8 +250,7 @@ serial@2000 { // PSC1
// PSC6 in spi mode example // PSC6 in spi mode example
//spi@2c00 { // PSC6 //spi@2c00 { // PSC6
// device_type = "spi"; // compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi";
// compatible = "mpc5200b-psc-spi","mpc5200-psc-spi";
// cell-index = <5>; // cell-index = <5>;
// reg = <2c00 100>; // reg = <2c00 100>;
// interrupts = <2 4 0>; // interrupts = <2 4 0>;
...@@ -270,9 +259,9 @@ serial@2000 { // PSC1 ...@@ -270,9 +259,9 @@ serial@2000 { // PSC1
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200b-fec","mpc5200-fec"; compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
reg = <3000 400>; reg = <3000 400>;
mac-address = [ 02 03 04 05 06 07 ]; // Bad! local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
phy-handle = <&phy0>; phy-handle = <&phy0>;
...@@ -281,8 +270,7 @@ ethernet@3000 { ...@@ -281,8 +270,7 @@ ethernet@3000 {
mdio@3000 { mdio@3000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
device_type = "mdio"; compatible = "fsl,mpc5200b-mdio";
compatible = "mpc5200b-fec-phy";
reg = <3000 400>; // fec range, since we need to setup fec interrupts reg = <3000 400>; // fec range, since we need to setup fec interrupts
interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co. interrupts = <2 5 0>; // these are for "mii command finished", not link changes & co.
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -295,7 +283,7 @@ phy0:ethernet-phy@0 { ...@@ -295,7 +283,7 @@ phy0:ethernet-phy@0 {
ata@3a00 { ata@3a00 {
device_type = "ata"; device_type = "ata";
compatible = "mpc5200b-ata","mpc5200-ata"; compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -304,7 +292,7 @@ ata@3a00 { ...@@ -304,7 +292,7 @@ ata@3a00 {
i2c@3d00 { i2c@3d00 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
cell-index = <0>; cell-index = <0>;
reg = <3d00 40>; reg = <3d00 40>;
interrupts = <2 f 0>; interrupts = <2 f 0>;
...@@ -315,7 +303,7 @@ i2c@3d00 { ...@@ -315,7 +303,7 @@ i2c@3d00 {
i2c@3d40 { i2c@3d40 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
cell-index = <1>; cell-index = <1>;
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
...@@ -323,8 +311,7 @@ i2c@3d40 { ...@@ -323,8 +311,7 @@ i2c@3d40 {
fsl5200-clocking; fsl5200-clocking;
}; };
sram@8000 { sram@8000 {
device_type = "sram"; compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram","sram";
compatible = "mpc5200b-sram","mpc5200-sram","sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
...@@ -334,7 +321,7 @@ pci@f0000d00 { ...@@ -334,7 +321,7 @@ pci@f0000d00 {
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
compatible = "mpc5200b-pci","mpc5200-pci"; compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
reg = <f0000d00 100>; reg = <f0000d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
......
arch/powerpc/boot/dts/motionpro.dts
View file @ 24ce6bc4
...@@ -10,12 +10,6 @@ ...@@ -10,12 +10,6 @@
* option) any later version. * option) any later version.
*/ */
/*
* WARNING: Do not depend on this tree layout remaining static just yet.
* The MPC5200 device tree conventions are still in flux
* Keep an eye on the linuxppc-dev mailing list for more details
*/
/ { / {
model = "promess,motionpro"; model = "promess,motionpro";
compatible = "promess,motionpro"; compatible = "promess,motionpro";
...@@ -47,29 +41,26 @@ memory { ...@@ -47,29 +41,26 @@ memory {
soc5200@f0000000 { soc5200@f0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "fsl,mpc5200b"; compatible = "fsl,mpc5200b-immr";
compatible = "fsl,mpc5200b";
revision = ""; // from bootloader
device_type = "soc";
ranges = <0 f0000000 0000c000>; ranges = <0 f0000000 0000c000>;
reg = <f0000000 00000100>; reg = <f0000000 00000100>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200b-cdm","mpc5200-cdm"; compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
mpc5200_pic: pic@500 { mpc5200_pic: interrupt-controller@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
compatible = "mpc5200b-pic","mpc5200-pic"; compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
reg = <500 80>; reg = <500 80>;
}; };
gpt@600 { // General Purpose Timer timer@600 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
...@@ -77,35 +68,35 @@ gpt@600 { // General Purpose Timer ...@@ -77,35 +68,35 @@ gpt@600 { // General Purpose Timer
fsl,has-wdt; fsl,has-wdt;
}; };
gpt@610 { // General Purpose Timer timer@610 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <610 10>; reg = <610 10>;
interrupts = <1 a 0>; interrupts = <1 a 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@620 { // General Purpose Timer timer@620 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <620 10>; reg = <620 10>;
interrupts = <1 b 0>; interrupts = <1 b 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@630 { // General Purpose Timer timer@630 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <630 10>; reg = <630 10>;
interrupts = <1 c 0>; interrupts = <1 c 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@640 { // General Purpose Timer timer@640 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <640 10>; reg = <640 10>;
interrupts = <1 d 0>; interrupts = <1 d 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpt@650 { // General Purpose Timer timer@650 { // General Purpose Timer
compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt"; compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
reg = <650 10>; reg = <650 10>;
interrupts = <1 e 0>; interrupts = <1 e 0>;
...@@ -130,28 +121,28 @@ motionpro-led@670 { // Motion-PRO ready LED ...@@ -130,28 +121,28 @@ motionpro-led@670 { // Motion-PRO ready LED
}; };
rtc@800 { // Real time clock rtc@800 { // Real time clock
compatible = "mpc5200b-rtc","mpc5200-rtc"; compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
reg = <800 100>; reg = <800 100>;
interrupts = <1 5 0 1 6 0>; interrupts = <1 5 0 1 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
mscan@980 { mscan@980 {
compatible = "mpc5200b-mscan","mpc5200-mscan"; compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
interrupts = <2 12 0>; interrupts = <2 12 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
reg = <980 80>; reg = <980 80>;
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200b-gpio","mpc5200-gpio"; compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
gpio-wkup@c00 { gpio@c00 {
compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup"; compatible = "fsl,mpc5200b-gpio-wkup","fsl,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 = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -159,21 +150,21 @@ gpio-wkup@c00 { ...@@ -159,21 +150,21 @@ gpio-wkup@c00 {
spi@f00 { spi@f00 {
compatible = "mpc5200b-spi","mpc5200-spi"; compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
reg = <f00 20>; reg = <f00 20>;
interrupts = <2 d 0 2 e 0>; interrupts = <2 d 0 2 e 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be"; compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
dma-controller@1200 { dma-controller@1200 {
compatible = "mpc5200b-bestcomm","mpc5200-bestcomm"; compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -183,13 +174,13 @@ dma-controller@1200 { ...@@ -183,13 +174,13 @@ dma-controller@1200 {
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200b-xlb","mpc5200-xlb"; compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
...@@ -198,7 +189,7 @@ serial@2000 { // PSC1 ...@@ -198,7 +189,7 @@ serial@2000 { // PSC1
// PSC2 in spi master mode // PSC2 in spi master mode
spi@2200 { // PSC2 spi@2200 { // PSC2
compatible = "mpc5200b-psc-spi","mpc5200-psc-spi"; compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi";
cell-index = <1>; cell-index = <1>;
reg = <2200 100>; reg = <2200 100>;
interrupts = <2 2 0>; interrupts = <2 2 0>;
...@@ -208,7 +199,7 @@ spi@2200 { // PSC2 ...@@ -208,7 +199,7 @@ spi@2200 { // PSC2
// PSC5 in uart mode // PSC5 in uart mode
serial@2800 { // PSC5 serial@2800 { // PSC5
device_type = "serial"; device_type = "serial";
compatible = "mpc5200b-psc-uart","mpc5200-psc-uart"; compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
port-number = <4>; // Logical port assignment port-number = <4>; // Logical port assignment
reg = <2800 100>; reg = <2800 100>;
interrupts = <2 c 0>; interrupts = <2 c 0>;
...@@ -217,22 +208,22 @@ serial@2800 { // PSC5 ...@@ -217,22 +208,22 @@ serial@2800 { // PSC5
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200b-fec","mpc5200-fec"; compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */ local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
ata@3a00 { ata@3a00 {
compatible = "mpc5200b-ata","mpc5200-ata"; compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
i2c@3d40 { i2c@3d40 {
compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -240,13 +231,12 @@ i2c@3d40 { ...@@ -240,13 +231,12 @@ i2c@3d40 {
}; };
sram@8000 { sram@8000 {
compatible = "mpc5200b-sram","mpc5200-sram"; compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
lpb { lpb {
model = "fsl,lpb";
compatible = "fsl,lpb"; compatible = "fsl,lpb";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
...@@ -288,7 +278,7 @@ pci@f0000d00 { ...@@ -288,7 +278,7 @@ pci@f0000d00 {
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
device_type = "pci"; device_type = "pci";
compatible = "mpc5200b-pci","mpc5200-pci"; compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
reg = <f0000d00 100>; reg = <f0000d00 100>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
......
arch/powerpc/boot/dts/tqm5200.dts
View file @ 24ce6bc4
...@@ -10,12 +10,6 @@ ...@@ -10,12 +10,6 @@
* option) any later version. * option) any later version.
*/ */
/*
* WARNING: Do not depend on this tree layout remaining static just yet.
* The MPC5200 device tree conventions are still in flux
* Keep an eye on the linuxppc-dev mailing list for more details
*/
/ { / {
model = "tqc,tqm5200"; model = "tqc,tqm5200";
compatible = "tqc,tqm5200"; compatible = "tqc,tqm5200";
...@@ -47,29 +41,26 @@ memory { ...@@ -47,29 +41,26 @@ memory {
soc5200@f0000000 { soc5200@f0000000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
model = "fsl,mpc5200"; compatible = "fsl,mpc5200-immr";
compatible = "fsl,mpc5200";
revision = ""; // from bootloader
device_type = "soc";
ranges = <0 f0000000 0000c000>; ranges = <0 f0000000 0000c000>;
reg = <f0000000 00000100>; reg = <f0000000 00000100>;
bus-frequency = <0>; // from bootloader bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader system-frequency = <0>; // from bootloader
cdm@200 { cdm@200 {
compatible = "mpc5200-cdm"; compatible = "fsl,mpc5200-cdm";
reg = <200 38>; reg = <200 38>;
}; };
mpc5200_pic: pic@500 { mpc5200_pic: interrupt-controller@500 {
// 5200 interrupts are encoded into two levels; // 5200 interrupts are encoded into two levels;
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
compatible = "mpc5200-pic"; compatible = "fsl,mpc5200-pic";
reg = <500 80>; reg = <500 80>;
}; };
gpt@600 { // General Purpose Timer timer@600 { // General Purpose Timer
compatible = "fsl,mpc5200-gpt"; compatible = "fsl,mpc5200-gpt";
reg = <600 10>; reg = <600 10>;
interrupts = <1 9 0>; interrupts = <1 9 0>;
...@@ -78,21 +69,21 @@ gpt@600 { // General Purpose Timer ...@@ -78,21 +69,21 @@ gpt@600 { // General Purpose Timer
}; };
gpio@b00 { gpio@b00 {
compatible = "mpc5200-gpio"; compatible = "fsl,mpc5200-gpio";
reg = <b00 40>; reg = <b00 40>;
interrupts = <1 7 0>; interrupts = <1 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
usb@1000 { usb@1000 {
compatible = "mpc5200-ohci","ohci-be"; compatible = "fsl,mpc5200-ohci","ohci-be";
reg = <1000 ff>; reg = <1000 ff>;
interrupts = <2 6 0>; interrupts = <2 6 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
dma-controller@1200 { dma-controller@1200 {
compatible = "mpc5200-bestcomm"; compatible = "fsl,mpc5200-bestcomm";
reg = <1200 80>; reg = <1200 80>;
interrupts = <3 0 0 3 1 0 3 2 0 3 3 0 interrupts = <3 0 0 3 1 0 3 2 0 3 3 0
3 4 0 3 5 0 3 6 0 3 7 0 3 4 0 3 5 0 3 6 0 3 7 0
...@@ -102,13 +93,13 @@ dma-controller@1200 { ...@@ -102,13 +93,13 @@ dma-controller@1200 {
}; };
xlb@1f00 { xlb@1f00 {
compatible = "mpc5200-xlb"; compatible = "fsl,mpc5200-xlb";
reg = <1f00 100>; reg = <1f00 100>;
}; };
serial@2000 { // PSC1 serial@2000 { // PSC1
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <0>; // Logical port assignment port-number = <0>; // Logical port assignment
reg = <2000 100>; reg = <2000 100>;
interrupts = <2 1 0>; interrupts = <2 1 0>;
...@@ -117,7 +108,7 @@ serial@2000 { // PSC1 ...@@ -117,7 +108,7 @@ serial@2000 { // PSC1
serial@2200 { // PSC2 serial@2200 { // PSC2
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <1>; // Logical port assignment port-number = <1>; // Logical port assignment
reg = <2200 100>; reg = <2200 100>;
interrupts = <2 2 0>; interrupts = <2 2 0>;
...@@ -126,7 +117,7 @@ serial@2200 { // PSC2 ...@@ -126,7 +117,7 @@ serial@2200 { // PSC2
serial@2400 { // PSC3 serial@2400 { // PSC3
device_type = "serial"; device_type = "serial";
compatible = "mpc5200-psc-uart"; compatible = "fsl,mpc5200-psc-uart";
port-number = <2>; // Logical port assignment port-number = <2>; // Logical port assignment
reg = <2400 100>; reg = <2400 100>;
interrupts = <2 3 0>; interrupts = <2 3 0>;
...@@ -135,22 +126,22 @@ serial@2400 { // PSC3 ...@@ -135,22 +126,22 @@ serial@2400 { // PSC3
ethernet@3000 { ethernet@3000 {
device_type = "network"; device_type = "network";
compatible = "mpc5200-fec"; compatible = "fsl,mpc5200-fec";
reg = <3000 800>; reg = <3000 800>;
local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */ local-mac-address = [ 00 00 00 00 00 00 ];
interrupts = <2 5 0>; interrupts = <2 5 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
ata@3a00 { ata@3a00 {
compatible = "mpc5200-ata"; compatible = "fsl,mpc5200-ata";
reg = <3a00 100>; reg = <3a00 100>;
interrupts = <2 7 0>; interrupts = <2 7 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
}; };
i2c@3d40 { i2c@3d40 {
compatible = "mpc5200-i2c","fsl-i2c"; compatible = "fsl,mpc5200-i2c","fsl-i2c";
reg = <3d40 40>; reg = <3d40 40>;
interrupts = <2 10 0>; interrupts = <2 10 0>;
interrupt-parent = <&mpc5200_pic>; interrupt-parent = <&mpc5200_pic>;
...@@ -158,7 +149,7 @@ i2c@3d40 { ...@@ -158,7 +149,7 @@ i2c@3d40 {
}; };
sram@8000 { sram@8000 {
compatible = "mpc5200-sram"; compatible = "fsl,mpc5200-sram";
reg = <8000 4000>; reg = <8000 4000>;
}; };
}; };
......
arch/powerpc/boot/serial.c
View file @ 24ce6bc4
...@@ -126,7 +126,7 @@ int serial_console_init(void) ...@@ -126,7 +126,7 @@ int serial_console_init(void)
dt_is_compatible(devp, "fsl,cpm2-scc-uart") || dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||
dt_is_compatible(devp, "fsl,cpm2-smc-uart")) dt_is_compatible(devp, "fsl,cpm2-smc-uart"))
rc = cpm_console_init(devp, &serial_cd); rc = cpm_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "mpc5200-psc-uart")) else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
rc = mpc5200_psc_console_init(devp, &serial_cd); rc = mpc5200_psc_console_init(devp, &serial_cd);
else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") || else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") ||
dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a")) dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))
......
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