usb: lpc32xx: add i2c DM support

PATCH Superseded Sylvain Lemieux 3 participants 4 messages Apr 26, 2017 – May 1, 2017

Subsystems (3)

USB Arm/LPC32XX SoC support USB ohci driver

lore

Share & tools

lore

Sylvain Lemieux

author

2017-04-26 11:57 UTC #0 lore raw

PATCH v3 1/1 usb: lpc32xx: add i2c DM support

From: Liam Beguin <[email protected]>

Add DM support for i2c functions.

Signed-off-by Liam Beguin <[email protected]>

Signed-off-by Sylvain Lemieux <[email protected]>

---
Changes from v2 to v3:
* Code clean-up to remove conditional compile else section (CONFIG_DM_I2C).
* As suggested by Marek, added Simon Glass to the list of cc for the patch.

Changes from v1 to v2:
* Do not request udevice on each single i2c write.

Note:
* This patch is require as part of the DM support of the LPC32xx I2C driver. All I2C drivers should be converted, to DM, by the end of June 2017.

* The USB driver is supporting the DM and non-DM API.

* Once the ustream LPC32xx boards (devkit3250 & work_92105) are migrated to DM (I2C), the non-DM API support can be remove from this driver.

 drivers/usb/host/ohci-lpc32xx.c | 64 +++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)

drivers/usb/host/ohci-lpc32xx.c +46 ~~-18~~

index 9245126ed6..c0c423b994 100644
@@ -14,8 +14,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <dm.h>
 
 /* OTG I2C controller module register structures */
 struct otgi2c_regs {

@@ -81,14 +83,20 @@ struct otg_regs {
 static struct otg_regs *otg = (struct otg_regs *)USB_BASE;
 static struct clk_pm_regs *clk_pwr = (struct clk_pm_regs *)CLK_PM_BASE;
 
-static int isp1301_set_value(int reg, u8 value)
+static int isp1301_set_value(struct udevice *dev, int reg, u8 value)
 {
+#ifndef CONFIG_DM_I2C
 	return i2c_write(ISP1301_I2C_ADDR, reg, 1, &value, 1);
+#else
+	return dm_i2c_write(dev, reg, &value, 1);
+#endif
 }
 
-static void isp1301_configure(void)
+static void isp1301_configure(struct udevice *dev)
 {
+#ifndef CONFIG_DM_I2C
 	i2c_set_bus_num(I2C_2);
+#endif
 
 	/*
 	 * LPC32XX only supports DAT_SE0 USB mode

@@ -96,23 +104,23 @@ static void isp1301_configure(void)
 	 */
 
 	/* Disable transparent UART mode first */
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
 
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_SET,
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_SET,
 			  MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
 
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET,
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET,
 			  OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR,
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR,
 			  OTG1_DM_PULLUP | OTG1_DP_PULLUP);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
 
 	/* Enable usb_need_clk clock after transceiver is initialized */
 	setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_USBDVND_EN);

@@ -149,6 +157,15 @@ static int usbpll_setup(void)
 int usb_cpu_init(void)
 {
 	u32 ret;
+	struct udevice *dev = NULL;
+
+#ifdef CONFIG_DM_I2C
+	ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+	if (ret) {
+		debug("%s: No bus %d\n", __func__, I2C_2);
+		return ret;
+	}
+#endif
 
 	/*
 	 * USB pins routing setup is done by "lpc32xx_usb_init()" and should

@@ -167,7 +184,7 @@ int usb_cpu_init(void)
 		return ret;
 
 	/* Configure ISP1301 */
-	isp1301_configure();
+	isp1301_configure(dev);
 
 	/* setup USB clocks and PLL */
 	ret = usbpll_setup();

@@ -188,21 +205,32 @@ int usb_cpu_init(void)
 		return ret;
 
 	setbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
 	return 0;
 }
 
 int usb_cpu_stop(void)
 {
+	struct udevice *dev = NULL;
+	int ret = 0;
+
+#ifdef CONFIG_DM_I2C
+	ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+	if (ret) {
+		debug("%s: No bus %d\n", __func__, I2C_2);
+		return ret;
+	}
+#endif
+
 	/* vbus off */
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
 	clrbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
 
 	clrbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_HCLK_EN);
 
-	return 0;
+	return ret;
 }
 
 int usb_cpu_init_fail(void)

