[POWERPC] QE: UCC nodes cleanup

- get rid of `model = "UCC"' in the ucc nodes
  It isn't used anywhere, so remove it. If we'll ever need something
  like this, we'll use compatible property instead.
- replace last occurrences of device-id with cell-index.
  Drivers are modified for backward compatibility's sake.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 1 insertions, 18 deletions

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 9bb408371bcd..539e02fb3526 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -255,9 +255,7 @@
                 enet0: ucc@2200 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <3>;
-                        device-id = <3>;
                         reg = <0x2200 0x200>;
                         interrupts = <34>;
                         interrupt-parent = <&qeic>;
@@ -271,9 +269,7 @@
                 enet1: ucc@3200 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <4>;
-                        device-id = <4>;
                         reg = <0x3200 0x200>;
                         interrupts = <35>;
                         interrupt-parent = <&qeic>;
@@ -287,8 +283,7 @@
                 ucc@2400 {
                         device_type = "serial";
                         compatible = "ucc_uart";
-                        model = "UCC";
-                        device-id = <5>;        /* The UCC number, 1-7*/
+                        cell-index = <5>;       /* The UCC number, 1-7*/
                         port-number = <0>;      /* Which ttyQEx device */
                         soft-uart;              /* We need Soft-UART */
                         reg = <0x2400 0x200>;
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 94f93d209de8..179c81c6a7ac 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -208,9 +208,7 @@
                 enet0: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <2>;
-                        device-id = <2>;
                         reg = <0x3000 0x200>;
                         interrupts = <33>;
                         interrupt-parent = <&qeic>;
@@ -224,9 +222,7 @@
                 enet1: ucc@2200 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <3>;
-                        device-id = <3>;
                         reg = <0x2200 0x200>;
                         interrupts = <34>;
                         interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 55f03e8dc97f..8160ff24e87e 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -257,9 +257,7 @@
                 enet0: ucc@2000 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <1>;
-                        device-id = <1>;
                         reg = <0x2000 0x200>;
                         interrupts = <32>;
                         interrupt-parent = <&qeic>;
@@ -274,9 +272,7 @@
                 enet1: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <2>;
-                        device-id = <2>;
                         reg = <0x3000 0x200>;
                         interrupts = <33>;
                         interrupt-parent = <&qeic>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 97bc048f2158..df4b5e89d7e4 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -324,9 +324,7 @@
                 enet2: ucc@2000 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <1>;
-                        device-id = <1>;
                         reg = <2000 200>;
                         interrupts = <20>;
                         interrupt-parent = <&qeic>;
@@ -341,9 +339,7 @@
                 enet3: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
-                        model = "UCC";
                         cell-index = <2>;
-                        device-id = <2>;
                         reg = <3000 200>;
                         interrupts = <21>;
                         interrupt-parent = <&qeic>;