usb: chipidea: msm: Rely on core to override AHBBURST
authorStephen Boyd <stephen.boyd@linaro.org>
Tue, 4 Apr 2017 19:32:21 +0000 (19:32 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Apr 2017 10:41:19 +0000 (12:41 +0200)
[ Upstream commit dd3749099cfa2c80039193c438b90f3160eaf7f9 ]

The core framework already handles setting this parameter with a
platform quirk. Add the appropriate flag so that we always set
AHBBURST to 0. Technically DT should be doing this, but we always
do it for msm chipidea devices so setting the flag in the driver
works just as well. If the burst needs to be anything besides 0,
we expect the 'ahb-burst-config' dts property to be present.

Acked-by: Peter Chen <peter.chen@nxp.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/chipidea/ci_hdrc_msm.c

index 3889809fd0c49f61495857323ccb33ab9729ae0b..37591a4b134643d80386bea1e0f472511c6ea08f 100644 (file)
@@ -24,7 +24,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);
@@ -47,7 +46,8 @@ static struct ci_hdrc_platform_data ci_hdrc_msm_platdata = {
        .name                   = "ci_hdrc_msm",
        .capoffset              = DEF_CAPOFFSET,
        .flags                  = CI_HDRC_REGS_SHARED |
-                                 CI_HDRC_DISABLE_STREAMING,
+                                 CI_HDRC_DISABLE_STREAMING |
+                                 CI_HDRC_OVERRIDE_AHB_BURST,
 
        .notify_event           = ci_hdrc_msm_notify_event,
 };