Signature · 1 line

2.11.0

Marek Vasut

2017-04-26 12:38 UTC #1 lore raw

PATCH v3 1/1 usb: lpc32xx: add i2c DM support

Quoted 6 lines · Sylvain Lemieux

From: Liam Beguin <[email protected]>
Add DM support for i2c functions.
Signed-off-by Liam Beguin <[email protected]>
Signed-off-by Sylvain Lemieux <[email protected]>

Reviewed-by Marek Vasut <[email protected]>

Quoted 156 lines

---
Changes from v2 to v3:
* Code clean-up to remove conditional compile else section (CONFIG_DM_I2C).
* As suggested by Marek, added Simon Glass to the list of cc for the patch.

Changes from v1 to v2:
* Do not request udevice on each single i2c write.

Note:
* This patch is require as part of the DM support of the LPC32xx I2C driver. All I2C drivers should be converted, to DM, by the end of June 2017.

* The USB driver is supporting the DM and non-DM API.

* Once the ustream LPC32xx boards (devkit3250 & work_92105) are migrated to DM (I2C), the non-DM API support can be remove from this driver.

 drivers/usb/host/ohci-lpc32xx.c | 64 +++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)

drivers/usb/host/ohci-lpc32xx.c +46 ~~-18~~

index 9245126ed6..c0c423b994 100644
@@ -14,8 +14,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <dm.h>
 
 /* OTG I2C controller module register structures */
 struct otgi2c_regs {

@@ -81,14 +83,20 @@ struct otg_regs {
 static struct otg_regs *otg = (struct otg_regs *)USB_BASE;
 static struct clk_pm_regs *clk_pwr = (struct clk_pm_regs *)CLK_PM_BASE;
 
-static int isp1301_set_value(int reg, u8 value)
+static int isp1301_set_value(struct udevice *dev, int reg, u8 value)
 {
+#ifndef CONFIG_DM_I2C
 	return i2c_write(ISP1301_I2C_ADDR, reg, 1, &value, 1);
+#else
+	return dm_i2c_write(dev, reg, &value, 1);
+#endif
 }
 
-static void isp1301_configure(void)
+static void isp1301_configure(struct udevice *dev)
 {
+#ifndef CONFIG_DM_I2C
 	i2c_set_bus_num(I2C_2);
+#endif
 
 	/*
 	 * LPC32XX only supports DAT_SE0 USB mode

@@ -96,23 +104,23 @@ static void isp1301_configure(void)
 	 */
 
 	/* Disable transparent UART mode first */
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
 
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_SET,
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_SET,
 			  MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
 
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET,
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET,
 			  OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR,
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR,
 			  OTG1_DM_PULLUP | OTG1_DP_PULLUP);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
-	isp1301_set_value(ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
+	isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
 
 	/* Enable usb_need_clk clock after transceiver is initialized */
 	setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_USBDVND_EN);

@@ -149,6 +157,15 @@ static int usbpll_setup(void)
 int usb_cpu_init(void)
 {
 	u32 ret;
+	struct udevice *dev = NULL;
+
+#ifdef CONFIG_DM_I2C
+	ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+	if (ret) {
+		debug("%s: No bus %d\n", __func__, I2C_2);
+		return ret;
+	}
+#endif
 
 	/*
 	 * USB pins routing setup is done by "lpc32xx_usb_init()" and should

@@ -167,7 +184,7 @@ int usb_cpu_init(void)
 		return ret;
 
 	/* Configure ISP1301 */
-	isp1301_configure();
+	isp1301_configure(dev);
 
 	/* setup USB clocks and PLL */
 	ret = usbpll_setup();

@@ -188,21 +205,32 @@ int usb_cpu_init(void)
 		return ret;
 
 	setbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
 	return 0;
 }
 
 int usb_cpu_stop(void)
 {
+	struct udevice *dev = NULL;
+	int ret = 0;
+
+#ifdef CONFIG_DM_I2C
+	ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+	if (ret) {
+		debug("%s: No bus %d\n", __func__, I2C_2);
+		return ret;
+	}
+#endif
+
 	/* vbus off */
-	isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+	isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
 	clrbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
 
 	clrbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_HCLK_EN);
 
-	return 0;
+	return ret;
 }
 
 int usb_cpu_init_fail(void)

Signature · 2 lines

Best regards,
Marek Vasut

Simon Glass

2017-04-29 00:28 UTC #2 lore raw

PATCH v3 1/1 usb: lpc32xx: add i2c DM support

In reply to Sylvain Lemieux

Hi,

Quoted 31 lines · Sylvain Lemieux

From: Liam Beguin <[email protected]>
Add DM support for i2c functions.
Signed-off-by Liam Beguin <[email protected]>
Signed-off-by Sylvain Lemieux <[email protected]>
---
Changes from v2 to v3:
* Code clean-up to remove conditional compile else section (CONFIG_DM_I2C).
* As suggested by Marek, added Simon Glass to the list of cc for the patch.
Changes from v1 to v2:
* Do not request udevice on each single i2c write.
Note:
* This patch is require as part of the DM support of the LPC32xx I2C driver. All I2C drivers should be converted, to DM, by the end of June 2017.
* The USB driver is supporting the DM and non-DM API.
* Once the ustream LPC32xx boards (devkit3250 & work_92105) are migrated to DM (I2C), the non-DM API support can be remove from this driver.
 drivers/usb/host/ohci-lpc32xx.c | 64 +++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)
