powerpc/5200: Trim cruft from device trees

Trim out obsolete/extraneous properties and tighten up some usage
conventions.  Changes include:
- removal of device_type properties
- removal of cell-index properties
- Addition of gpio-controller and #gpio-cells properties to gpio
  nodes
- Move common interrupt-parent property out of device nodes and
  into top level parent node.

This patch also include what looks to be just trivial editorial
whitespace/format changes, but there is real method in this
madness.  Editorial changes were made to keep the all the
mpc5200 board device trees as similar as possible so that diffs
between them only show the real differences between the boards.
The pcm030 device tree was most affected by this because many
of the comments had been changed from // to /* */ style and
some cell values where changed from decimal to hex format when
it was cloned from one of the other 5200 device trees.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>

1 files changed, 10 insertions, 53 deletions

diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index 63e3bb48e843..c63e3566479e 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -17,6 +17,7 @@
         compatible = "fsl,lite5200b";
         #address-cells = <1>;
         #size-cells = <1>;
+        interrupt-parent = <&mpc5200_pic>;
 
         cpus {
                 #address-cells = <1>;
@@ -58,136 +59,112 @@
                         // 5200 interrupts are encoded into two levels;
                         interrupt-controller;
                         #interrupt-cells = <3>;
-                        device_type = "interrupt-controller";
                         compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
                         reg = <0x500 0x80>;
                 };
 
                 timer@600 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <0>;
                         reg = <0x600 0x10>;
                         interrupts = <1 9 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         fsl,has-wdt;
                 };
 
                 timer@610 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <1>;
                         reg = <0x610 0x10>;
                         interrupts = <1 10 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@620 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <2>;
                         reg = <0x620 0x10>;
                         interrupts = <1 11 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@630 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <3>;
                         reg = <0x630 0x10>;
                         interrupts = <1 12 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@640 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <4>;
                         reg = <0x640 0x10>;
                         interrupts = <1 13 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@650 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <5>;
                         reg = <0x650 0x10>;
                         interrupts = <1 14 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@660 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <6>;
                         reg = <0x660 0x10>;
                         interrupts = <1 15 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@670 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
-                        cell-index = <7>;
                         reg = <0x670 0x10>;
                         interrupts = <1 16 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 rtc@800 {       // Real time clock
                         compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
                         reg = <0x800 0x100>;
                         interrupts = <1 5 0 1 6 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 can@900 {
                         compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
-                        cell-index = <0>;
                         interrupts = <2 17 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         reg = <0x900 0x80>;
                 };
 
                 can@980 {
                         compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
-                        cell-index = <1>;
                         interrupts = <2 18 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         reg = <0x980 0x80>;
                 };
 
-                gpio@b00 {
+                gpio_simple: gpio@b00 {
                         compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
                         reg = <0xb00 0x40>;
                         interrupts = <1 7 0>;
-                        interrupt-parent = <&mpc5200_pic>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
                 };
 
-                gpio@c00 {
+                gpio_wkup: gpio@c00 {
                         compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup";
                         reg = <0xc00 0x40>;
                         interrupts = <1 8 0 0 3 0>;
-                        interrupt-parent = <&mpc5200_pic>;
+                        gpio-controller;
+                        #gpio-cells = <2>;
                 };
 
                 spi@f00 {
                         compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
                         reg = <0xf00 0x20>;
                         interrupts = <2 13 0 2 14 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 usb@1000 {
                         compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
                         reg = <0x1000 0xff>;
                         interrupts = <2 6 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 dma-controller@1200 {
-                        device_type = "dma-controller";
                         compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
                         reg = <0x1200 0x80>;
                         interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
                                       3 4 0  3 5 0  3 6 0  3 7 0
                                       3 8 0  3 9 0  3 10 0  3 11 0
                                       3 12 0  3 13 0  3 14 0  3 15 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 xlb@1f00 {
@@ -196,13 +173,10 @@
                 };
 
                 serial@2000 {           // PSC1
-                        device_type = "serial";
                         compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
-                        port-number = <0>;  // Logical port assignment
                         cell-index = <0>;
                         reg = <0x2000 0x100>;
                         interrupts = <2 1 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 // PSC2 in ac97 mode example
@@ -211,7 +185,6 @@
                 //      cell-index = <1>;
                 //      reg = <0x2200 0x100>;
                 //      interrupts = <2 2 0>;
-                //      interrupt-parent = <&mpc5200_pic>;
                 //};
 
                 // PSC3 in CODEC mode example
@@ -220,27 +193,22 @@
                 //      cell-index = <2>;
                 //      reg = <0x2400 0x100>;
                 //      interrupts = <2 3 0>;
-                //      interrupt-parent = <&mpc5200_pic>;
                 //};
 
                 // PSC4 in uart mode example
                 //serial@2600 {         // PSC4
-                //      device_type = "serial";
                 //      compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                 //      cell-index = <3>;
                 //      reg = <0x2600 0x100>;
                 //      interrupts = <2 11 0>;
-                //      interrupt-parent = <&mpc5200_pic>;
                 //};
 
                 // PSC5 in uart mode example
                 //serial@2800 {         // PSC5
-                //      device_type = "serial";
                 //      compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                 //      cell-index = <4>;
                 //      reg = <0x2800 0x100>;
                 //      interrupts = <2 12 0>;
-                //      interrupt-parent = <&mpc5200_pic>;
                 //};
 
                 // PSC6 in spi mode example
@@ -249,49 +217,40 @@
                 //      cell-index = <5>;
                 //      reg = <0x2c00 0x100>;
                 //      interrupts = <2 4 0>;
-                //      interrupt-parent = <&mpc5200_pic>;
                 //};
 
                 ethernet@3000 {
-                        device_type = "network";
                         compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
                         reg = <0x3000 0x400>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <2 5 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         phy-handle = <&phy0>;
                 };
 
                 mdio@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        compatible = "fsl,mpc5200b-mdio", "fsl,mpc5200-mdio";
+                        compatible = "fsl,mpc5200b-mdio","fsl,mpc5200-mdio";
                         reg = <0x3000 0x400>;   // fec range, since we need to setup fec interrupts
                         interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.
-                        interrupt-parent = <&mpc5200_pic>;
 
                         phy0: ethernet-phy@0 {
-                                device_type = "ethernet-phy";
                                 reg = <0>;
                         };
                 };
 
                 ata@3a00 {
-                        device_type = "ata";
                         compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata";
                         reg = <0x3a00 0x100>;
                         interrupts = <2 7 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 i2c@3d00 {
                         #address-cells = <1>;
                         #size-cells = <0>;
                         compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
-                        cell-index = <0>;
                         reg = <0x3d00 0x40>;
                         interrupts = <2 15 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         fsl5200-clocking;
                 };
 
@@ -299,14 +258,13 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
-                        cell-index = <1>;
                         reg = <0x3d40 0x40>;
                         interrupts = <2 16 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         fsl5200-clocking;
                 };
+
                 sram@8000 {
-                        compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram","sram";
+                        compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
                         reg = <0x8000 0x4000>;
                 };
         };
@@ -330,7 +288,6 @@
                                  0xc800 0 0 4 &mpc5200_pic 0 0 3>;
                 clock-frequency = <0>; // From boot loader
                 interrupts = <2 8 0 2 9 0 2 10 0>;
-                interrupt-parent = <&mpc5200_pic>;
                 bus-range = <0 0>;
                 ranges = <0x42000000 0 0x80000000 0x80000000 0 0x20000000
                           0x02000000 0 0xa0000000 0xa0000000 0 0x10000000