karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / drivers / usb / host / ehci-mx6.c

diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 951dd3b25f2cf766df706a4fdbf86366dbff4e05..154be8cb7cbe1e01c31f9f18c917205546712c22 100644 (file)
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -40,10 +40,10 @@
 #define ANADIG_USB2_CHRG_DETECT_EN_B           0x00100000
 #define ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B     0x00080000
 
-#define ANADIG_USB2_PLL_480_CTRL_BYPASS                0x00010000
-#define ANADIG_USB2_PLL_480_CTRL_ENABLE                0x00002000
-#define ANADIG_USB2_PLL_480_CTRL_POWER         0x00001000
-#define ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS   0x00000040
+#define ANADIG_USB_PLL_480_CTRL_BYPASS         0x00010000
+#define ANADIG_USB_PLL_480_CTRL_ENABLE         0x00002000
+#define ANADIG_USB_PLL_480_CTRL_POWER          0x00001000
+#define ANADIG_USB_PLL_480_CTRL_EN_USB_CLKS    0x00000040
 
 
 #define UCTRL_OVER_CUR_POL     (1 << 8) /* OTG Polarity of Overcurrent */
@@ -104,12 +104,12 @@ static void usb_power_config(int index)
                     ANADIG_USB2_CHRG_DETECT_CHK_CHRG_B,
                     chrg_detect);
 
-       __raw_writel(ANADIG_USB2_PLL_480_CTRL_BYPASS,
+       __raw_writel(ANADIG_USB_PLL_480_CTRL_BYPASS,
                     pll_480_ctrl_clr);
 
-       __raw_writel(ANADIG_USB2_PLL_480_CTRL_ENABLE |
-                    ANADIG_USB2_PLL_480_CTRL_POWER |
-                    ANADIG_USB2_PLL_480_CTRL_EN_USB_CLKS,
+       __raw_writel(ANADIG_USB_PLL_480_CTRL_ENABLE |
+                    ANADIG_USB_PLL_480_CTRL_POWER |
+                    ANADIG_USB_PLL_480_CTRL_EN_USB_CLKS,
                     pll_480_ctrl_set);
 }