提交 ea082fa9 编写于 作者: K Kumar Gala

[POWERPC] FSL: Added aliases node to device trees

Added aliases nodes for kurobox, 83xx, 85xx, and 86xx platforms.
This included added labels and cell-index properties for serial and
pci nodes.
Signed-off-by: NKumar Gala <galak@kernel.crashing.org>
上级 e77b28eb
...@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ?? ...@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ?? ...@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
}; };
}; };
serial@80004500 { serial0: serial@80004500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004500 8>; reg = <80004500 8>;
...@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ?? ...@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@80004600 { serial1: serial@80004600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004600 8>; reg = <80004600 8>;
...@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ?? ...@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
reg = <80040000 40000>; reg = <80040000 40000>;
}; };
pci@fec00000 { pci0: pci@fec00000 {
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
...@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ?? ...@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ?? ...@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
}; };
}; };
serial@80004500 { serial0: serial@80004500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004500 8>; reg = <80004500 8>;
...@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ?? ...@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@80004600 { serial1: serial@80004600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <80004600 8>; reg = <80004600 8>;
...@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ?? ...@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
reg = <80040000 40000>; reg = <80040000 40000>;
}; };
pci@fec00000 { pci0: pci@fec00000 {
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -137,7 +145,8 @@ ...@@ -137,7 +145,8 @@
phy-handle = < &phy4 >; phy-handle = < &phy4 >;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -146,7 +155,8 @@ ...@@ -146,7 +155,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -184,7 +194,8 @@ ...@@ -184,7 +194,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -72,7 +80,8 @@ ...@@ -72,7 +80,8 @@
}; };
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -81,7 +90,8 @@ ...@@ -81,7 +90,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -273,7 +283,8 @@ ...@@ -273,7 +283,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x11 AD17 */ /* IDSEL 0x11 AD17 */
......
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -62,7 +70,8 @@ ...@@ -62,7 +70,8 @@
dfsrr; dfsrr;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -71,7 +80,8 @@ ...@@ -71,7 +80,8 @@
interrupt-parent = <&pic>; interrupt-parent = <&pic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -254,7 +264,8 @@ ...@@ -254,7 +264,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x10 AD16 (USB) */ /* IDSEL 0x10 AD16 (USB) */
......
...@@ -14,6 +14,15 @@ ...@@ -14,6 +14,15 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -154,7 +163,8 @@ ...@@ -154,7 +163,8 @@
linux,network-index = <1>; linux,network-index = <1>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -163,7 +173,8 @@ ...@@ -163,7 +173,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -194,7 +205,8 @@ ...@@ -194,7 +205,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x10 - SATA */ /* IDSEL 0x10 - SATA */
...@@ -215,7 +227,8 @@ ...@@ -215,7 +227,8 @@
device_type = "pci"; device_type = "pci";
}; };
pci@e0008600 { pci1: pci@e0008600 {
cell-index = <2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x0E - MiniPCI Slot */ /* IDSEL 0x0E - MiniPCI Slot */
......
...@@ -14,6 +14,13 @@ ...@@ -14,6 +14,13 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -121,7 +128,8 @@ ...@@ -121,7 +128,8 @@
linux,network-index = <0>; linux,network-index = <0>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -130,7 +138,8 @@ ...@@ -130,7 +138,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -161,7 +170,8 @@ ...@@ -161,7 +170,8 @@
}; };
}; };
pci@e0008600 { pci0: pci@e0008600 {
cell-index = <2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x0F - PCI Slot */ /* IDSEL 0x0F - PCI Slot */
......
...@@ -15,6 +15,15 @@ ...@@ -15,6 +15,15 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -164,7 +173,8 @@ ...@@ -164,7 +173,8 @@
linux,network-index = <1>; linux,network-index = <1>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -173,7 +183,8 @@ ...@@ -173,7 +183,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -213,7 +224,8 @@ ...@@ -213,7 +224,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
...@@ -273,7 +285,8 @@ ...@@ -273,7 +285,8 @@
device_type = "pci"; device_type = "pci";
}; };
pci@e0008600 { pci1: pci@e0008600 {
cell-index = <2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -88,7 +96,8 @@ ...@@ -88,7 +96,8 @@
dfsrr; dfsrr;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -97,7 +106,8 @@ ...@@ -97,7 +106,8 @@
interrupt-parent = < &ipic >; interrupt-parent = < &ipic >;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -306,7 +316,8 @@ ...@@ -306,7 +316,8 @@
}; };
}; };
pci@e0008500 { pci0: pci@e0008500 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -16,6 +16,15 @@ ...@@ -16,6 +16,15 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
ethernet2 = &enet2;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -135,7 +144,8 @@ ...@@ -135,7 +144,8 @@
phy-handle = <&phy3>; phy-handle = <&phy3>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
...@@ -144,7 +154,8 @@ ...@@ -144,7 +154,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
...@@ -164,7 +175,8 @@ ...@@ -164,7 +175,8 @@
}; };
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -16,6 +16,15 @@ ...@@ -16,6 +16,15 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -117,7 +126,8 @@ ...@@ -117,7 +126,8 @@
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
...@@ -126,7 +136,8 @@ ...@@ -126,7 +136,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
...@@ -183,7 +194,8 @@ ...@@ -183,7 +194,8 @@
}; };
}; };
pci1: pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
interrupt-map-mask = <1f800 0 0 7>; interrupt-map-mask = <1f800 0 0 7>;
interrupt-map = < interrupt-map = <
...@@ -250,11 +262,12 @@ ...@@ -250,11 +262,12 @@
#interrupt-cells = <2>; #interrupt-cells = <2>;
compatible = "chrp,iic"; compatible = "chrp,iic";
interrupts = <1>; interrupts = <1>;
interrupt-parent = <&pci1>; interrupt-parent = <&pci0>;
}; };
}; };
pci@e0009000 { pci1: pci@e0009000 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -15,6 +15,17 @@ ...@@ -15,6 +15,17 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
pci2 = &pci2;
pci3 = &pci3;
};
cpus { cpus {
#cpus = <1>; #cpus = <1>;
#address-cells = <1>; #address-cells = <1>;
...@@ -131,7 +142,8 @@ ...@@ -131,7 +142,8 @@
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -140,7 +152,8 @@ ...@@ -140,7 +152,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -167,7 +180,8 @@ ...@@ -167,7 +180,8 @@
}; };
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
compatible = "fsl,mpc8540-pci"; compatible = "fsl,mpc8540-pci";
device_type = "pci"; device_type = "pci";
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
...@@ -198,7 +212,8 @@ ...@@ -198,7 +212,8 @@
reg = <e0008000 1000>; reg = <e0008000 1000>;
}; };
pcie@e0009000 { pci1: pcie@e0009000 {
cell-index = <1>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -234,7 +249,8 @@ ...@@ -234,7 +249,8 @@
}; };
}; };
pcie@e000a000 { pci2: pcie@e000a000 {
cell-index = <2>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -270,7 +286,8 @@ ...@@ -270,7 +286,8 @@
}; };
}; };
pcie@e000b000 { pci3: pcie@e000b000 {
cell-index = <3>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -380,6 +397,5 @@ ...@@ -380,6 +397,5 @@
}; };
}; };
}; };
}; };
}; };
...@@ -16,6 +16,20 @@ ...@@ -16,6 +16,20 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
/*
ethernet2 = &enet2;
ethernet3 = &enet3;
*/
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
pci2 = &pci2;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -166,7 +180,8 @@ ...@@ -166,7 +180,8 @@
}; };
*/ */
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
...@@ -175,7 +190,8 @@ ...@@ -175,7 +190,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
...@@ -202,7 +218,8 @@ ...@@ -202,7 +218,8 @@
}; };
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x4 (PCIX Slot 2) */ /* IDSEL 0x4 (PCIX Slot 2) */
...@@ -351,7 +368,8 @@ ...@@ -351,7 +368,8 @@
}; };
}; };
pci@e0009000 { pci1: pci@e0009000 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
...@@ -375,7 +393,8 @@ ...@@ -375,7 +393,8 @@
device_type = "pci"; device_type = "pci";
}; };
pcie@e000a000 { pci2: pcie@e000a000 {
cell-index = <2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -16,6 +16,15 @@ ...@@ -16,6 +16,15 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -117,7 +126,8 @@ ...@@ -117,7 +126,8 @@
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; // reg base, size reg = <4500 100>; // reg base, size
...@@ -126,7 +136,8 @@ ...@@ -126,7 +136,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; // reg base, size reg = <4600 100>; // reg base, size
...@@ -183,7 +194,8 @@ ...@@ -183,7 +194,8 @@
}; };
}; };
pci1: pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
interrupt-map-mask = <1f800 0 0 7>; interrupt-map-mask = <1f800 0 0 7>;
interrupt-map = < interrupt-map = <
...@@ -250,11 +262,12 @@ ...@@ -250,11 +262,12 @@
#interrupt-cells = <2>; #interrupt-cells = <2>;
compatible = "chrp,iic"; compatible = "chrp,iic";
interrupts = <1>; interrupts = <1>;
interrupt-parent = <&pci1>; interrupt-parent = <&pci0>;
}; };
}; };
pci@e0009000 { pci1: pci@e0009000 {
cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -16,6 +16,16 @@ ...@@ -16,6 +16,16 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
ethernet2 = &enet2;
ethernet3 = &enet3;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -162,7 +172,7 @@ ...@@ -162,7 +172,7 @@
compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic"; compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
}; };
serial@91a00 { serial0: serial@91a00 {
device_type = "serial"; device_type = "serial";
compatible = "fsl,mpc8560-scc-uart", compatible = "fsl,mpc8560-scc-uart",
"fsl,cpm2-scc-uart"; "fsl,cpm2-scc-uart";
...@@ -174,7 +184,7 @@ ...@@ -174,7 +184,7 @@
interrupt-parent = <&cpmpic>; interrupt-parent = <&cpmpic>;
}; };
serial@91a20 { serial1: serial@91a20 {
device_type = "serial"; device_type = "serial";
compatible = "fsl,mpc8560-scc-uart", compatible = "fsl,mpc8560-scc-uart",
"fsl,cpm2-scc-uart"; "fsl,cpm2-scc-uart";
...@@ -212,7 +222,8 @@ ...@@ -212,7 +222,8 @@
}; };
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
#address-cells = <3>; #address-cells = <3>;
......
...@@ -20,6 +20,17 @@ ...@@ -20,6 +20,17 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
ethernet2 = &enet2;
ethernet3 = &enet3;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -154,7 +165,8 @@ ...@@ -154,7 +165,8 @@
phy-handle = <&phy3>; phy-handle = <&phy3>;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -169,7 +181,8 @@ ...@@ -169,7 +181,8 @@
fsl,has-rstcr; fsl,has-rstcr;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -385,7 +398,8 @@ ...@@ -385,7 +398,8 @@
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
/* IDSEL 0x12 AD18 */ /* IDSEL 0x12 AD18 */
...@@ -415,7 +429,8 @@ ...@@ -415,7 +429,8 @@
}; };
/* PCI Express */ /* PCI Express */
pcie@e000a000 { pci1: pcie@e000a000 {
cell-index = <2>;
interrupt-map-mask = <f800 0 0 7>; interrupt-map-mask = <f800 0 0 7>;
interrupt-map = < interrupt-map = <
......
...@@ -15,6 +15,18 @@ ...@@ -15,6 +15,18 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
ethernet0 = &enet0;
ethernet1 = &enet1;
ethernet2 = &enet2;
ethernet3 = &enet3;
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
pci2 = &pci2;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -170,7 +182,8 @@ ...@@ -170,7 +182,8 @@
phy-connection-type = "rgmii-id"; phy-connection-type = "rgmii-id";
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -179,7 +192,8 @@ ...@@ -179,7 +192,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -206,7 +220,8 @@ ...@@ -206,7 +220,8 @@
}; };
}; };
pcie@ffe08000 { pci0: pcie@ffe08000 {
cell-index = <0>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -415,7 +430,8 @@ ...@@ -415,7 +430,8 @@
}; };
pcie@ffe09000 { pci1: pcie@ffe09000 {
cell-index = <1>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -451,7 +467,8 @@ ...@@ -451,7 +467,8 @@
}; };
}; };
pcie@ffe0a000 { pci2: pcie@ffe0a000 {
cell-index = <2>;
compatible = "fsl,mpc8548-pcie"; compatible = "fsl,mpc8548-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
...@@ -15,6 +15,13 @@ ...@@ -15,6 +15,13 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
aliases {
serial0 = &serial0;
serial1 = &serial1;
pci0 = &pci0;
pci1 = &pci1;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -68,7 +75,8 @@ ...@@ -68,7 +75,8 @@
dfsrr; dfsrr;
}; };
serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -77,7 +85,8 @@ ...@@ -77,7 +85,8 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -86,7 +95,6 @@ ...@@ -86,7 +95,6 @@
interrupt-parent = <&mpic>; interrupt-parent = <&mpic>;
}; };
mpic: interrupt-controller@40000 { mpic: interrupt-controller@40000 {
clock-frequency = <0>; clock-frequency = <0>;
interrupt-controller; interrupt-controller;
...@@ -105,7 +113,8 @@ ...@@ -105,7 +113,8 @@
}; };
}; };
pci@e0008000 { pci0: pci@e0008000 {
cell-index = <0>;
compatible = "fsl,mpc8610-pci"; compatible = "fsl,mpc8610-pci";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -134,7 +143,8 @@ ...@@ -134,7 +143,8 @@
>; >;
}; };
pcie@e000a000 { pci1: pcie@e000a000 {
cell-index = <1>;
compatible = "fsl,mpc8641-pcie"; compatible = "fsl,mpc8641-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
...@@ -175,6 +175,7 @@ ...@@ -175,6 +175,7 @@
}; };
serial0: serial@4500 { serial0: serial@4500 {
cell-index = <0>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4500 100>; reg = <4500 100>;
...@@ -184,6 +185,7 @@ ...@@ -184,6 +185,7 @@
}; };
serial1: serial@4600 { serial1: serial@4600 {
cell-index = <1>;
device_type = "serial"; device_type = "serial";
compatible = "ns16550"; compatible = "ns16550";
reg = <4600 100>; reg = <4600 100>;
...@@ -211,6 +213,7 @@ ...@@ -211,6 +213,7 @@
}; };
pci0: pcie@f8008000 { pci0: pcie@f8008000 {
cell-index = <0>;
compatible = "fsl,mpc8641-pcie"; compatible = "fsl,mpc8641-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
...@@ -419,6 +422,7 @@ ...@@ -419,6 +422,7 @@
}; };
pci1: pcie@f8009000 { pci1: pcie@f8009000 {
cell-index = <1>;
compatible = "fsl,mpc8641-pcie"; compatible = "fsl,mpc8641-pcie";
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册