support other fsl SoCs with usbmisc + small fixes

From: Marc Kleine-Budde <[email protected]>

This fixes a potential race condition where the ci13xxx_imx glue code could be fast enough to call one of the usbmisc_ops before he got a valid value on the static usbmisc pointer. To fix that we first set usbmisc, then call usbmisc_set_ops().

Signed-off-by Marc Kleine-Budde <[email protected]>

Signed-off-by Michael Grzeschik <[email protected]>

---
Changes since v1:
* split previous patch into two seperate.

 drivers/usb/chipidea/usbmisc_imx.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/usb/chipidea/usbmisc_imx.c +2 -2

index 552c63f..9145e04 100644
@@ -116,14 +116,14 @@ static int __devinit usbmisc_imx_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	usbmisc = data;
 	ret = usbmisc_set_ops(&imx6q_usbmisc_ops);
 	if (ret) {
+		usbmisc = NULL;
 		clk_disable_unprepare(data->clk);
 		return ret;
 	}
 
-	usbmisc = data;
-
 	return 0;
 }
 

Signature · 6 lines

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 6 lines · Michael Grzeschik

From: Marc Kleine-Budde <[email protected]>

This fixes a potential race condition where the ci13xxx_imx glue code could be fast enough to call one of the usbmisc_ops before he got a valid value on the static usbmisc pointer. To fix that we first set usbmisc, then call usbmisc_set_ops().

usbmisc is subsys_initcall, and cil13xxx_imx is module_init. Any potential situation that the ci13xxx_imx's probe is ran before the usbmisc's probe is completed?

Quoted 8 lines · Peter Chen

Quoted 6 lines · Michael Grzeschik

From: Marc Kleine-Budde <[email protected]>

This fixes a potential race condition where the ci13xxx_imx glue code could be fast enough to call one of the usbmisc_ops before he got a valid value on the static usbmisc pointer. To fix that we first set usbmisc, then call usbmisc_set_ops().

Quoted 3 lines

usbmisc is subsys_initcall, and cil13xxx_imx is module_init. Any potential situation that the ci13xxx_imx's probe is ran before the usbmisc's probe is completed?

Not having looked at the code you are referring to at all I just want to say that: drivers can be modules (don't know if that's true for chipidea) and sooner or later we'll probably get devicetree overlays,

so the devicetree nodes might just appear during runtime. Depending on initcall order is generally not a good idea.

Quoted 6 lines · Michael Grzeschik

From: Marc Kleine-Budde <[email protected]>

This fixes a potential race condition where the ci13xxx_imx glue code could be fast enough to call one of the usbmisc_ops before he got a valid value on the static usbmisc pointer. To fix that we first set usbmisc, then call usbmisc_set_ops().

usbmisc is subsys_initcall, and cil13xxx_imx is module_init. Any potential situation that the ci13xxx_imx's probe is ran before the usbmisc's probe is completed? Besides, there is usbmisc_ops value check at the beginning of cil13xxx_imx's probe.

From: Marc Kleine-Budde <[email protected]>

This patch adds support for a second and third clock to the usbmisc driver. On modern freescale ARM cores like the imx51, imx53 and imx6q three clocks ("ahb", "ipg" and "per") must be enabled in order to access the USB core.

ahb - AMBA High-Performance Bus clock domain
ipg - IP-Bus Gate clock domain
per - Peripheral clock domain

Signed-off-by Marc Kleine-Budde <[email protected]>

Signed-off-by Michael Grzeschik <[email protected]>

---
Changes since v1:
* changed patch description

 drivers/usb/chipidea/usbmisc_imx.c |   60 +++++++++++++++++++++++++++---------
 1 file changed, 45 insertions(+), 15 deletions(-)

drivers/usb/chipidea/usbmisc_imx.c +45 -15

index d0c7a03..e090e0f 100644
@@ -24,7 +24,9 @@
 struct imx_usbmisc {
 	void __iomem *base;
 	spinlock_t lock;
-	struct clk *clk;
+	struct clk *clk_ahb;
+	struct clk *clk_ipg;
+	struct clk *clk_per;
 	struct usbmisc_usb_device usbdev[USB_DEV_MAX];
 	const struct usbmisc_ops *ops;
 };