drivers/usb/host/ohci-lpc32xx.c +0 -0
index 9245126ed6..c0c423b994 100644

drivers/usb/host/ohci-lpc32xx.c line 20

Quoted 7 lines

drivers/usb/host/ohci-lpc32xx.c +2 -0

@@ -14,8 +14,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <dm.h>

Please check header file order.

http://www.denx.de/wiki/U-Boot/CodingStyle

Quoted 63 lines

drivers/usb/host/ohci-lpc32xx.c +20 ~~-14~~

 /* OTG I2C controller module register structures */
 struct otgi2c_regs {

@@ -81,14 +83,20 @@ struct otg_regs {
 static struct otg_regs *otg = (struct otg_regs *)USB_BASE;
 static struct clk_pm_regs *clk_pwr = (struct clk_pm_regs *)CLK_PM_BASE;
 
-static int isp1301_set_value(int reg, u8 value)
+static int isp1301_set_value(struct udevice *dev, int reg, u8 value)
 {
+#ifndef CONFIG_DM_I2C
        return i2c_write(ISP1301_I2C_ADDR, reg, 1, &value, 1);
+#else
+       return dm_i2c_write(dev, reg, &value, 1);
+#endif
 }
 
-static void isp1301_configure(void)
+static void isp1301_configure(struct udevice *dev)
 {
+#ifndef CONFIG_DM_I2C
        i2c_set_bus_num(I2C_2);
+#endif
 
        /*
         * LPC32XX only supports DAT_SE0 USB mode

@@ -96,23 +104,23 @@ static void isp1301_configure(void)
         */
 
        /* Disable transparent UART mode first */
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
 
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_SET,
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_SET,
                          MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
 
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET,
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET,
                          OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR,
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR,
                          OTG1_DM_PULLUP | OTG1_DP_PULLUP);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
 
        /* Enable usb_need_clk clock after transceiver is initialized */
        setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_USBDVND_EN);

drivers/usb/host/ohci-lpc32xx.c static int usbpll_setup(void) · line 163

Quoted 7 lines

drivers/usb/host/ohci-lpc32xx.c +4 -0

@@ -149,6 +157,15 @@ static int usbpll_setup(void)
 int usb_cpu_init(void)
 {
        u32 ret;
+       struct udevice *dev = NULL;
+
+#ifdef CONFIG_DM_I2C
+       ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);

Can you pick this up from the device tree?

Quoted 54 lines

drivers/usb/host/ohci-lpc32xx.c +20 -5

+       if (ret) {
+               debug("%s: No bus %d\n", __func__, I2C_2);
+               return ret;
+       }
+#endif
 
        /*
         * USB pins routing setup is done by "lpc32xx_usb_init()" and should

@@ -167,7 +184,7 @@ int usb_cpu_init(void)
                return ret;
 
        /* Configure ISP1301 */
-       isp1301_configure();
+       isp1301_configure(dev);
 
        /* setup USB clocks and PLL */
        ret = usbpll_setup();

@@ -188,21 +205,32 @@ int usb_cpu_init(void)
                return ret;
 
        setbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
        return 0;
 }
 
 int usb_cpu_stop(void)
 {
+       struct udevice *dev = NULL;
+       int ret = 0;
+
+#ifdef CONFIG_DM_I2C
+       ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+       if (ret) {
+               debug("%s: No bus %d\n", __func__, I2C_2);
+               return ret;
+       }
+#endif
+
        /* vbus off */
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
        clrbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
 
        clrbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_HCLK_EN);
 
