Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: dwc3: imx8mp: rename iomem base pointer

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>

authored by

Alexander Stein and committed by
Greg Kroah-Hartman
81915384 bced4afc

+8 -8
+8 -8
drivers/usb/dwc3/dwc3-imx8mp.c
··· 39 39 struct dwc3_imx8mp { 40 40 struct device *dev; 41 41 struct platform_device *dwc3; 42 - void __iomem *glue_base; 42 + void __iomem *hsio_blk_base; 43 43 struct clk *hsio_clk; 44 44 struct clk *suspend_clk; 45 45 int irq; ··· 55 55 if (!dwc3) 56 56 return; 57 57 58 - val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL); 58 + val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); 59 59 60 60 if ((dwc3->current_dr_role == DWC3_GCTL_PRTCAP_HOST) && dwc3->xhci) 61 61 val |= USB_WAKEUP_EN | USB_WAKEUP_SS_CONN | ··· 64 64 val |= USB_WAKEUP_EN | USB_WAKEUP_VBUS_EN | 65 65 USB_WAKEUP_VBUS_SRC_SESS_VAL; 66 66 67 - writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL); 67 + writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); 68 68 } 69 69 70 70 static void dwc3_imx8mp_wakeup_disable(struct dwc3_imx8mp *dwc3_imx) 71 71 { 72 72 u32 val; 73 73 74 - val = readl(dwc3_imx->glue_base + USB_WAKEUP_CTRL); 74 + val = readl(dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); 75 75 val &= ~(USB_WAKEUP_EN | USB_WAKEUP_EN_MASK); 76 - writel(val, dwc3_imx->glue_base + USB_WAKEUP_CTRL); 76 + writel(val, dwc3_imx->hsio_blk_base + USB_WAKEUP_CTRL); 77 77 } 78 78 79 79 static irqreturn_t dwc3_imx8mp_interrupt(int irq, void *_dwc3_imx) ··· 115 115 116 116 dwc3_imx->dev = dev; 117 117 118 - dwc3_imx->glue_base = devm_platform_ioremap_resource(pdev, 0); 119 - if (IS_ERR(dwc3_imx->glue_base)) 120 - return PTR_ERR(dwc3_imx->glue_base); 118 + dwc3_imx->hsio_blk_base = devm_platform_ioremap_resource(pdev, 0); 119 + if (IS_ERR(dwc3_imx->hsio_blk_base)) 120 + return PTR_ERR(dwc3_imx->hsio_blk_base); 121 121 122 122 dwc3_imx->hsio_clk = devm_clk_get(dev, "hsio"); 123 123 if (IS_ERR(dwc3_imx->hsio_clk)) {