3 files changed, 26 insertions, 2 deletions

diff --git a/drivers/usb/phy/phy-samsung-usb.c b/drivers/usb/phy/phy-samsung-usb.c
index 7a1ed90bd58e..ac025ca08425 100644
--- a/drivers/usb/phy/phy-samsung-usb.c
+++ b/drivers/usb/phy/phy-samsung-usb.c
@@ -100,6 +100,11 @@ void samsung_usbphy_set_isolation_4210(struct samsung_usbphy *sphy, bool on)
                 reg_val |= en_mask;
 
         writel(reg_val, reg);
+
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS4X12) {
+                writel(reg_val, sphy->pmuregs + EXYNOS4X12_PHY_HSIC_CTRL0);
+                writel(reg_val, sphy->pmuregs + EXYNOS4X12_PHY_HSIC_CTRL1);
+        }
 }
 EXPORT_SYMBOL_GPL(samsung_usbphy_set_isolation_4210);
 
diff --git a/drivers/usb/phy/phy-samsung-usb.h b/drivers/usb/phy/phy-samsung-usb.h
index 585d12f5c044..68771bfd1825 100644
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@ -47,6 +47,16 @@
 #define RSTCON_HLINK_SWRST                      (0x1 << 1)
 #define RSTCON_SWRST                            (0x1 << 0)
 
+/* EXYNOS4X12 */
+#define EXYNOS4X12_PHY_HSIC_CTRL0               (0x04)
+#define EXYNOS4X12_PHY_HSIC_CTRL1               (0x08)
+
+#define PHYPWR_NORMAL_MASK_HSIC1                (0x7 << 12)
+#define PHYPWR_NORMAL_MASK_HSIC0                (0x7 << 9)
+#define PHYPWR_NORMAL_MASK_PHY1                 (0x7 << 6)
+
+#define RSTCON_HOSTPHY_SWRST                    (0xf << 3)
+
 /* EXYNOS5 */
 #define EXYNOS5_PHY_HOST_CTRL0                  (0x00)
 
diff --git a/drivers/usb/phy/phy-samsung-usb2.c b/drivers/usb/phy/phy-samsung-usb2.c
index 03180c06bfca..1011c16ade7e 100644
--- a/drivers/usb/phy/phy-samsung-usb2.c
+++ b/drivers/usb/phy/phy-samsung-usb2.c
@@ -176,8 +176,12 @@ static void samsung_usb2phy_enable(struct samsung_usbphy *sphy)
                 phypwr &= ~PHYPWR_NORMAL_MASK;
                 rstcon |= RSTCON_SWRST;
                 break;
-        case TYPE_EXYNOS4210:
         case TYPE_EXYNOS4X12:
+                phypwr &= ~(PHYPWR_NORMAL_MASK_HSIC0 |
+                                PHYPWR_NORMAL_MASK_HSIC1 |
+                                PHYPWR_NORMAL_MASK_PHY1);
+                rstcon |= RSTCON_HOSTPHY_SWRST;
+        case TYPE_EXYNOS4210:
                 phypwr &= ~PHYPWR_NORMAL_MASK_PHY0;
                 rstcon |= RSTCON_SWRST;
         default:
@@ -190,6 +194,8 @@ static void samsung_usb2phy_enable(struct samsung_usbphy *sphy)
         /* reset all ports of PHY and Link */
         writel(rstcon, regs + SAMSUNG_RSTCON);
         udelay(10);
+        if (sphy->drv_data->cpu_type == TYPE_EXYNOS4X12)
+                rstcon &= ~RSTCON_HOSTPHY_SWRST;
         rstcon &= ~RSTCON_SWRST;
         writel(rstcon, regs + SAMSUNG_RSTCON);
 }
@@ -240,8 +246,11 @@ static void samsung_usb2phy_disable(struct samsung_usbphy *sphy)
         case TYPE_S3C64XX:
                 phypwr |= PHYPWR_NORMAL_MASK;
                 break;
-        case TYPE_EXYNOS4210:
         case TYPE_EXYNOS4X12:
+                phypwr |= (PHYPWR_NORMAL_MASK_HSIC0 |
+                                PHYPWR_NORMAL_MASK_HSIC1 |
+                                PHYPWR_NORMAL_MASK_PHY1);
+        case TYPE_EXYNOS4210:
                 phypwr |= PHYPWR_NORMAL_MASK_PHY0;
         default:
                 break;