@@ -104,38 +106,66 @@ static int __devinit usbmisc_imx_probe(struct platform_device *pdev)
 	if (!data->base)
 		return -EADDRNOTAVAIL;
 
-	data->clk = devm_clk_get(&pdev->dev, NULL);
-	if (IS_ERR(data->clk)) {
+	data->clk_ahb = devm_clk_get(&pdev->dev, "ahb");
+	if (IS_ERR(data->clk_ahb)) {
 		dev_err(&pdev->dev,
-			"failed to get clock, err=%ld\n", PTR_ERR(data->clk));
-		return PTR_ERR(data->clk);
+			"failed to get ahb clock, err=%ld\n", PTR_ERR(data->clk_ahb));
+		return PTR_ERR(data->clk_ahb);
 	}
 
-	ret = clk_prepare_enable(data->clk);
-	if (ret) {
+	data->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
+	if (IS_ERR(data->clk_ipg)) {
 		dev_err(&pdev->dev,
-			"clk_prepare_enable failed, err=%d\n", ret);
-		return ret;
+			"failed to get ipg clock, err=%ld\n", PTR_ERR(data->clk_ipg));
+		return PTR_ERR(data->clk_ipg);
 	}
 
+	data->clk_per = devm_clk_get(&pdev->dev, "per");
+	if (IS_ERR(data->clk_per)) {
+		dev_err(&pdev->dev,
+			"failed to get per clock, err=%ld\n", PTR_ERR(data->clk_per));
+		return PTR_ERR(data->clk_per);
+	}
+
+	ret = clk_prepare_enable(data->clk_ahb);
+	if (ret)
+		return ret;
+
+	ret = clk_prepare_enable(data->clk_ipg);
+	if (ret)
+		goto err_ipg_failed;
+
+	ret = clk_prepare_enable(data->clk_per);
+	if (ret)
+		goto err_per_failed;
+
 	tmp_dev = (struct of_device_id *)
 		of_match_device(usbmisc_imx_dt_ids, &pdev->dev);
 	data->ops = (const struct usbmisc_ops *)tmp_dev->data;
 	usbmisc = data;
 	ret = usbmisc_set_ops(data->ops);
-	if (ret) {
-		usbmisc = NULL;
-		clk_disable_unprepare(data->clk);
-		return ret;
-	}
+	if (ret)
+		goto err_set_ops_failed;
 
 	return 0;
+
+ err_set_ops_failed:
+	usbmisc = NULL;
+	clk_disable_unprepare(data->clk_per);
+ err_per_failed:
+	clk_disable_unprepare(data->clk_ipg);
+ err_ipg_failed:
+	clk_disable_unprepare(data->clk_ahb);
+
+	return ret;
 }
 
 static int __devexit usbmisc_imx_remove(struct platform_device *pdev)
 {
 	usbmisc_unset_ops(usbmisc->ops);
-	clk_disable_unprepare(usbmisc->clk);
+	clk_disable_unprepare(usbmisc->clk_per);
+	clk_disable_unprepare(usbmisc->clk_ipg);
+	clk_disable_unprepare(usbmisc->clk_ahb);
 	usbmisc = NULL;
 	return 0;
 }

Signature · 6 lines

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 5 lines · Michael Grzeschik

From: Marc Kleine-Budde <[email protected]>

This patch adds support for a second and third clock to the usbmisc driver. On modern freescale ARM cores like the imx51, imx53 and imx6q three clocks ("ahb", "ipg" and "per") must be enabled in order to access the USB core.

The imx6q usb's clock structure is different with old mxc serials (mx3x, mx5x) due to different PHY. This patch will cause mx6q's probe fail, the message like below:

imx_usb 2184000.usb: Failed to get clock, err=-2
imx_usb: probe of 2184000.usb failed with error -2

The mx5x (50, 51, 53) and mx6q's clock structure like below:

mx5x:
- usboh3_ipg_ahb: CCGR2(index13), used to access register (like your ahb)

- usboh3_60M: CCGR2(index14), used to access register at serial phy mode as the phy is at serial mode, we need to use it at the first before the phy goes to other modes.
(like your ipg)

usbphy: used to transfer data
(like your per)

mx6q:
- usboh3(Index 162 at DT), used to access register
- usbphy(Index 182 for otg port at DT), at phy controller

So, we may consider a way to consolidate both mx6q (mx28) and mxc (mx5x, mx3x) platforms.

