From c0f8484b2031889cea145e210d2fee2f6502d03d Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Wed, 24 Oct 2018 15:21:41 +0800 Subject: MLK-20045-2 usb: chipidea: usbmisc_imx: delete the HSIC operation for imx7d For imx7d, no software operation is needed for HSIC controller, so delete related operation. Reviewed-by: Jun Li Signed-off-by: Peter Chen --- drivers/usb/chipidea/usbmisc_imx.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c index 941eebce1211..ca4005c7fbc0 100644 --- a/drivers/usb/chipidea/usbmisc_imx.c +++ b/drivers/usb/chipidea/usbmisc_imx.c @@ -646,14 +646,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 @@ -1022,8 +1015,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 = { -- cgit v1.2.3