Skip to content

Commit

Permalink
usb: dwc3: imx8mp: rename iomem base pointer
Browse files Browse the repository at this point in the history
Until now the iomem used is not USB glue as the name suggests, but
HSIO BLK_CTL. Rename the struct member accordingly. This is a preparing
patch for when USB glue is actually used.

Reviewed-by: Li Jun <jun.li@nxp.com>
Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
Link: https://lore.kernel.org/r/20220218152707.2198357-2-alexander.stein@ew.tq-group.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Alexander Stein authored and Greg Kroah-Hartman committed Mar 15, 2022
1 parent bced4af commit 8191538
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/usb/dwc3/dwc3-imx8mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
struct dwc3_imx8mp {
struct device *dev;
struct platform_device *dwc3;
void __iomem *glue_base;
void __iomem *hsio_blk_base;
struct clk *hsio_clk;
struct clk *suspend_clk;
int irq;
Expand All @@ -55,7 +55,7 @@ static void dwc3_imx8mp_wakeup_enable(struct dwc3_imx8mp *dwc3_imx)
if (!dwc3)
return;

val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL);
val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL);

if ((dwc3->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc3->xhci)
val |= USB_WAKEUP_EN | USB_WAKEUP_SS_CONN |
Expand All @@ -64,16 +64,16 @@ static void dwc3_imx8mp_wakeup_enable(struct dwc3_imx8mp *dwc3_imx)
val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN |
USB_WAKEUP_VBUS_SRC_SESS_VAL;

writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL);
writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL);
}

static void dwc3_imx8mp_wakeup_disable(struct dwc3_imx8mp *dwc3_imx)
{
u32 val;

val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL);
val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL);
val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK);
writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL);
writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL);
}

static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc3_imx)
Expand Down Expand Up @@ -115,9 +115,9 @@ static int dwc3_imx8mp_probe(struct platform_device *pdev)

dwc3_imx->dev = dev;

dwc3_imx->glue_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(dwc3_imx->glue_base))
return PTR_ERR(dwc3_imx->glue_base);
dwc3_imx->hsio_blk_base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(dwc3_imx->hsio_blk_base))
return PTR_ERR(dwc3_imx->hsio_blk_base);

dwc3_imx->hsio_clk = devm_clk_get(dev, "hsio");
if (IS_ERR(dwc3_imx->hsio_clk)) {
Expand Down

0 comments on commit 8191538

Please sign in to comment.