Quoted 2 lines

usbphy: used to transfer data
(like your per)

The "per" clk is a different clk than the usbphy. We have an usbphy clk aswell on the mx5x. As discussed before [1], we need a solution to enable the usbphy clk. The current approach is to let the nop-xceiver enable this.

[1] http://www.spinics.net/lists/linux-usb/msg74489.html

Quoted 4 lines

mx6q:
- usboh3(Index 162 at DT), used to access register
- usbphy(Index 182 for otg port at DT), at phy controller

Quoted 2 lines

So, we may consider a way to consolidate both mx6q (mx28) and mxc (mx5x, mx3x) platforms.

Yes, we will discuss a real clktree solution in the usbmisc driver for the different cores. The first thoughts are, that the clk configuration has completely to be done inside the usbmisc driver. For this, the usbmisc needs to become a hard dependency for the ci13xxx_imx glue code.

Regards,
Michael

Signature · 4 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Quoted 8 lines · Michael Grzeschik

Quoted 2 lines

usbphy: used to transfer data
(like your per)

The "per" clk is a different clk than the usbphy. We have an usbphy clk aswell on the mx5x. As discussed before [1], we need a solution to enable the usbphy clk. The current approach is to let the nop-xceiver enable this.

Quoted 1 line

[1] http://www.spinics.net/lists/linux-usb/msg74489.html

It does not matter which the name is, this clock is related to usb 480M or its source. We use nop-xceiver is just to create struct usb_otg and usb_phy. Clock information can be at imx specific file like cil13xxx_imx.

Quoted 5 lines

Quoted 4 lines

mx6q:
- usboh3(Index 162 at DT), used to access register
- usbphy(Index 182 for otg port at DT), at phy controller

Quoted 7 lines

Quoted 2 lines

So, we may consider a way to consolidate both mx6q (mx28) and mxc (mx5x, mx3x) platforms.

Yes, we will discuss a real clktree solution in the usbmisc driver for the different cores. The first thoughts are, that the clk configuration has completely to be done inside the usbmisc driver. For this, the usbmisc needs to become a hard dependency for the ci13xxx_imx glue code.

For my mind, imx usb clock handling is better only at place, that is cil13xxx_imx. We can have imx_clk_enable and imx_clk_disable in it, and handling clk in imx_clk_enable using id_table or what else platform specific.

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644

Hello.

Quoted 19 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 

drivers/usb/chipidea/usbmisc_imx.c line 24

Quoted 5 lines

drivers/usb/chipidea/usbmisc_imx.c +3 -0

 #define USB_DEV_MAX 4
 
+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;

Semicolons here? This can't be right.

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 

drivers/usb/chipidea/usbmisc_imx.c +44 -0

 struct imx_usbmisc {

@@ -54,6 +61,45 @@ static struct usbmisc_usb_device *get_usbdev(struct device *dev)
 	return &usbmisc->usbdev[i];
 }
 
+static int usbmisc_imx53_init(struct device *dev)
+{
+	struct usbmisc_usb_device *usbdev;
+	void __iomem *reg;
+	unsigned long flags;
+	u32 val;
+
+	usbdev = get_usbdev(dev);
+	if (IS_ERR(usbdev))
+		return PTR_ERR(usbdev);
+
+	if (usbdev->disable_oc) {
+		spin_lock_irqsave(&usbmisc->lock, flags);
+		switch (usbdev->index) {
+		case 0:
+			reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+			val = readl(reg) | MX53_BM_OVER_CUR_DIS_OTG;
+			break;
+		case 1:
+			reg = usbmisc->base + MX53_USB_OTG_PHY_CTRL_0_OFFSET;
+			val = readl(reg) | MX53_BM_OVER_CUR_DIS_H1;
+			break;
+		case 2:
+			reg = usbmisc->base + MX53_USB_UH2_CTRL_OFFSET;
+			val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+			break;
+		case 3:
+			reg = usbmisc->base + MX53_USB_UH3_CTRL_OFFSET;
+			val = readl(reg) | MX53_BM_OVER_CUR_DIS_UHx;
+			break;
+		}
+		if (reg && val)
+			writel(val, reg);
+		spin_unlock_irqrestore(&usbmisc->lock, flags);
+	}
+
+	return 0;
+}
+
 static int usbmisc_imx6q_init(struct device *dev)
 {
 

@@ -76,11 +122,16 @@ static int usbmisc_imx6q_init(struct device *dev)
 	return 0;
 }
 
