* [PATCH] [POWERPC] DTS cleanup
@ 2007-09-12 16:54 Kumar Gala
2007-09-12 22:10 ` Segher Boessenkool
0 siblings, 1 reply; 8+ messages in thread
From: Kumar Gala @ 2007-09-12 16:54 UTC (permalink / raw)
To: linuxppc-dev
Removed the following cruft from .dts files:
* 32-bit in cpu node -- doesn't exist in any spec and not used by kernel
* built-in for non-standard buses (ISA, PCI)
* Removed #interrupt-cells in places they don't need to be set
* Fixed ranges on lite5200*
---
Exists in my for-2.6.24 branch
arch/powerpc/boot/dts/holly.dts | 1 -
arch/powerpc/boot/dts/kuroboxHD.dts | 2 --
arch/powerpc/boot/dts/kuroboxHG.dts | 2 --
arch/powerpc/boot/dts/lite5200.dts | 7 ++-----
arch/powerpc/boot/dts/lite5200b.dts | 7 ++-----
arch/powerpc/boot/dts/mpc7448hpc2.dts | 4 ----
arch/powerpc/boot/dts/mpc8272ads.dts | 5 -----
arch/powerpc/boot/dts/mpc8313erdb.dts | 3 ---
arch/powerpc/boot/dts/mpc832x_mds.dts | 4 ----
arch/powerpc/boot/dts/mpc832x_rdb.dts | 4 ----
arch/powerpc/boot/dts/mpc8349emitx.dts | 3 ---
arch/powerpc/boot/dts/mpc8349emitxgp.dts | 3 ---
arch/powerpc/boot/dts/mpc834x_mds.dts | 3 ---
arch/powerpc/boot/dts/mpc836x_mds.dts | 4 ----
arch/powerpc/boot/dts/mpc8540ads.dts | 3 ---
arch/powerpc/boot/dts/mpc8541cds.dts | 3 ---
arch/powerpc/boot/dts/mpc8544ds.dts | 3 ---
arch/powerpc/boot/dts/mpc8548cds.dts | 3 ---
arch/powerpc/boot/dts/mpc8555cds.dts | 3 ---
arch/powerpc/boot/dts/mpc8560ads.dts | 5 -----
arch/powerpc/boot/dts/mpc8568mds.dts | 4 ----
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 4 ----
arch/powerpc/boot/dts/mpc866ads.dts | 5 -----
arch/powerpc/boot/dts/mpc885ads.dts | 5 -----
arch/powerpc/boot/dts/prpmc2800.dts | 1 -
25 files changed, 4 insertions(+), 87 deletions(-)
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index 80a4fab..2ecad82 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -35,7 +35,6 @@
timebase-frequency = <2faf080>;
clock-frequency = <23c34600>;
bus-frequency = <bebc200>;
- 32-bit;
};
};
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index 63ba351..7413839 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -50,7 +50,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
@@ -104,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
compatible = "chrp,open-pic";
interrupt-controller;
reg = <80040000 40000>;
- built-in;
};
pci@fec00000 {
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index e8ce0e3..3d7ceb8 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -50,7 +50,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
soc10x { /* AFAICT need to make soc for 8245's uarts to be defined */
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
compatible = "mpc10x";
store-gathering = <0>; /* 0 == off, !0 == on */
@@ -104,7 +103,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
compatible = "chrp,open-pic";
interrupt-controller;
reg = <80040000 40000>;
- built-in;
};
pci@fec00000 {
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index d29308f..4783503 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -37,7 +37,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -50,10 +49,9 @@
model = "fsl,mpc5200";
compatible = "mpc5200";
revision = ""; // from bootloader
- #interrupt-cells = <3>;
device_type = "soc";
- ranges = <0 f0000000 f0010000>;
- reg = <f0000000 00010000>;
+ ranges = <0 f0000000 0000c000>;
+ reg = <f0000000 0000c000>;
bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader
@@ -69,7 +67,6 @@
device_type = "interrupt-controller";
compatible = "mpc5200-pic";
reg = <500 80>;
- built-in;
};
gpt@600 { // General Purpose Timer
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index f242531..1db7257 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -37,7 +37,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -50,10 +49,9 @@
model = "fsl,mpc5200b";
compatible = "mpc5200";
revision = ""; // from bootloader
- #interrupt-cells = <3>;
device_type = "soc";
- ranges = <0 f0000000 f0010000>;
- reg = <f0000000 00010000>;
+ ranges = <0 f0000000 0000c000>;
+ reg = <f0000000 0000c000>;
bus-frequency = <0>; // from bootloader
system-frequency = <0>; // from bootloader
@@ -69,7 +67,6 @@
device_type = "interrupt-controller";
compatible = "mpc5200b-pic\0mpc5200-pic";
reg = <500 80>;
- built-in;
};
gpt@600 { // General Purpose Timer
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index c60ad34..70e8a2e 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -31,7 +31,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
clock-frequency = <0>; // From U-Boot
bus-frequency = <0>; // From U-Boot
- 32-bit;
};
};
@@ -44,7 +43,6 @@
tsi109@c0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "tsi-bridge";
compatible = "tsi109-bridge", "tsi108-bridge";
ranges = <00000000 c0000000 00010000>;
@@ -129,7 +127,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <7400 400>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
@@ -181,7 +178,6 @@
device_type = "pic-router";
#address-cells = <0>;
#interrupt-cells = <2>;
- built-in;
big-endian;
interrupts = <17 2>;
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 4d09dca..4313054 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -29,7 +29,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
};
};
@@ -38,7 +37,6 @@
#interrupt-cells = <2>;
interrupt-controller;
reg = <f8200000 f8200004>;
- built-in;
device_type = "pci-pic";
};
@@ -56,7 +54,6 @@
soc8272@f0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <00000000 f0000000 00053000>;
reg = <f0000000 10000>;
@@ -118,7 +115,6 @@
cpm@f0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "cpm";
model = "CPM2";
ranges = <00000000 00000000 20000>;
@@ -161,7 +157,6 @@
#interrupt-cells = <2>;
interrupt-controller;
reg = <10c00 80>;
- built-in;
device_type = "cpm-pic";
compatible = "CPM2";
};
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index c5adbe4..abd73a2 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -29,7 +29,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -41,7 +40,6 @@
soc8313@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -207,7 +205,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
};
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index f158ed7..e88167d 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -29,7 +29,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
};
};
@@ -46,7 +45,6 @@
soc8323@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -163,7 +161,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
@@ -333,7 +330,6 @@
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
- built-in;
big-endian;
interrupts = <20 8 21 8>; //high:32 low:33
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 7c4beff..01393e6 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -29,7 +29,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
};
};
@@ -41,7 +40,6 @@
soc8323@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -132,7 +130,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
@@ -292,7 +289,6 @@
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
- built-in;
big-endian;
interrupts = <20 8 21 8>; //high:32 low:33
interrupt-parent = <&pic>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 502f47c..f98c785 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -28,7 +28,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -40,7 +39,6 @@
soc8349@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -244,7 +242,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
};
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 0b83871..7c89ff7 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -28,7 +28,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -40,7 +39,6 @@
soc8349@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -176,7 +174,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
};
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 4810997..f4ba857 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -29,7 +29,6 @@
timebase-frequency = <0>; // from bootloader
bus-frequency = <0>; // from bootloader
clock-frequency = <0>; // from bootloader
- 32-bit;
};
};
@@ -46,7 +45,6 @@
soc8349@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -332,7 +330,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
};
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index e3f7c12..f14e88e 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -34,7 +34,6 @@
timebase-frequency = <3EF1480>;
bus-frequency = <FBC5200>;
clock-frequency = <1F78A400>;
- 32-bit;
};
};
@@ -51,7 +50,6 @@
soc8360@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -178,7 +176,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <700 100>;
- built-in;
device_type = "ipic";
};
@@ -364,7 +361,6 @@
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
- built-in;
big-endian;
interrupts = <20 8 21 8>; //high:32 low:33
interrupt-parent = < &ipic >;
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index fc8dff9..e038c04 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8540@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00100000>; // CCSRBAR 1M
@@ -268,7 +266,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index fb0b647..82f4b06 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8541@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00100000>; // CCSRBAR 1M
@@ -240,7 +238,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 3e79bf0..a074700 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8544@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
@@ -350,7 +348,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index d215d21..b88e806 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8548@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <00001000 e0001000 000ff000
80000000 80000000 10000000
@@ -394,7 +392,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index c3c8882..8622174 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // 166 MHz
clock-frequency = <0>; // 825 MHz, from uboot
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8555@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00100000>; // CCSRBAR 1M
@@ -240,7 +238,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 16dbe84..cf87c30 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -30,7 +30,6 @@
timebase-frequency = <04ead9a0>;
bus-frequency = <13ab6680>;
clock-frequency = <312c8040>;
- 32-bit;
};
};
@@ -42,7 +41,6 @@
soc8560@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00000200>;
@@ -227,14 +225,12 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
device_type = "open-pic";
};
cpm@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "cpm";
model = "CPM2";
ranges = <0 0 c0000>;
@@ -249,7 +245,6 @@
interrupts = <2e 2>;
interrupt-parent = <&mpic>;
reg = <90c00 80>;
- built-in;
device_type = "cpm-pic";
};
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index b1dcfbe..c472a4b 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -34,7 +34,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
};
};
@@ -51,7 +50,6 @@
soc8568@e0000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 e0000000 00100000>;
reg = <e0000000 00100000>;
@@ -258,7 +256,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
@@ -449,7 +446,6 @@
#address-cells = <0>;
#interrupt-cells = <1>;
reg = <80 80>;
- built-in;
big-endian;
interrupts = <2e 2 2e 2>; //high:30 low:30
interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index b0166e5..a73b279 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot
- 32-bit;
};
PowerPC,8641@1 {
device_type = "cpu";
@@ -42,7 +41,6 @@
timebase-frequency = <0>; // 33 MHz, from uboot
bus-frequency = <0>; // From uboot
clock-frequency = <0>; // From uboot
- 32-bit;
};
};
@@ -54,7 +52,6 @@
soc8641@f8000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <00001000 f8001000 000ff000
80000000 80000000 20000000
@@ -366,7 +363,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <40000 40000>;
- built-in;
compatible = "chrp,open-pic";
device_type = "open-pic";
big-endian;
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index e5e7726..90f2293 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
interrupts = <f 2>; // decrementer interrupt
interrupt-parent = <&Mpc8xx_pic>;
};
@@ -44,7 +43,6 @@
soc866@ff000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 ff000000 00100000>;
reg = <ff000000 00000200>;
@@ -78,7 +76,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <0 24>;
- built-in;
device_type = "mpc8xx-pic";
compatible = "CPM";
};
@@ -86,7 +83,6 @@
cpm@ff000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "cpm";
model = "CPM";
ranges = <0 0 4000>;
@@ -103,7 +99,6 @@
interrupts = <5 2 0 2>;
interrupt-parent = <&Mpc8xx_pic>;
reg = <930 20>;
- built-in;
device_type = "cpm-pic";
compatible = "CPM";
};
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index dc7ab9c..e9aa9d0 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -30,7 +30,6 @@
timebase-frequency = <0>;
bus-frequency = <0>;
clock-frequency = <0>;
- 32-bit;
interrupts = <f 2>; // decrementer interrupt
interrupt-parent = <&Mpc8xx_pic>;
};
@@ -44,7 +43,6 @@
soc885@ff000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "soc";
ranges = <0 ff000000 00100000>;
reg = <ff000000 00000200>;
@@ -98,7 +96,6 @@
#address-cells = <0>;
#interrupt-cells = <2>;
reg = <0 24>;
- built-in;
device_type = "mpc8xx-pic";
compatible = "CPM";
};
@@ -117,7 +114,6 @@
cpm@ff000000 {
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <2>;
device_type = "cpm";
model = "CPM";
ranges = <0 0 4000>;
@@ -134,7 +130,6 @@
interrupts = <5 2 0 2>;
interrupt-parent = <&Mpc8xx_pic>;
reg = <930 20>;
- built-in;
device_type = "cpm-pic";
compatible = "CPM";
};
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index 5300b50..55684b6 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -47,7 +47,6 @@
mv64x60@f1000000 { /* Marvell Discovery */
#address-cells = <1>;
#size-cells = <1>;
- #interrupt-cells = <1>;
model = "mv64360"; /* Default */
compatible = "marvell,mv64x60";
clock-frequency = <7f28155>; /* 133.333333 MHz */
--
1.5.2.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-12 16:54 [PATCH] [POWERPC] DTS cleanup Kumar Gala
@ 2007-09-12 22:10 ` Segher Boessenkool
2007-09-13 3:08 ` Kumar Gala
0 siblings, 1 reply; 8+ messages in thread
From: Segher Boessenkool @ 2007-09-12 22:10 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
> * 32-bit in cpu node -- doesn't exist in any spec and not used by
> kernel
Yeah.
> * built-in for non-standard buses (ISA, PCI)
"built-in" is some weird CHRP property, so yes we don't need it
or want it.
> * Removed #interrupt-cells in places they don't need to be set
Great :-)
> * Fixed ranges on lite5200*
This has a problem still:
> model = "fsl,mpc5200";
> compatible = "mpc5200";
> revision = ""; // from bootloader
> - #interrupt-cells = <3>;
> device_type = "soc";
> - ranges = <0 f0000000 f0010000>;
> - reg = <f0000000 00010000>;
> + ranges = <0 f0000000 0000c000>;
> + reg = <f0000000 0000c000>;
That makes "reg" and "ranges" identify an identical address range,
which means no subnode can claim any address in that range, so the
"ranges" property should go. Alternatively, the "reg" might be
claiming too big a space.
Which is it?
Segher
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-12 22:10 ` Segher Boessenkool
@ 2007-09-13 3:08 ` Kumar Gala
2007-09-13 16:56 ` Segher Boessenkool
0 siblings, 1 reply; 8+ messages in thread
From: Kumar Gala @ 2007-09-13 3:08 UTC (permalink / raw)
To: Segher Boessenkool; +Cc: linuxppc-dev
On Sep 12, 2007, at 5:10 PM, Segher Boessenkool wrote:
>> * 32-bit in cpu node -- doesn't exist in any spec and not used by
>> kernel
>
> Yeah.
>
>> * built-in for non-standard buses (ISA, PCI)
>
> "built-in" is some weird CHRP property, so yes we don't need it
> or want it.
Do you suggest we get ride of it from ISA nodes as well?
>
>> * Removed #interrupt-cells in places they don't need to be set
>
> Great :-)
>
>> * Fixed ranges on lite5200*
>
> This has a problem still:
>
>> model = "fsl,mpc5200";
>> compatible = "mpc5200";
>> revision = ""; // from bootloader
>> - #interrupt-cells = <3>;
>> device_type = "soc";
>> - ranges = <0 f0000000 f0010000>;
>> - reg = <f0000000 00010000>;
>> + ranges = <0 f0000000 0000c000>;
>> + reg = <f0000000 0000c000>;
>
> That makes "reg" and "ranges" identify an identical address range,
> which means no subnode can claim any address in that range, so the
> "ranges" property should go. Alternatively, the "reg" might be
> claiming too big a space.
>
> Which is it?
Yeah, I think it should be 0x100 for the 'soc' regs on 52xx so I'll
set regs to that.
- k
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-13 3:08 ` Kumar Gala
@ 2007-09-13 16:56 ` Segher Boessenkool
2007-09-13 21:04 ` Kumar Gala
0 siblings, 1 reply; 8+ messages in thread
From: Segher Boessenkool @ 2007-09-13 16:56 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
>>> * built-in for non-standard buses (ISA, PCI)
>>
>> "built-in" is some weird CHRP property, so yes we don't need it
>> or want it.
>
> Do you suggest we get ride of it from ISA nodes as well?
Yes. You aren't CHRP so you don't have to follow the CHRP binding.
Of course it is good to copy from that binding where it makes sense,
but how is "built-in" useful to you?
>>> * Fixed ranges on lite5200*
>>
>> This has a problem still:
>>
>>> model = "fsl,mpc5200";
>>> compatible = "mpc5200";
>>> revision = ""; // from bootloader
>>> - #interrupt-cells = <3>;
>>> device_type = "soc";
>>> - ranges = <0 f0000000 f0010000>;
>>> - reg = <f0000000 00010000>;
>>> + ranges = <0 f0000000 0000c000>;
>>> + reg = <f0000000 0000c000>;
>>
>> That makes "reg" and "ranges" identify an identical address range,
>> which means no subnode can claim any address in that range, so the
>> "ranges" property should go. Alternatively, the "reg" might be
>> claiming too big a space.
>>
>> Which is it?
>
> Yeah, I think it should be 0x100 for the 'soc' regs on 52xx so I'll
> set regs to that.
Okido.
Did I say "nice cleanups, thank you!" already? :-)
Segher
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-13 16:56 ` Segher Boessenkool
@ 2007-09-13 21:04 ` Kumar Gala
2007-09-14 16:28 ` Jon Loeliger
0 siblings, 1 reply; 8+ messages in thread
From: Kumar Gala @ 2007-09-13 21:04 UTC (permalink / raw)
To: Segher Boessenkool; +Cc: linuxppc-dev
On Sep 13, 2007, at 11:56 AM, Segher Boessenkool wrote:
>>>> * built-in for non-standard buses (ISA, PCI)
>>>
>>> "built-in" is some weird CHRP property, so yes we don't need it
>>> or want it.
>>
>> Do you suggest we get ride of it from ISA nodes as well?
>
> Yes. You aren't CHRP so you don't have to follow the CHRP binding.
> Of course it is good to copy from that binding where it makes sense,
> but how is "built-in" useful to you?
>
>>>> * Fixed ranges on lite5200*
>>>
>>> This has a problem still:
>>>
>>>> model = "fsl,mpc5200";
>>>> compatible = "mpc5200";
>>>> revision = ""; // from bootloader
>>>> - #interrupt-cells = <3>;
>>>> device_type = "soc";
>>>> - ranges = <0 f0000000 f0010000>;
>>>> - reg = <f0000000 00010000>;
>>>> + ranges = <0 f0000000 0000c000>;
>>>> + reg = <f0000000 0000c000>;
>>>
>>> That makes "reg" and "ranges" identify an identical address range,
>>> which means no subnode can claim any address in that range, so the
>>> "ranges" property should go. Alternatively, the "reg" might be
>>> claiming too big a space.
>>>
>>> Which is it?
>>
>> Yeah, I think it should be 0x100 for the 'soc' regs on 52xx so
>> I'll set regs to that.
>
> Okido.
>
> Did I say "nice cleanups, thank you!" already? :-)
You did, and let me tell you I've had enough of cleaning up the .dts
for a while :)
Someone really needs to add some macro/preprocessor magic into DTC so
this is made a lot simpler.
- k
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-13 21:04 ` Kumar Gala
@ 2007-09-14 16:28 ` Jon Loeliger
2007-09-14 18:11 ` Kumar Gala
0 siblings, 1 reply; 8+ messages in thread
From: Jon Loeliger @ 2007-09-14 16:28 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
Kumar Gala wrote:
> Someone really needs to add some macro/preprocessor magic into DTC so
> this is made a lot simpler.
>
> - k
Kumar,
I am seriously contemplating this problem.
The trick is, I need to quit with the whole
Power Point Programmer job title for a bit...
jdl
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-14 16:28 ` Jon Loeliger
@ 2007-09-14 18:11 ` Kumar Gala
2007-09-17 3:24 ` David Gibson
0 siblings, 1 reply; 8+ messages in thread
From: Kumar Gala @ 2007-09-14 18:11 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev
On Sep 14, 2007, at 11:28 AM, Jon Loeliger wrote:
> Kumar Gala wrote:
>
>> Someone really needs to add some macro/preprocessor magic into DTC
>> so this is made a lot simpler.
>> - k
>
> Kumar,
>
> I am seriously contemplating this problem.
> The trick is, I need to quit with the whole
> Power Point Programmer job title for a bit...
I'm all for both of these things. You working on getting DTC to have
some macro/include ability and you not being a powerpoint programmer.
- k
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] [POWERPC] DTS cleanup
2007-09-14 18:11 ` Kumar Gala
@ 2007-09-17 3:24 ` David Gibson
0 siblings, 0 replies; 8+ messages in thread
From: David Gibson @ 2007-09-17 3:24 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
On Fri, Sep 14, 2007 at 01:11:07PM -0500, Kumar Gala wrote:
>
> On Sep 14, 2007, at 11:28 AM, Jon Loeliger wrote:
>
> > Kumar Gala wrote:
> >
> >> Someone really needs to add some macro/preprocessor magic into DTC
> >> so this is made a lot simpler.
> >> - k
> >
> > Kumar,
> >
> > I am seriously contemplating this problem.
> > The trick is, I need to quit with the whole
> > Power Point Programmer job title for a bit...
>
> I'm all for both of these things. You working on getting DTC to have
> some macro/include ability and you not being a powerpoint
> programmer.
Maybe we should make some time for all of us to get on IRC together to
discuss this?
I had some thoughts on what I think is a reasonably sane variable /
expression system for dtc. Not quite the same thing as a macro
system, but a good start on one.
Although I also think we should still consider if using m4 as a
preprocessor (with some preloaded macros) could be sufficient. Adding
expression and macro functions to dtc itself would be rather a lot of
work.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2007-09-17 3:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-12 16:54 [PATCH] [POWERPC] DTS cleanup Kumar Gala
2007-09-12 22:10 ` Segher Boessenkool
2007-09-13 3:08 ` Kumar Gala
2007-09-13 16:56 ` Segher Boessenkool
2007-09-13 21:04 ` Kumar Gala
2007-09-14 16:28 ` Jon Loeliger
2007-09-14 18:11 ` Kumar Gala
2007-09-17 3:24 ` David Gibson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).