1 files changed, 15 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c
index 64bcf0a33c71..cc99c280aad9 100644
--- a/arch/powerpc/platforms/83xx/usb.c
+++ b/arch/powerpc/platforms/83xx/usb.c
@@ -137,15 +137,21 @@ int mpc831x_usb_cfg(void)
 
         /* Configure pin mux for ULPI.  There is no pin mux for UTMI */
         if (prop && !strcmp(prop, "ulpi")) {
-                temp = in_be32(immap + MPC83XX_SICRL_OFFS);
-                temp &= ~MPC831X_SICRL_USB_MASK;
-                temp |= MPC831X_SICRL_USB_ULPI;
-                out_be32(immap + MPC83XX_SICRL_OFFS, temp);
-
-                temp = in_be32(immap + MPC83XX_SICRH_OFFS);
-                temp &= ~MPC831X_SICRH_USB_MASK;
-                temp |= MPC831X_SICRH_USB_ULPI;
-                out_be32(immap + MPC83XX_SICRH_OFFS, temp);
+                if (of_device_is_compatible(immr_node, "fsl,mpc8315-immr")) {
+                        clrsetbits_be32(immap + MPC83XX_SICRL_OFFS,
+                                        MPC8315_SICRL_USB_MASK,
+                                        MPC8315_SICRL_USB_ULPI);
+                        clrsetbits_be32(immap + MPC83XX_SICRH_OFFS,
+                                        MPC8315_SICRH_USB_MASK,
+                                        MPC8315_SICRH_USB_ULPI);
+                } else {
+                        clrsetbits_be32(immap + MPC83XX_SICRL_OFFS,
+                                        MPC831X_SICRL_USB_MASK,
+                                        MPC831X_SICRL_USB_ULPI);
+                        clrsetbits_be32(immap + MPC83XX_SICRH_OFFS,
+                                        MPC831X_SICRH_USB_MASK,
+                                        MPC831X_SICRH_USB_ULPI);
+                }
         }
 
         iounmap(immap);