+static const struct usbmisc_ops imx53_usbmisc_ops = {
+	.init = usbmisc_imx53_init,
+};
+
 static const struct usbmisc_ops imx6q_usbmisc_ops = {
 	.init = usbmisc_imx6q_init,
 };
 
 static const struct of_device_id usbmisc_imx_dt_ids[] = {
+	{ .compatible = "fsl,imx53-usbmisc", .data = (void *)&imx53_usbmisc_ops },
 	{ .compatible = "fsl,imx6q-usbmisc", .data = (void *)&imx6q_usbmisc_ops },
 	{ /* sentinel */ }
 };

Signature · 6 lines

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Quoted 21 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 
 #define USB_DEV_MAX 4
 

drivers/usb/chipidea/usbmisc_imx.c line 29

Quoted 8 lines

drivers/usb/chipidea/usbmisc_imx.c +7 -0

+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;
+#define MX53_BM_OVER_CUR_DIS_H1		BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG	BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx	BIT(30)
+
 #define MX6_BM_OVER_CUR_DIS		BIT(7)

As every SoC platform's non-core register mapping is different, it is better to use .h to put register bit definition

Quoted 22 lines · Peter Chen

Quoted 21 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 
 #define USB_DEV_MAX 4
 

Quoted 11 lines

drivers/usb/chipidea/usbmisc_imx.c line 29

Quoted 8 lines

drivers/usb/chipidea/usbmisc_imx.c +7 -0

+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;
+#define MX53_BM_OVER_CUR_DIS_H1		BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG	BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx	BIT(30)
+
 #define MX6_BM_OVER_CUR_DIS		BIT(7)

As every SoC platform's non-core register mapping is different, it is better to use .h to put register bit definition

What do the different register mapping have to do with putting the definitions in .h files or not?

Sascha

Signature · 4 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Quoted 21 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 
 #define USB_DEV_MAX 4
 

drivers/usb/chipidea/usbmisc_imx.c line 29

Quoted 8 lines

drivers/usb/chipidea/usbmisc_imx.c +7 -0

+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;
+#define MX53_BM_OVER_CUR_DIS_H1		BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG	BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx	BIT(30)
+
 #define MX6_BM_OVER_CUR_DIS		BIT(7)

As every SoC platform's non-core register mapping is different, it is better to use .h to put register bit definition

Quoted 22 lines · Peter Chen

Quoted 21 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 
 #define USB_DEV_MAX 4
 

Quoted 11 lines

drivers/usb/chipidea/usbmisc_imx.c line 29

Quoted 8 lines

drivers/usb/chipidea/usbmisc_imx.c +7 -0

+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;
+#define MX53_BM_OVER_CUR_DIS_H1		BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG	BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx	BIT(30)
+
 #define MX6_BM_OVER_CUR_DIS		BIT(7)

As every SoC platform's non-core register mapping is different, it is better to use .h to put register bit definition

AFAIK in the kernel we don't make extra .h files any more, if there is only a single user of the contents.

Marc

Signature · 4 lines

Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

Quoted 35 lines · Marc Kleine-Budde

Quoted 33 lines · Peter Chen

Quoted 19 lines · Michael Grzeschik

This adds mx53 as the next user of the usbmisc driver and makes it possible to disable the overcurrent-detection of the internal phy.

Signed-off-by Michael Grzeschik <[email protected]>

Signed-off-by Marc Kleine-Budde <[email protected]>

---
Changes since v2:
* added defines for register offsets and bitmasks
* fixed disable_oc option for all ports

 drivers/usb/chipidea/usbmisc_imx.c |   51 ++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

drivers/usb/chipidea/usbmisc_imx.c +0 -0

index e090e0f..b1811df 100644
@@ -19,6 +19,13 @@
 

drivers/usb/chipidea/usbmisc_imx.c line 29

Quoted 10 lines

drivers/usb/chipidea/usbmisc_imx.c +7 -0

 #define USB_DEV_MAX 4
 
