patch "usb: chipidea: imx: Do not access CLKONOFF on i.MX51" added to usb-linus
Subsystems (4)
This is a note to let you know that I've just added the patch titled
usb: chipidea: imx: Do not access CLKONOFF on i.MX51
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
62b97d502bb76c6e8d589e42e02bfcb7bdff0453Mon Sep 17 00:00:00 2001
From: Andrey Smirnov <[email protected]>
Date: Mon, 15 May 2017 06:48:58 -0700
Subject: usb: chipidea: imx: Do not access CLKONOFF on i.MX51
Unlike i.MX53, i.MX51's USBOH3 register file does not implemenent registers past offset 0x018, which includes MX53_USB_CLKONOFF_CTRL_OFFSET and trying to access that register on said platform results in external abort.
Fix it by enabling CLKONOFF accessing codepath only for i.MX53.
Cc: stable <[email protected]>
Fixes 3be3251db088 ("usb: chipidea: imx: Disable internal 60Mhz
clock with ULPI PHY")
--- drivers/usb/chipidea/usbmisc_imx.c | 41 +++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-)
drivers/usb/chipidea/usbmisc_imx.c +32 -9
@@ -108,6 +108,8 @@ struct imx_usbmisc {const struct usbmisc_ops *ops; }; +static inline bool is_imx53_usbmisc (struct imx_usbmisc_data *data); +static int usbmisc_imx25_init (struct imx_usbmisc_data *data) {struct imx_usbmisc *usbmisc =dev_get_drvdata (data->dev);
@@ -242,10 +244,15 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data) val =readl (reg) | MX53_USB_UHx_CTRL_WAKE_UP_EN | MX53_USB_UHx_CTRL_ULPI_INT_EN;writel (val, reg); -/* Disable internal 60Mhz clock */ - reg = usbmisc->base +MX53_USB_CLKONOFF_CTRL_OFFSET ; - val =readl (reg) |MX53_USB_CLKONOFF_CTRL_H2_INT60CKOFF ; -writel (val, reg); +if (is_imx53_usbmisc (data)) { +/* Disable internal 60Mhz clock */ + reg = usbmisc->base + +MX53_USB_CLKONOFF_CTRL_OFFSET ; + val =readl (reg) | +MX53_USB_CLKONOFF_CTRL_H2_INT60CKOFF ; +writel (val, reg); + } + }if (data->disable_oc) { reg = usbmisc->base +MX53_USB_UH2_CTRL_OFFSET ;
@@ -267,10 +274,15 @@ static int usbmisc_imx53_init(struct imx_usbmisc_data *data) val =readl (reg) | MX53_USB_UHx_CTRL_WAKE_UP_EN | MX53_USB_UHx_CTRL_ULPI_INT_EN;writel (val, reg); -/* Disable internal 60Mhz clock */ - reg = usbmisc->base +MX53_USB_CLKONOFF_CTRL_OFFSET ; - val =readl (reg) |MX53_USB_CLKONOFF_CTRL_H3_INT60CKOFF ; -writel (val, reg); + +if (is_imx53_usbmisc (data)) { +/* Disable internal 60Mhz clock */ + reg = usbmisc->base + +MX53_USB_CLKONOFF_CTRL_OFFSET ; + val =readl (reg) | +MX53_USB_CLKONOFF_CTRL_H3_INT60CKOFF ; +writel (val, reg); + } }if (data->disable_oc) { reg = usbmisc->base +MX53_USB_UH3_CTRL_OFFSET ;
@@ -456,6 +468,10 @@ static const struct usbmisc_ops imx27_usbmisc_ops = { .init = usbmisc_imx27_init, }; +static const struct usbmisc_ops imx51_usbmisc_ops = { + .init = usbmisc_imx53_init, +}; +static const struct usbmisc_ops imx53_usbmisc_ops = { .init = usbmisc_imx53_init, };
@@ -479,6 +495,13 @@ static const struct usbmisc_ops imx7d_usbmisc_ops = { .set_wakeup = usbmisc_imx7d_set_wakeup, }; +static inline bool is_imx53_usbmisc (struct imx_usbmisc_data *data) +{ +struct imx_usbmisc *usbmisc =dev_get_drvdata (data->dev); + +return usbmisc->ops == &imx53_usbmisc_ops; +} +int imx_usbmisc_init (struct imx_usbmisc_data *data) {struct imx_usbmisc *usbmisc;
@@ -536,7 +559,7 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = { }, { .compatible = "fsl,imx51-usbmisc", - .data = &imx53_usbmisc_ops, + .data = &imx51_usbmisc_ops, }, { .compatible = "fsl,imx53-usbmisc",
Signature · 1 line
2.13.0