ARM: dts: mx25: USB block requires only one clock

Signed-off-by Denis Carikli <[email protected]>

---

Changelog v1->v2:
- converted two remaining defines to BIT()
- Removed a variable declaration that was not used in usbmisc_imx25_init

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

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

index cd061ab..3523c09 100644

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

+#define MX25_OTG_SIC_SHIFT		29
+#define MX25_OTG_SIC_MASK		(0x3 << MX25_OTG_SIC_SHIFT)
+#define MX25_OTG_PM_BIT			BIT(24)
+#define MX25_OTG_PP_BIT			BIT(11)
+#define MX25_OTG_OCPOL_BIT		BIT(3)
+
+#define MX25_H1_SIC_SHIFT		21
+#define MX25_H1_SIC_MASK		(0x3 << MX25_H1_SIC_SHIFT)
+#define MX25_H1_PP_BIT			BIT(18)
+#define MX25_H1_PM_BIT			BIT(16)
+#define MX25_H1_IPPUE_UP_BIT		BIT(7)
+#define MX25_H1_IPPUE_DOWN_BIT		BIT(6)
+#define MX25_H1_TLL_BIT			BIT(5)
+#define MX25_H1_USBTE_BIT		BIT(4)
+#define MX25_H1_OCPOL_BIT		BIT(2)
+
 #define MX27_H1_PM_BIT			BIT(8)
 #define MX27_H2_PM_BIT			BIT(16)
 #define MX27_OTG_PM_BIT			BIT(24)

@@ -50,6 +70,39 @@ struct imx_usbmisc {
 
 static struct imx_usbmisc *usbmisc;
 
+static int usbmisc_imx25_init(struct imx_usbmisc_data *data)
+{
+	unsigned long flags;
+	u32 val = 0;
+
+	if (data->index > 1)
+		return -EINVAL;
+
+	spin_lock_irqsave(&usbmisc->lock, flags);
+	switch (data->index) {
+	case 0:
+		val = readl(usbmisc->base);
+		val &= ~(MX25_OTG_SIC_MASK | MX25_OTG_PP_BIT);
+		val |= (MXC_EHCI_INTERFACE_DIFF_UNI & MXC_EHCI_INTERFACE_MASK) << MX25_OTG_SIC_SHIFT;
+		val |= (MX25_OTG_PM_BIT | MX25_OTG_OCPOL_BIT);
+		writel(val, usbmisc->base);
+		break;
+	case 1:
+		val = readl(usbmisc->base);
+		val &= ~(MX25_H1_SIC_MASK | MX25_H1_PP_BIT |  MX25_H1_IPPUE_UP_BIT);
+		val |= (MXC_EHCI_INTERFACE_SINGLE_UNI & MXC_EHCI_INTERFACE_MASK) << MX25_H1_SIC_SHIFT;
+		val |= (MX25_H1_PM_BIT | MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT |
+			MX25_H1_USBTE_BIT | MX25_H1_IPPUE_DOWN_BIT);
+
+		writel(val, usbmisc->base);
+
+		break;
+	}
+	spin_unlock_irqrestore(&usbmisc->lock, flags);
+
+	return 0;
+}
+
 static int usbmisc_imx25_post(struct imx_usbmisc_data *data)
 {
 	void __iomem *reg;

@@ -159,6 +212,7 @@ static int usbmisc_imx6q_init(struct imx_usbmisc_data *data)
 }
 
 static const struct usbmisc_ops imx25_usbmisc_ops = {
+	.init = usbmisc_imx25_init,
 	.post = usbmisc_imx25_post,
 };
 

@@ -200,6 +254,10 @@ static const struct of_device_id usbmisc_imx_dt_ids[] = {
 		.data = &imx25_usbmisc_ops,
 	},
 	{
+		.compatible = "fsl,imx35-usbmisc",
+		.data = &imx25_usbmisc_ops,
+	},
+	{
 		.compatible = "fsl,imx27-usbmisc",
 		.data = &imx27_usbmisc_ops,
 	},

Signature · 6 lines

1.7.9.5

--
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

From: Fabio Estevam <[email protected]>

This patch was adapted from the thread named
"USB Host support for mx25" on linux-usb at vger.kernel.org

Signed-off-by Denis Carikli <[email protected]>

---
Changelog v1->v2:
- The usbphy nodes were made to look like the ones in imx53.dtsi
- The patch was rebased on top of the clock fixes commits.

---
 arch/arm/boot/dts/imx25.dtsi |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

arch/arm/boot/dts/imx25.dtsi +6 -11

index 829791e..16bc571 100644
@@ -482,22 +482,13 @@
                                clocks = <&clks 99>;
                        };
 
-                       usbphy1: usbphy at 1 {
-                               compatible = "nop-usbphy";
-                               status = "disabled";
-                       };
-
-                       usbphy2: usbphy at 2 {
-                               compatible = "nop-usbphy";
-                               status = "disabled";
-                       };
-
                        usbotg: usb at 53ff4000 {
                                compatible = "fsl,imx25-usb", "fsl,imx27-usb";
                                reg = <0x53ff4000 0x0200>;
                                interrupts = <37>;
                                clocks = <&clks 70>;
                                fsl,usbmisc = <&usbmisc 0>;
+                               fsl,usbphy = <&usbphy1>;
                                status = "disabled";
                        };
 

@@ -507,6 +498,7 @@
                                interrupts = <35>;
                                clocks = <&clks 70>;
                                fsl,usbmisc = <&usbmisc 1>;
+                               fsl,usbphy = <&usbphy2>;
                                status = "disabled";
                        };
 

@@ -516,7 +508,6 @@
                                clocks = <&clks 9>, <&clks 70>, <&clks 8>;
                                clock-names = "ipg", "ahb", "per";
                                reg = <0x53ff4600 0x00f>;
-                               status = "disabled";
                        };
 
                        dryice at 53ffc000 {

@@ -548,4 +539,18 @@
                        };
                };
        };
+
+       usbphy {
+               #address-cells = <1>;
+               #size-cells = <0>;

From: Fabio Estevam <[email protected]>

This patch was adapted from the thread named
"USB Host support for mx25" on linux-usb at vger.kernel.org

Signed-off-by Denis Carikli <[email protected]>

Signed-off-by Denis Carikli <[email protected]>

---
Changelog v1->v2:
- The usbphy nodes were made to look like the ones in imx53.dtsi
- The patch was rebased on top of the clock fixes commits.

---
  arch/arm/boot/dts/imx35.dtsi |   16 ++++++++++++++++
  1 file changed, 16 insertions(+)

arch/arm/boot/dts/imx35.dtsi +0 -0

index 474a73d..b943123 100644