-       return 0;
+       return ret;
 }
 
 int usb_cpu_init_fail(void)
--

Quoted 2 lines

2.11.0

Regards,
Simon

Sylvain Lemieux

author

2017-05-01 14:41 UTC #3 lore raw

PATCH v3 1/1 usb: lpc32xx: add i2c DM support

Hi,

Quoted 44 lines · Simon Glass

Hi,
Quoted 31 lines · Sylvain Lemieux
From: Liam Beguin <[email protected]>
Add DM support for i2c functions.
Signed-off-by Liam Beguin <[email protected]>
Signed-off-by Sylvain Lemieux <[email protected]>
---
Changes from v2 to v3:
* Code clean-up to remove conditional compile else section (CONFIG_DM_I2C).
* As suggested by Marek, added Simon Glass to the list of cc for the patch.
Changes from v1 to v2:
* Do not request udevice on each single i2c write.
Note:
* This patch is require as part of the DM support of the LPC32xx I2C driver. All I2C drivers should be converted, to DM, by the end of June 2017.
* The USB driver is supporting the DM and non-DM API.
* Once the ustream LPC32xx boards (devkit3250 & work_92105) are migrated to DM (I2C), the non-DM API support can be remove from this driver.
 drivers/usb/host/ohci-lpc32xx.c | 64 +++++++++++++++++++++++++++++------------
 1 file changed, 46 insertions(+), 18 deletions(-)
drivers/usb/host/ohci-lpc32xx.c +0 -0
index 9245126ed6..c0c423b994 100644
drivers/usb/host/ohci-lpc32xx.c line 20
Quoted 7 lines
drivers/usb/host/ohci-lpc32xx.c +2 -0
@@ -14,8 +14,10 @@
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
+#include <asm/arch/i2c.h>
 #include <usb.h>
 #include <i2c.h>
+#include <dm.h>
Please check header file order.

Quoted 2 lines

http://www.denx.de/wiki/U-Boot/CodingStyle

I will submit a revision 4.

Quoted 60 lines