+#define MX53_USB_OTG_PHY_CTRL_0_OFFSET	0x08;
+#define MX53_USB_UH2_CTRL_OFFSET	0x14;
+#define MX53_USB_UH3_CTRL_OFFSET	0x18;
+#define MX53_BM_OVER_CUR_DIS_H1		BIT(5)
+#define MX53_BM_OVER_CUR_DIS_OTG	BIT(8)
+#define MX53_BM_OVER_CUR_DIS_UHx	BIT(30)
+
 #define MX6_BM_OVER_CUR_DIS		BIT(7)

As every SoC platform's non-core register mapping is different, it is better to use .h to put register bit definition

Quoted 2 lines

AFAIK in the kernel we don't make extra .h files any more, if there is only a single user of the contents.

OK, if it is the current rule for kernel, then just keep it. My original mind was there will be more and more bit definition in future, and move it to .h to make the code clean and short.

This adds a post handling routine which is called after ci13xxx_add_device was called. The first user is the mx25, which has to disable the external-vbus-divider after the ude has started.

drivers/usb/chipidea/usbmisc_imx.c +9 -0

+static int usbmisc_imx25_post(struct device *dev)
+{
+	struct usbmisc_usb_device *usbdev;
+	void __iomem *reg;
+	unsigned long flags;
+	u32 val;
+
+	usbdev = get_usbdev(dev);
+	if (IS_ERR(usbdev))

drivers/usb/chipidea/usbmisc_imx.c +10 -0

+	}
+
+	return 0;
+}
+
 static int usbmisc_imx53_init(struct device *dev)
 {
 	struct usbmisc_usb_device *usbdev;

@@ -122,6 +150,10 @@ static int usbmisc_imx6q_init(struct device *dev)
 	return 0;
 }
 
+static const struct usbmisc_ops imx25_usbmisc_ops = {
+	.post = usbmisc_imx25_post,
+};
+
 static const struct usbmisc_ops imx53_usbmisc_ops = {
 	.init = usbmisc_imx53_init,
 };

@@ -131,6 +163,7 @@ static const struct usbmisc_ops imx6q_usbmisc_ops = {
 };
 
 static const struct of_device_id usbmisc_imx_dt_ids[] = {
+	{ .compatible = "fsl,imx25-usbmisc", .data = (void *)&imx25_usbmisc_ops },
 	{ .compatible = "fsl,imx53-usbmisc", .data = (void *)&imx53_usbmisc_ops },
 	{ .compatible = "fsl,imx6q-usbmisc", .data = (void *)&imx6q_usbmisc_ops },
 	{ /* sentinel */ }

Signature · 6 lines

1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Nearly every SoC from Freescale has this non-core usb registers. This series adds support for more users of this driver.

This series is based on Peter Chen's work. Its needed to merge his master branch before applying this series:

https://github.com/hzpeterchen/linux-usb.git

Marc Kleine-Budde (4):
usb: chipidea: usbmisc: unset global varibale usbmisc on driver
remove
usb: chipidea: usbmisc: fix a potential race condition
usb: chipidea: usbmisc: prepare driver to handle more than one soc
usb: chipidea: usbmisc: add support for ahb, ipg and per clock

Michael Grzeschik (3):
usb: chipidea: usbmisc: rename file, struct and functions to
usbmisc_imx
usb: chipidea: usbmisc: add mx53 support
usb: chipidea: usbmisc: add post handling and errata fix for mx25

Quoted 15 lines · Michael Grzeschik

Nearly every SoC from Freescale has this non-core usb registers. This series adds support for more users of this driver.

This series is based on Peter Chen's work. Its needed to merge his master branch before applying this series:

https://github.com/hzpeterchen/linux-usb.git

Marc Kleine-Budde (4):
usb: chipidea: usbmisc: unset global varibale usbmisc on driver
remove
usb: chipidea: usbmisc: fix a potential race condition
usb: chipidea: usbmisc: prepare driver to handle more than one soc
usb: chipidea: usbmisc: add support for ahb, ipg and per clock

Quoted 5 lines

Michael Grzeschik (3):
usb: chipidea: usbmisc: rename file, struct and functions to
usbmisc_imx
usb: chipidea: usbmisc: add mx53 support
usb: chipidea: usbmisc: add post handling and errata fix for mx25

Cc'ing Peter Chen, in case he didn't see this. Peter, can you have a look and give your Tested-by/Reviewed-by where appropriate?

Regards,
--
Alex