3 files changed, 53 insertions, 23 deletions

diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index da4efbca646e..e36321152d50 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -81,16 +81,8 @@
 static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
 {
         const struct fs_platform_info *fpi = fep->fpi;
-        int i;
-
-        W32(cpmp, cp_cpcr, fpi->cp_command | op | CPM_CR_FLG);
-        for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
-                if ((R32(cpmp, cp_cpcr) & CPM_CR_FLG) == 0)
-                        return 0;
 
-        printk(KERN_ERR "%s(): Not able to issue CPM command\n",
-               __FUNCTION__);
-        return 1;
+        return cpm_command(fpi->cp_command, op);
 }
 
 static int do_pd_setup(struct fs_enet_private *fep)
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 48f2f3005935..fe3d8a621c33 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -89,21 +89,12 @@
  * Delay to wait for SCC reset command to complete (in us)
  */
 #define SCC_RESET_DELAY         50
-#define MAX_CR_CMD_LOOPS        10000
 
 static inline int scc_cr_cmd(struct fs_enet_private *fep, u32 op)
 {
         const struct fs_platform_info *fpi = fep->fpi;
-        int i;
-
-        W16(cpmp, cp_cpcr, fpi->cp_command | CPM_CR_FLG | (op << 8));
-        for (i = 0; i < MAX_CR_CMD_LOOPS; i++)
-                if ((R16(cpmp, cp_cpcr) & CPM_CR_FLG) == 0)
-                        return 0;
 
-        printk(KERN_ERR "%s(): Not able to issue CPM command\n",
-                __FUNCTION__);
-        return 1;
+        return cpm_command(fpi->cp_command, op);
 }
 
 static int do_pd_setup(struct fs_enet_private *fep)
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index abac7db3819e..8d456e379a86 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3822,6 +3822,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         int err, ucc_num, max_speed = 0;
         const phandle *ph;
         const unsigned int *prop;
+        const char *sprop;
         const void *mac_addr;
         phy_interface_t phy_interface;
         static const int enet_to_speed[] = {
@@ -3854,10 +3855,56 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ug_info->uf_info.ucc_num = ucc_num;
 
-        prop = of_get_property(np, "rx-clock", NULL);
-        ug_info->uf_info.rx_clock = *prop;
-        prop = of_get_property(np, "tx-clock", NULL);
-        ug_info->uf_info.tx_clock = *prop;
+        sprop = of_get_property(np, "rx-clock-name", NULL);
+        if (sprop) {
+                ug_info->uf_info.rx_clock = qe_clock_source(sprop);
+                if ((ug_info->uf_info.rx_clock < QE_CLK_NONE) ||
+                    (ug_info->uf_info.rx_clock > QE_CLK24)) {
+                        printk(KERN_ERR
+                                "ucc_geth: invalid rx-clock-name property\n");
+                        return -EINVAL;
+                }
+        } else {
+                prop = of_get_property(np, "rx-clock", NULL);
+                if (!prop) {
+                        /* If both rx-clock-name and rx-clock are missing,
+                           we want to tell people to use rx-clock-name. */
+                        printk(KERN_ERR
+                                "ucc_geth: missing rx-clock-name property\n");
+                        return -EINVAL;
+                }
+                if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) {
+                        printk(KERN_ERR
+                                "ucc_geth: invalid rx-clock propperty\n");
+                        return -EINVAL;
+                }
+                ug_info->uf_info.rx_clock = *prop;
+        }
+
+        sprop = of_get_property(np, "tx-clock-name", NULL);
+        if (sprop) {
+                ug_info->uf_info.tx_clock = qe_clock_source(sprop);
+                if ((ug_info->uf_info.tx_clock < QE_CLK_NONE) ||
+                    (ug_info->uf_info.tx_clock > QE_CLK24)) {
+                        printk(KERN_ERR
+                                "ucc_geth: invalid tx-clock-name property\n");
+                        return -EINVAL;
+                }
+        } else {
+                prop = of_get_property(np, "rx-clock", NULL);
+                if (!prop) {
+                        printk(KERN_ERR
+                                "ucc_geth: mising tx-clock-name property\n");
+                        return -EINVAL;
+                }
+                if ((*prop < QE_CLK_NONE) || (*prop > QE_CLK24)) {
+                        printk(KERN_ERR
+                                "ucc_geth: invalid tx-clock property\n");
+                        return -EINVAL;
+                }
+                ug_info->uf_info.tx_clock = *prop;
+        }
+
         err = of_address_to_resource(np, 0, &res);
         if (err)
                 return -EINVAL;