Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1502651

[PATCH v5 14/23] usb: chipidea: msm: Use hw_write_id_reg() instead of writel

Show all headers | View raw

The MSM_USB_BASE macro trick is not very clear, and we're using
it for only one register write so let's just move to using
hw_write_id_reg() and passing the ci pointer instead. That
clearly shows what offset we're using and avoids needing to
include the msm_hsusb_hw.h file when we're going to delete that
file soon.

Acked-by: Peter Chen <peter.chen@nxp.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 drivers/usb/chipidea/ci_hdrc_msm.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c
index 719b20caf88e..b282a717bf8c 100644
--- a/drivers/usb/chipidea/ci_hdrc_msm.c
+++ b/drivers/usb/chipidea/ci_hdrc_msm.c
@@ -8,14 +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)
+#define HS_PHY_AHB_MODE			0x0098
 
 static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
 {
@@ -25,7 +23,7 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event)
 	case CI_HDRC_CONTROLLER_RESET_EVENT:
 		dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n");
 		/* use AHB transactor, allow posted data writes */
-		writel(0x8, USB_AHBMODE);
+		hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8);
 		usb_phy_init(ci->usb_phy);
 		break;
 	case CI_HDRC_CONTROLLER_STOPPED_EVENT:
-- 
2.10.0.297.gf6727b0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 00/23] Support qcom's HSIC USB and rewrite USB2 HS support Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 12/23] usb: chipidea: msm: Mark device as runtime pm active Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 05/23] usb: chipidea: Handle extcon events properly Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 04/23] usb: chipidea: Only read/write OTGSC from one place Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 10/23] usb: chipidea: Consolidate extcon notifiers Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 15/23] usb: chipidea: msm: Add proper clk and reset support Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 14/23] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 13/23] usb: chipidea: msm: Rely on core to override AHBBURST Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 03/23] usb: ulpi: Support device discovery via DT Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
    Re: [PATCH v5 03/23] usb: ulpi: Support device discovery via DT Rob Herring <robh@kernel.org> - 2016-10-18 18:50 +0200
  [PATCH v5 16/23] usb: chipidea: msm: Mux over secondary phy at the right time Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
  [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable path Stephen Boyd <stephen.boyd@linaro.org> - 2016-10-18 04:10 +0200
    Re: [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable  path Peter Chen <hzpeterchen@gmail.com> - 2016-10-19 03:20 +0200
      Re: [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable  path Peter Chen <hzpeterchen@gmail.com> - 2016-10-19 16:40 +0200
        Re: [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable  path Peter Chen <hzpeterchen@gmail.com> - 2016-10-20 12:20 +0200
          Re: [PATCH v5 11/23] usb: chipidea: Emulate OTGSC interrupt enable  path Peter Chen <hzpeterchen@gmail.com> - 2016-10-21 04:20 +0200
  Re: [PATCH v5 00/23] Support qcom's HSIC USB and rewrite USB2 HS  support Peter Chen <hzpeterchen@gmail.com> - 2016-10-18 11:40 +0200

csiph-web