* [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support
@ 2017-04-26 11:57 Sylvain Lemieux
2017-04-26 12:38 ` Marek Vasut
2017-04-29 0:28 ` Simon Glass
0 siblings, 2 replies; 4+ messages in thread
From: Sylvain Lemieux @ 2017-04-26 11:57 UTC (permalink / raw)
To: u-boot
From: Liam Beguin <lbeguin@tycoint.com>
Add DM support for i2c functions.
Signed-off-by: Liam Beguin <lbeguin@tycoint.com>
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
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(-)
diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
index 9245126ed6..c0c423b994 100644
--- a/drivers/usb/host/ohci-lpc32xx.c
+++ b/drivers/usb/host/ohci-lpc32xx.c
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support
2017-04-26 11:57 [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support Sylvain Lemieux
@ 2017-04-26 12:38 ` Marek Vasut
2017-04-29 0:28 ` Simon Glass
1 sibling, 0 replies; 4+ messages in thread
From: Marek Vasut @ 2017-04-26 12:38 UTC (permalink / raw)
To: u-boot
On 04/26/2017 01:57 PM, Sylvain Lemieux wrote:
> From: Liam Beguin <lbeguin@tycoint.com>
>
> Add DM support for i2c functions.
>
> Signed-off-by: Liam Beguin <lbeguin@tycoint.com>
> Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
Reviewed-by: Marek Vasut <marex@denx.de>
> ---
> 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(-)
>
> diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
> index 9245126ed6..c0c423b994 100644
> --- a/drivers/usb/host/ohci-lpc32xx.c
> +++ b/drivers/usb/host/ohci-lpc32xx.c
> @@ -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)
>
--
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support
2017-04-26 11:57 [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support Sylvain Lemieux
2017-04-26 12:38 ` Marek Vasut
@ 2017-04-29 0:28 ` Simon Glass
2017-05-01 14:41 ` Sylvain Lemieux
1 sibling, 1 reply; 4+ messages in thread
From: Simon Glass @ 2017-04-29 0:28 UTC (permalink / raw)
To: u-boot
Hi,
On 26 April 2017 at 05:57, Sylvain Lemieux <slemieux.tyco@gmail.com> wrote:
> From: Liam Beguin <lbeguin@tycoint.com>
>
> Add DM support for i2c functions.
>
> Signed-off-by: Liam Beguin <lbeguin@tycoint.com>
> Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
> ---
> 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(-)
>
> diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
> index 9245126ed6..c0c423b994 100644
> --- a/drivers/usb/host/ohci-lpc32xx.c
> +++ b/drivers/usb/host/ohci-lpc32xx.c
> @@ -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
>
> /* 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);
Can you pick this up from the device tree?
> + 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)
> --
> 2.11.0
>
Regards,
Simon
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support
2017-04-29 0:28 ` Simon Glass
@ 2017-05-01 14:41 ` Sylvain Lemieux
0 siblings, 0 replies; 4+ messages in thread
From: Sylvain Lemieux @ 2017-05-01 14:41 UTC (permalink / raw)
To: u-boot
Hi,
On Fri, 2017-04-28 at 18:28 -0600, Simon Glass wrote:
> Hi,
>
> On 26 April 2017 at 05:57, Sylvain Lemieux <slemieux.tyco@gmail.com> wrote:
> > From: Liam Beguin <lbeguin@tycoint.com>
> >
> > Add DM support for i2c functions.
> >
> > Signed-off-by: Liam Beguin <lbeguin@tycoint.com>
> > Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
> > ---
> > 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(-)
> >
> > diff --git a/drivers/usb/host/ohci-lpc32xx.c b/drivers/usb/host/ohci-lpc32xx.c
> > index 9245126ed6..c0c423b994 100644
> > --- a/drivers/usb/host/ohci-lpc32xx.c
> > +++ b/drivers/usb/host/ohci-lpc32xx.c
> > @@ -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
>
I will submit a revision 4.
> >
> > /* 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);
>
> 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.
> > + 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)
> > --
> > 2.11.0
> >
>
> Regards,
> Simon
Regards,
Sylvain Lemieux
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-05-01 14:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-26 11:57 [U-Boot] [PATCH v3] usb: lpc32xx: add i2c DM support Sylvain Lemieux
2017-04-26 12:38 ` Marek Vasut
2017-04-29 0:28 ` Simon Glass
2017-05-01 14:41 ` Sylvain Lemieux
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.