projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc7448hpc2.dts
diff --git
a/arch/powerpc/boot/dts/mpc7448hpc2.dts
b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index
705c23c
..
2544f3e
100644
(file)
--- a/
arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/
arch/powerpc/boot/dts/mpc7448hpc2.dts
@@
-18,6
+18,16
@@
#address-cells = <1>;
#size-cells = <1>;
#address-cells = <1>;
#size-cells = <1>;
+ aliases {
+ ethernet0 = &enet0;
+ ethernet1 = &enet1;
+
+ serial0 = &serial0;
+ serial1 = &serial1;
+
+ pci0 = &pci0;
+ };
+
cpus {
#address-cells = <1>;
#size-cells =<0>;
cpus {
#address-cells = <1>;
#size-cells =<0>;
@@
-78,7
+88,7
@@
};
};
- ethernet@6200 {
+ e
net0: e
thernet@6200 {
linux,network-index = <0>;
#size-cells = <0>;
device_type = "network";
linux,network-index = <0>;
#size-cells = <0>;
device_type = "network";
@@
-91,7
+101,7
@@
phy-handle = <&phy8>;
};
phy-handle = <&phy8>;
};
- ethernet@6600 {
+ e
net1: e
thernet@6600 {
linux,network-index = <1>;
#address-cells = <1>;
#size-cells = <0>;
linux,network-index = <1>;
#address-cells = <1>;
#size-cells = <0>;
@@
-105,7
+115,7
@@
phy-handle = <&phy9>;
};
phy-handle = <&phy9>;
};
- serial@7808 {
+ serial
0: serial
@7808 {
device_type = "serial";
compatible = "ns16550";
reg = <0x7808 0x200>;
device_type = "serial";
compatible = "ns16550";
reg = <0x7808 0x200>;
@@
-114,7
+124,7
@@
interrupt-parent = <&mpic>;
};
interrupt-parent = <&mpic>;
};
- serial@7c08 {
+ serial
1: serial
@7c08 {
device_type = "serial";
compatible = "ns16550";
reg = <0x7c08 0x200>;
device_type = "serial";
compatible = "ns16550";
reg = <0x7c08 0x200>;
@@
-131,7
+141,7
@@
compatible = "chrp,open-pic";
device_type = "open-pic";
};
compatible = "chrp,open-pic";
device_type = "open-pic";
};
- pci@1000 {
+ pci
0: pci
@1000 {
compatible = "tsi108-pci";
device_type = "pci";
#interrupt-cells = <1>;
compatible = "tsi108-pci";
device_type = "pci";
#interrupt-cells = <1>;
@@
-184,8
+194,4
@@
};
};
};
};
};
};
- chosen {
- linux,stdout-path = "/tsi108@c0000000/serial@7808";
- };
-
};
};