projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] QE: get rid of most device_types and model
[powerpc.git]
/
arch
/
powerpc
/
boot
/
dts
/
mpc832x_rdb.dts
diff --git
a/arch/powerpc/boot/dts/mpc832x_rdb.dts
b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index
388c8a7
..
4d5cfd3
100644
(file)
--- a/
arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/
arch/powerpc/boot/dts/mpc832x_rdb.dts
@@
-15,6
+15,14
@@
#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>;
@@
-52,7
+60,9
@@
};
i2c@3000 {
};
i2c@3000 {
- device_type = "i2c";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ cell-index = <0>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
compatible = "fsl-i2c";
reg = <3000 100>;
interrupts = <e 8>;
@@
-60,7
+70,8
@@
dfsrr;
};
dfsrr;
};
- serial@4500 {
+ serial0: serial@4500 {
+ cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
reg = <4500 100>;
device_type = "serial";
compatible = "ns16550";
reg = <4500 100>;
@@
-69,7
+80,8
@@
interrupt-parent = <&pic>;
};
interrupt-parent = <&pic>;
};
- serial@4600 {
+ serial1: serial@4600 {
+ cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
reg = <4600 100>;
device_type = "serial";
compatible = "ns16550";
reg = <4600 100>;
@@
-154,17
+166,19
@@
#address-cells = <1>;
#size-cells = <1>;
device_type = "qe";
#address-cells = <1>;
#size-cells = <1>;
device_type = "qe";
-
model = "QE
";
+
compatible = "fsl,qe
";
ranges = <0 e0100000 00100000>;
reg = <e0100000 480>;
brg-frequency = <0>;
bus-frequency = <BCD3D80>;
muram@10000 {
ranges = <0 e0100000 00100000>;
reg = <e0100000 480>;
brg-frequency = <0>;
bus-frequency = <BCD3D80>;
muram@10000 {
-
device_type = "
muram";
+
compatible = "fsl,qe-muram", "fsl,cpm-
muram";
ranges = <0 00010000 00004000>;
data-only@0 {
ranges = <0 00010000 00004000>;
data-only@0 {
+ compatible = "fsl,qe-muram-data",
+ "fsl,cpm-muram-data";
reg = <0 4000>;
};
};
reg = <0 4000>;
};
};
@@
-187,44
+201,34
@@
mode = "cpu";
};
mode = "cpu";
};
- ucc@3000 {
+
enet0:
ucc@3000 {
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
+ cell-index = <2>;
device-id = <2>;
reg = <3000 200>;
interrupts = <21>;
interrupt-parent = <&qeic>;
device-id = <2>;
reg = <3000 200>;
interrupts = <21>;
interrupt-parent = <&qeic>;
- /*
- * mac-address is deprecated and will be removed
- * in 2.6.25. Only recent versions of
- * U-Boot support local-mac-address, however.
- */
- mac-address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ];
- rx-clock
= <20>
;
- tx-clock
= <13>
;
+ rx-clock
-name = "clk16"
;
+ tx-clock
-name = "clk3"
;
phy-handle = <&phy00>;
pio-handle = <&ucc2pio>;
};
phy-handle = <&phy00>;
pio-handle = <&ucc2pio>;
};
- ucc@2200 {
+
enet1:
ucc@2200 {
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
device_type = "network";
compatible = "ucc_geth";
model = "UCC";
+ cell-index = <3>;
device-id = <3>;
reg = <2200 200>;
interrupts = <22>;
interrupt-parent = <&qeic>;
device-id = <3>;
reg = <2200 200>;
interrupts = <22>;
interrupt-parent = <&qeic>;
- /*
- * mac-address is deprecated and will be removed
- * in 2.6.25. Only recent versions of
- * U-Boot support local-mac-address, however.
- */
- mac-address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ];
local-mac-address = [ 00 00 00 00 00 00 ];
- rx-clock
= <19>
;
- tx-clock
= <1a>
;
+ rx-clock
-name = "clk9"
;
+ tx-clock
-name = "clk10"
;
phy-handle = <&phy04>;
pio-handle = <&ucc3pio>;
};
phy-handle = <&phy04>;
pio-handle = <&ucc3pio>;
};
@@
-250,9
+254,9
@@
};
};
};
};
- qeic:
qeic
@80 {
+ qeic:
interrupt-controller
@80 {
interrupt-controller;
interrupt-controller;
-
device_type = "qe
ic";
+
compatible = "fsl,qe-
ic";
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
@@
-262,7
+266,8
@@
};
};
};
};
- pci@e0008500 {
+ pci0: pci@e0008500 {
+ cell-index = <1>;
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x10 AD16 (USB) */
interrupt-map-mask = <f800 0 0 7>;
interrupt-map = <
/* IDSEL 0x10 AD16 (USB) */