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, 11 insertions, 38 deletions

diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
index 2f74cc4e093e..cee8080aa245 100644
--- a/arch/powerpc/boot/dts/cm5200.dts
+++ b/arch/powerpc/boot/dts/cm5200.dts
@@ -17,6 +17,7 @@
         compatible = "schindler,cm5200";
         #address-cells = <1>;
         #size-cells = <1>;
+        interrupt-parent = <&mpc5200_pic>;
 
         cpus {
                 #address-cells = <1>;
@@ -66,7 +67,6 @@
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x600 0x10>;
                         interrupts = <1 9 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         fsl,has-wdt;
                 };
 
@@ -74,84 +74,76 @@
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x610 0x10>;
                         interrupts = <1 10 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@620 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x620 0x10>;
                         interrupts = <1 11 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@630 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x630 0x10>;
                         interrupts = <1 12 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@640 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x640 0x10>;
                         interrupts = <1 13 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@650 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x650 0x10>;
                         interrupts = <1 14 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@660 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         reg = <0x660 0x10>;
                         interrupts = <1 15 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 timer@670 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         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>;
                 };
 
-                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 {
@@ -161,7 +153,6 @@
                                       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 {
@@ -170,48 +161,34 @@
                 };
 
                 serial@2000 {           // PSC1
-                        device_type = "serial";
                         compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
-                        port-number = <0>;  // Logical port assignment
                         reg = <0x2000 0x100>;
                         interrupts = <2 1 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 serial@2200 {           // PSC2
-                        device_type = "serial";
-                        compatible = "fsl,mpc5200-psc-uart";
-                        port-number = <1>;  // Logical port assignment
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                         reg = <0x2200 0x100>;
                         interrupts = <2 2 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 serial@2400 {           // PSC3
-                        device_type = "serial";
-                        compatible = "fsl,mpc5200-psc-uart";
-                        port-number = <2>;  // Logical port assignment
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                         reg = <0x2400 0x100>;
                         interrupts = <2 3 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                 };
 
                 serial@2c00 {           // PSC6
-                        device_type = "serial";
                         compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
-                        port-number = <5>;  // Logical port assignment
                         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>;
                 };
 
@@ -221,10 +198,8 @@
                         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>;
                         };
                 };
@@ -235,7 +210,6 @@
                         compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
                         reg = <0x3d40 0x40>;
                         interrupts = <2 16 0>;
-                        interrupt-parent = <&mpc5200_pic>;
                         fsl5200-clocking;
                 };
 
@@ -245,9 +219,8 @@
                 };
         };
 
-        lpb {
-                model = "fsl,lpb";
-                compatible = "fsl,lpb";
+        localbus {
+                compatible = "fsl,mpc5200b-lpb","simple-bus";
                 #address-cells = <2>;
                 #size-cells = <1>;
                 ranges = <0 0 0xfc000000 0x2000000>;