From: Mark A. Greer <[EMAIL PROTECTED]>
Add & use labels for dts nodes that are referenced in the prpmc2800.dts
file to improve readability.
Signed-off-by: Mark A. Greer <[EMAIL PROTECTED]>
---
arch/powerpc/boot/dts/prpmc2800.dts | 104 +++++++++++++-------------
1 file changed, 52 insertions(+), 52 deletions(-)
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts
b/arch/powerpc/boot/dts/prpmc2800.dts
index 15247a4..1657ee6 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -94,18 +94,18 @@
#size-cells = <0>;
device_type = "mdio";
compatible = "marvell,mv64x60-mdio";
- [EMAIL PROTECTED] {
+ PHY0: [EMAIL PROTECTED] {
device_type = "ethernet-phy";
compatible = "broadcom,bcm5421";
interrupts = <76>; /* GPP 12 */
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
reg = <1>;
};
- [EMAIL PROTECTED] {
+ PHY1: [EMAIL PROTECTED] {
device_type = "ethernet-phy";
compatible = "broadcom,bcm5421";
interrupts = <76>; /* GPP 12 */
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
reg = <3>;
};
};
@@ -117,8 +117,8 @@
compatible = "marvell,mv64x60-eth";
block-index = <0>;
interrupts = <32>;
- interrupt-parent = <&/mv64x60/pic>;
- phy = <&/mv64x60/mdio/[EMAIL PROTECTED]>;
+ interrupt-parent = <&PIC>;
+ phy = <&PHY0>;
local-mac-address = [ 00 00 00 00 00 00 ];
};
eth1 {
@@ -126,33 +126,33 @@
compatible = "marvell,mv64x60-eth";
block-index = <1>;
interrupts = <33>;
- interrupt-parent = <&/mv64x60/pic>;
- phy = <&/mv64x60/mdio/[EMAIL PROTECTED]>;
+ interrupt-parent = <&PIC>;
+ phy = <&PHY1>;
local-mac-address = [ 00 00 00 00 00 00 ];
};
};
- [EMAIL PROTECTED] {
+ SDMA0: [EMAIL PROTECTED] {
device_type = "dma";
compatible = "marvell,mv64x60-sdma";
reg = <0x4000 0xc18>;
virtual-reg = <0xf1004000>;
interrupt-base = <0>;
interrupts = <36>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
- [EMAIL PROTECTED] {
+ SDMA1: [EMAIL PROTECTED] {
device_type = "dma";
compatible = "marvell,mv64x60-sdma";
reg = <0x6000 0xc18>;
virtual-reg = <0xf1006000>;
interrupt-base = <0>;
interrupts = <38>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
- [EMAIL PROTECTED] {
+ BRG0: [EMAIL PROTECTED] {
compatible = "marvell,mv64x60-brg";
reg = <0xb200 0x8>;
clock-src = <8>;
@@ -161,7 +161,7 @@
bcr = <0>;
};
- [EMAIL PROTECTED] {
+ BRG1: [EMAIL PROTECTED] {
compatible = "marvell,mv64x60-brg";
reg = <0xb208 0x8>;
clock-src = <8>;
@@ -170,15 +170,15 @@
bcr = <0>;
};
- [EMAIL PROTECTED] {
+ CUNIT: [EMAIL PROTECTED] {
reg = <0xf200 0x200>;
};
- [EMAIL PROTECTED] {
+ MPSCROUTING: [EMAIL PROTECTED] {
reg = <0xb400 0xc>;
};
- [EMAIL PROTECTED] {
+ MPSCINTR: [EMAIL PROTECTED] {
reg = <0xb800 0x100>;
virtual-reg = <0xf100b800>;
};
@@ -188,11 +188,11 @@
compatible = "marvell,mpsc";
reg = <0x8000 0x38>;
virtual-reg = <0xf1008000>;
- sdma = <&/mv64x60/[EMAIL PROTECTED]>;
- brg = <&/mv64x60/[EMAIL PROTECTED]>;
- cunit = <&/mv64x60/[EMAIL PROTECTED]>;
- mpscrouting = <&/mv64x60/[EMAIL PROTECTED]>;
- mpscintr = <&/mv64x60/[EMAIL PROTECTED]>;
+ sdma = <&SDMA0>;
+ brg = <&BRG0>;
+ cunit = <&CUNIT>;
+ mpscrouting = <&MPSCROUTING>;
+ mpscintr = <&MPSCINTR>;
block-index = <0>;
max_idle = <40>;
chr_1 = <0>;
@@ -200,7 +200,7 @@
chr_10 = <3>;
mpcr = <0>;
interrupts = <40>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
[EMAIL PROTECTED] {
@@ -208,11 +208,11 @@
compatible = "marvell,mpsc";
reg = <0x9000 0x38>;
virtual-reg = <0xf1009000>;
- sdma = <&/mv64x60/[EMAIL PROTECTED]>;
- brg = <&/mv64x60/[EMAIL PROTECTED]>;
- cunit = <&/mv64x60/[EMAIL PROTECTED]>;
- mpscrouting = <&/mv64x60/[EMAIL PROTECTED]>;
- mpscintr = <&/mv64x60/[EMAIL PROTECTED]>;
+ sdma = <&SDMA1>;
+ brg = <&BRG1>;
+ cunit = <&CUNIT>;
+ mpscrouting = <&MPSCROUTING>;
+ mpscintr = <&MPSCINTR>;
block-index = <1>;
max_idle = <40>;
chr_1 = <0>;
@@ -220,7 +220,7 @@
chr_10 = <3>;
mpcr = <0>;
interrupts = <42>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
[EMAIL PROTECTED] { /* watchdog timer */
@@ -239,10 +239,10 @@
timeout = <1000>; /* 1000 = 1 second */
retries = <1>;
interrupts = <37>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
- pic {
+ PIC: pic {
#interrupt-cells = <1>;
#address-cells = <0>;
compatible = "marvell,mv64x60-pic";
@@ -274,32 +274,32 @@
bus-range = <0x0 0xff>;
clock-frequency = <66000000>;
interrupt-pci-iack = <0x0c34>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map = <
/* IDSEL 0x0a */
- 0x5000 0 0 1 &/mv64x60/pic 80
- 0x5000 0 0 2 &/mv64x60/pic 81
- 0x5000 0 0 3 &/mv64x60/pic 91
- 0x5000 0 0 4 &/mv64x60/pic 93
+ 0x5000 0 0 1 &PIC 80
+ 0x5000 0 0 2 &PIC 81
+ 0x5000 0 0 3 &PIC 91
+ 0x5000 0 0 4 &PIC 93
/* IDSEL 0x0b */
- 0x5800 0 0 1 &/mv64x60/pic 91
- 0x5800 0 0 2 &/mv64x60/pic 93
- 0x5800 0 0 3 &/mv64x60/pic 80
- 0x5800 0 0 4 &/mv64x60/pic 81
+ 0x5800 0 0 1 &PIC 91
+ 0x5800 0 0 2 &PIC 93
+ 0x5800 0 0 3 &PIC 80
+ 0x5800 0 0 4 &PIC 81
/* IDSEL 0x0c */
- 0x6000 0 0 1 &/mv64x60/pic 91
- 0x6000 0 0 2 &/mv64x60/pic 93
- 0x6000 0 0 3 &/mv64x60/pic 80
- 0x6000 0 0 4 &/mv64x60/pic 81
+ 0x6000 0 0 1 &PIC 91
+ 0x6000 0 0 2 &PIC 93
+ 0x6000 0 0 3 &PIC 80
+ 0x6000 0 0 4 &PIC 81
/* IDSEL 0x0d */
- 0x6800 0 0 1 &/mv64x60/pic 93
- 0x6800 0 0 2 &/mv64x60/pic 80
- 0x6800 0 0 3 &/mv64x60/pic 81
- 0x6800 0 0 4 &/mv64x60/pic 91
+ 0x6800 0 0 1 &PIC 93
+ 0x6800 0 0 2 &PIC 80
+ 0x6800 0 0 3 &PIC 81
+ 0x6800 0 0 4 &PIC 91
>;
};
@@ -307,28 +307,28 @@
compatible = "marvell,mv64x60-cpu-error";
reg = <0x0070 0x10 0x0128 0x28>;
interrupts = <3>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
[EMAIL PROTECTED] {
compatible = "marvell,mv64x60-sram-ctrl";
reg = <0x0380 0x80>;
interrupts = <13>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
[EMAIL PROTECTED] {
compatible = "marvell,mv64x60-pci-error";
reg = <0x1d40 0x40 0x0c28 0x4>;
interrupts = <12>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
[EMAIL PROTECTED] {
compatible = "marvell,mv64x60-mem-ctrl";
reg = <0x1400 0x60>;
interrupts = <17>;
- interrupt-parent = <&/mv64x60/pic>;
+ interrupt-parent = <&PIC>;
};
};
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
