After commit 233c7daf4eec ("usb: chipidea: msm: Initialize PHY on reset
event"), we always call usb_phy_init() when receiving a
CI_HDRC_CONTROLLER_RESET_EVENT event, but we also set the
USB_AHBBURST and USB_AHBMODE registers to the same values that
the reset function does.This removes the duplicate initialization, to avoid the dependency on the header file and the phy registers. Signed-off-by: Arnd Bergmann <[email protected]> --- drivers/usb/chipidea/ci_hdrc_msm.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 3889809fd0c4..7cae571d15f8 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,15 +8,12 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> -#include <linux/usb/msm_hsusb_hw.h> #include <linux/usb/ulpi.h> #include <linux/usb/gadget.h> #include <linux/usb/chipidea.h> #include "ci.h" -#define MSM_USB_BASE (ci->hw_bank.abs) - static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { struct device *dev = ci->gadget.dev.parent; @@ -24,9 +21,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) switch (event) { case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); - writel(0, USB_AHBBURST); - /* use AHB transactor, allow posted data writes */ - writel(0x8, USB_AHBMODE); usb_phy_init(ci->usb_phy); break; case CI_HDRC_CONTROLLER_STOPPED_EVENT: -- 2.7.0
