[POWERPC] ucc_geth: use rx-clock-name and tx-clock-name device tree properties

Updates the ucc_geth device driver to check the new rx-clock-name and
tx-clock-name properties first.  If present, it uses the new function
qe_clock_source() to obtain the clock source.  Otherwise, it checks the
deprecated rx-clock and tx-clock properties.

Update the device trees for 832x, 836x, and 8568 to contain the new property
names only.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

4 files changed, 16 insertions, 16 deletions

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 5a88187fe6be..26ac467b10ea 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -228,8 +228,8 @@
                         interrupts = <22>;
                         interrupt-parent = < &qeic >;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <19>;
-                        tx-clock = <1a>;
+                        rx-clock-name = "clk9";
+                        tx-clock-name = "clk10";
                         phy-handle = < &phy3 >;
                         pio-handle = < &pio3 >;
                 };
@@ -244,8 +244,8 @@
                         interrupts = <23>;
                         interrupt-parent = < &qeic >;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <17>;
-                        tx-clock = <18>;
+                        rx-clock-name = "clk7";
+                        tx-clock-name = "clk8";
                         phy-handle = < &phy4 >;
                         pio-handle = < &pio4 >;
                 };
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index d31498628307..10ff7aadf9dc 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -209,8 +209,8 @@
                         interrupts = <21>;
                         interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <20>;
-                        tx-clock = <13>;
+                        rx-clock-name = "clk16";
+                        tx-clock-name = "clk3";
                         phy-handle = <&phy00>;
                         pio-handle = <&ucc2pio>;
                 };
@@ -225,8 +225,8 @@
                         interrupts = <22>;
                         interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <19>;
-                        tx-clock = <1a>;
+                        rx-clock-name = "clk9";
+                        tx-clock-name = "clk10";
                         phy-handle = <&phy04>;
                         pio-handle = <&ucc3pio>;
                 };
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index ea07a6f03332..fd841b2fddd0 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -259,8 +259,8 @@
                         interrupts = <20>;
                         interrupt-parent = < &qeic >;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <19>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk9";
                         phy-handle = < &phy0 >;
                         phy-connection-type = "rgmii-id";
                         pio-handle = < &pio1 >;
@@ -276,8 +276,8 @@
                         interrupts = <21>;
                         interrupt-parent = < &qeic >;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <14>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk4";
                         phy-handle = < &phy1 >;
                         phy-connection-type = "rgmii-id";
                         pio-handle = < &pio2 >;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 90545b16130d..5818a7c861e7 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -327,8 +327,8 @@
                         interrupts = <20>;
                         interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <20>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk16";
                         pio-handle = <&pio1>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
@@ -344,8 +344,8 @@
                         interrupts = <21>;
                         interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <20>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk16";
                         pio-handle = <&pio2>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";