drivers/usb/host/ohci-lpc32xx.c +20 ~~-14~~

 /* OTG I2C controller module register structures */
 struct otgi2c_regs {

@@ -81,14 +83,20 @@ struct otg_regs {
 static struct otg_regs *otg = (struct otg_regs *)USB_BASE;
 static struct clk_pm_regs *clk_pwr = (struct clk_pm_regs *)CLK_PM_BASE;
 
-static int isp1301_set_value(int reg, u8 value)
+static int isp1301_set_value(struct udevice *dev, int reg, u8 value)
 {
+#ifndef CONFIG_DM_I2C
        return i2c_write(ISP1301_I2C_ADDR, reg, 1, &value, 1);
+#else
+       return dm_i2c_write(dev, reg, &value, 1);
+#endif
 }
 
-static void isp1301_configure(void)
+static void isp1301_configure(struct udevice *dev)
 {
+#ifndef CONFIG_DM_I2C
        i2c_set_bus_num(I2C_2);
+#endif
 
        /*
         * LPC32XX only supports DAT_SE0 USB mode

@@ -96,23 +104,23 @@ static void isp1301_configure(void)
         */
 
        /* Disable transparent UART mode first */
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, MC1_UART_EN);
 
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_2_SET,
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_CLR, ~MC1_SPEED_REG);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_SPEED_REG);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_2_SET,
                          MC2_BI_DI | MC2_PSW_EN | MC2_SPD_SUSP_CTRL);
 
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET,
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_MODE_CONTROL_1_SET, MC1_DAT_SE0);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET,
                          OTG1_DM_PULLDOWN | OTG1_DP_PULLDOWN);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_CLR,
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_CLR,
                          OTG1_DM_PULLUP | OTG1_DP_PULLUP);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
-       isp1301_set_value(ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_LATCH_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_FALLING_CLR, ~0);
+       isp1301_set_value(dev, ISP1301_I2C_INTERRUPT_RISING_CLR, ~0);

Quoted 13 lines

drivers/usb/host/ohci-lpc32xx.c static int usbpll_setup(void) · line 163

Quoted 10 lines

drivers/usb/host/ohci-lpc32xx.c +4 -0

        /* Enable usb_need_clk clock after transceiver is initialized */
        setbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_USBDVND_EN);

@@ -149,6 +157,15 @@ static int usbpll_setup(void)
 int usb_cpu_init(void)
 {
        u32 ret;
+       struct udevice *dev = NULL;
+
+#ifdef CONFIG_DM_I2C
+       ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);

Can you pick this up from the device tree?

This is not possible; the mainline LPC32xx boards (devkit3250 & work_92105), are not supporting the devicetree bindings.

The I2C & USB drivers are require to work properly with DM for a non-device tree environment.

Quoted 52 lines

drivers/usb/host/ohci-lpc32xx.c +20 -4

+       if (ret) {
+               debug("%s: No bus %d\n", __func__, I2C_2);
+               return ret;
+       }
+#endif
 
        /*
         * USB pins routing setup is done by "lpc32xx_usb_init()" and should

@@ -167,7 +184,7 @@ int usb_cpu_init(void)
                return ret;
 
        /* Configure ISP1301 */
-       isp1301_configure();
+       isp1301_configure(dev);
 
        /* setup USB clocks and PLL */
        ret = usbpll_setup();

@@ -188,21 +205,32 @@ int usb_cpu_init(void)
                return ret;
 
        setbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
        return 0;
 }
 
 int usb_cpu_stop(void)
 {
+       struct udevice *dev = NULL;
+       int ret = 0;
+
+#ifdef CONFIG_DM_I2C
+       ret = i2c_get_chip_for_busnum(I2C_2, ISP1301_I2C_ADDR, 1, &dev);
+       if (ret) {
+               debug("%s: No bus %d\n", __func__, I2C_2);
+               return ret;
+       }
+#endif
+
        /* vbus off */
-       isp1301_set_value(ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
+       isp1301_set_value(dev, ISP1301_I2C_OTG_CONTROL_1_SET, OTG1_VBUS_DRV);
 
        clrbits_le32(&otg->otg_sts_ctrl, OTG_HOST_EN);
 
        clrbits_le32(&clk_pwr->usb_ctrl, CLK_USBCTRL_HCLK_EN);
 
-       return 0;
+       return ret;
 }

Quoted 7 lines

Quoted 4 lines
drivers/usb/host/ohci-lpc32xx.c +0 -1
 int usb_cpu_init_fail(void)
--
2.11.0
Regards,
Simon

Regards,
Sylvain Lemieux