[POWERPC] 83xx: configure USB clock for MPC8315E

SCCR USB bits are in a different location on the mpc8315.

Signed-off-by: Jerry Huang <Chang-Ming.Huang@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 15 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/83xx/mpc83xx.h b/arch/powerpc/platforms/83xx/mpc83xx.h
index 88bb748aff0d..68065e62fc3d 100644
--- a/arch/powerpc/platforms/83xx/mpc83xx.h
+++ b/arch/powerpc/platforms/83xx/mpc83xx.h
@@ -14,6 +14,8 @@
 #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
 #define MPC83XX_SCCR_USB_DRCM_01   0x00100000
 #define MPC83XX_SCCR_USB_DRCM_10   0x00200000
+#define MPC8315_SCCR_USB_MASK      0x00c00000
+#define MPC8315_SCCR_USB_DRCM_11   0x00c00000
 #define MPC837X_SCCR_USB_DRCM_11   0x00c00000
 
 /* system i/o configuration register low */
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index 681230a30acd..471fdd8f4108 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -104,6 +104,7 @@ int mpc831x_usb_cfg(void)
         u32 temp;
         void __iomem *immap, *usb_regs;
         struct device_node *np = NULL;
+        struct device_node *immr_node = NULL;
         const void *prop;
         struct resource res;
         int ret = 0;
@@ -124,10 +125,15 @@ int mpc831x_usb_cfg(void)
         }
 
         /* Configure clock */
-        temp = in_be32(immap + MPC83XX_SCCR_OFFS);
-        temp &= ~MPC83XX_SCCR_USB_MASK;
-        temp |= MPC83XX_SCCR_USB_DRCM_11;  /* 1:3 */
-        out_be32(immap + MPC83XX_SCCR_OFFS, temp);
+        immr_node = of_get_parent(np);
+        if (immr_node && of_device_is_compatible(immr_node, "fsl,mpc8315-immr"))
+                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
+                                MPC8315_SCCR_USB_MASK,
+                                MPC8315_SCCR_USB_DRCM_11);
+        else
+                clrsetbits_be32(immap + MPC83XX_SCCR_OFFS,
+                                MPC83XX_SCCR_USB_MASK,
+                                MPC83XX_SCCR_USB_DRCM_11);
 
         /* Configure pin mux for ULPI.  There is no pin mux for UTMI */
         if (prop && !strcmp(prop, "ulpi")) {
@@ -144,6 +150,9 @@ int mpc831x_usb_cfg(void)
 
         iounmap(immap);
 
+        if (immr_node)
+                of_node_put(immr_node);
+
         /* Map USB SOC space */
         ret = of_address_to_resource(np, 0, &res);
         if (ret) {