MLK-20045-2 usb: chipidea: usbmisc_imx: delete the HSIC operation for imx7d
authorPeter Chen <peter.chen@nxp.com>
Wed, 24 Oct 2018 07:21:41 +0000 (15:21 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
For imx7d, no software operation is needed for HSIC controller, so delete
related operation.

Reviewed-by: Jun Li <jun.li@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Vipul Kumar <vipul_kumar@mentor.com>
drivers/usb/chipidea/usbmisc_imx.c

index ae45a0b..558ac44 100644 (file)
@@ -647,14 +647,7 @@ static int usbmisc_imx7d_init(struct imx_usbmisc_data *data)
        reg = readl(usbmisc->base);
        writel(reg | MX6_BM_NON_BURST_SETTING, usbmisc->base);
 
-       if (data->hsic) {
-               reg = readl(usbmisc->base);
-               writel(reg | MX6_BM_UTMI_ON_CLOCK, usbmisc->base);
-
-               reg = readl(usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
-               reg |= MX6_BM_HSIC_EN | MX6_BM_HSIC_CLK_ON;
-               writel(reg, usbmisc->base + MX6_USB_HSIC_CTRL_OFFSET);
-       } else {
+       if (!data->hsic) {
                reg = readl(usbmisc->base + MX7D_USBNC_USB_CTRL2);
                reg &= ~MX7D_USB_VBUS_WAKEUP_SOURCE_MASK;
                writel(reg | MX7D_USB_VBUS_WAKEUP_SOURCE_BVALID
@@ -1023,8 +1016,6 @@ static const struct usbmisc_ops imx7d_usbmisc_ops = {
        .power_lost_check = usbmisc_imx7d_power_lost_check,
        .charger_detection = imx7d_charger_detection,
        .term_select_override = usbmisc_term_select_override,
-       .hsic_set_connect = usbmisc_imx6_hsic_set_connect,
-       .hsic_set_clk   = usbmisc_imx6_hsic_set_clk,
 };
 
 static const struct usbmisc_ops imx7ulp_usbmisc_ops = {