[U-Boot] [PATCH 0/5] add usb support for mx6 board

[U-Boot] [PATCH 0/5] add usb support for mx6 board

[Peng Fan]

Add usb support for mx6qarm2 mx6sabresd mx6sxsabresd mx6slevk. Mainly add
pad settings and ehci power settings. Also introduce a new function to
set IOMUXC GPR registers, because mx6sabresd usb needs that function to work.

This patch set only contains board related settings for usb and a new gpr
function. ehci_hcd_init and otg power polarity in ehci-mx6.c are not touched.
Thus usb start can not work fine. As this is new feature support, post
this patch set for review first.

In future patch, related patch that maybe bugfix to make `usb start` fine
will be sent out. 

Peng Fan (5):
  imx:mx6sxsabresd add usb support
  imx:mx6slevk add usb support
  arm:imx-common introduce a new function to set gpr
  imx:mx6qarm2 add usb support
  imx:mx6sabresd add usb support

 arch/arm/imx-common/iomux-v3.c              | 25 ++++++++++++++
 board/freescale/mx6qarm2/mx6qarm2.c         | 27 +++++++++++++++
 board/freescale/mx6sabresd/mx6sabresd.c     | 53 +++++++++++++++++++++++++++++
 board/freescale/mx6slevk/mx6slevk.c         | 29 ++++++++++++++++
 board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 ++++++++++++++++
 include/configs/mx6qarm2.h                  | 14 ++++++++
 include/configs/mx6sabresd.h                | 14 ++++++++
 include/configs/mx6slevk.h                  | 14 ++++++++
 include/configs/mx6sxsabresd.h              | 14 ++++++++
 9 files changed, 219 insertions(+)

-- 
1.8.4.5

[U-Boot] [PATCH 1/5] imx:mx6sxsabresd add usb support

[Peng Fan]

Add usb support for mx6sxsabresd board.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
---
 board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 +++++++++++++++++++++++++++++
 include/configs/mx6sxsabresd.h              | 14 ++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
index 256ea29..016b8e8 100644
--- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
+++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
@@ -296,3 +296,32 @@ int checkboard(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_USB_EHCI_MX6
+iomux_v3_cfg_t const usb_otg1_pads[] = {
+	MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
+};
+
+iomux_v3_cfg_t const usb_otg2_pads[] = {
+	MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+int board_ehci_hcd_init(int port)
+{
+	switch (port) {
+	case 0:
+		imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
+						 ARRAY_SIZE(usb_otg1_pads));
+		break;
+	case 1:
+		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
+						 ARRAY_SIZE(usb_otg2_pads));
+		break;
+	default:
+		printf("MXC USB port %d not yet supported\n", port);
+		return 1;
+	}
+	return 0;
+}
+#endif
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index e02ea18..8edf187 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -198,6 +198,20 @@
 #define CONFIG_PHYLIB
 #define CONFIG_PHY_ATHEROS
 
+
+#define CONFIG_CMD_USB
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS   0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+#endif
+
 #define CONFIG_CMD_PCI
 #ifdef CONFIG_CMD_PCI
 #define CONFIG_PCI
-- 
1.8.4.5

[U-Boot] [PATCH 1/5] imx:mx6sxsabresd add usb support

[Li Ye-B37916]

Hi Peng,

On 11/1/2014 10:19 AM, Peng Fan wrote:
> Add usb support for mx6sxsabresd board.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Signed-off-by: Ye.Li <B37916@freescale.com>
> ---
>  board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 +++++++++++++++++++++++++++++
>  include/configs/mx6sxsabresd.h              | 14 ++++++++++++++
>  2 files changed, 43 insertions(+)
>
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 256ea29..016b8e8 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -296,3 +296,32 @@ int checkboard(void)
>  
>  	return 0;
>  }
> +
> +#ifdef CONFIG_USB_EHCI_MX6
> +iomux_v3_cfg_t const usb_otg1_pads[] = {
> +	MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +	MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
> +};
> +
> +iomux_v3_cfg_t const usb_otg2_pads[] = {
> +	MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +};
> +
> +int board_ehci_hcd_init(int port)
> +{
> +	switch (port) {
> +	case 0:
> +		imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
> +						 ARRAY_SIZE(usb_otg1_pads));
> +		break;
> +	case 1:
> +		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
> +						 ARRAY_SIZE(usb_otg2_pads));
> +		break;
> +	default:
> +		printf("MXC USB port %d not yet supported\n", port);
> +		return 1;
> +	}
> +	return 0;
> +}
> +#endif
> diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
> index e02ea18..8edf187 100644
> --- a/include/configs/mx6sxsabresd.h
> +++ b/include/configs/mx6sxsabresd.h
> @@ -198,6 +198,20 @@
>  #define CONFIG_PHYLIB
>  #define CONFIG_PHY_ATHEROS
>  
> +
> +#define CONFIG_CMD_USB
> +#ifdef CONFIG_CMD_USB
> +#define CONFIG_USB_EHCI
> +#define CONFIG_USB_EHCI_MX6
> +#define CONFIG_USB_STORAGE
> +#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
> +#define CONFIG_USB_HOST_ETHER
> +#define CONFIG_USB_ETHER_ASIX
> +#define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
> +#define CONFIG_MXC_USB_FLAGS   0
> +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
> +#endif
> +
>  #define CONFIG_CMD_PCI
>  #ifdef CONFIG_CMD_PCI
>  #define CONFIG_PCI
The OTG power polarity setting in ehci-imx6 driver is opposed with the board design. So without changing the polarity setting, we have to use GPIO to control the power switch.

Best regards,
Ye Li

[U-Boot] [PATCH 1/5] imx:mx6sxsabresd add usb support

[Fabio Estevam]

On Sat, Nov 1, 2014 at 12:19 AM, Peng Fan <Peng.Fan@freescale.com> wrote:
> Add usb support for mx6sxsabresd board.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Signed-off-by: Ye.Li <B37916@freescale.com>
> ---
>  board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 +++++++++++++++++++++++++++++
>  include/configs/mx6sxsabresd.h              | 14 ++++++++++++++
>  2 files changed, 43 insertions(+)
>
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 256ea29..016b8e8 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -296,3 +296,32 @@ int checkboard(void)
>
>         return 0;
>  }
> +
> +#ifdef CONFIG_USB_EHCI_MX6
> +iomux_v3_cfg_t const usb_otg1_pads[] = {
> +       MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +       MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
> +};
> +
> +iomux_v3_cfg_t const usb_otg2_pads[] = {
> +       MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +};


Please make both 'static'

> +
> +int board_ehci_hcd_init(int port)
> +{
> +       switch (port) {
> +       case 0:
> +               imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
> +                                                ARRAY_SIZE(usb_otg1_pads));
> +               break;
> +       case 1:
> +               imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
> +                                                ARRAY_SIZE(usb_otg2_pads));
> +               break;
> +       default:
> +               printf("MXC USB port %d not yet supported\n", port);
> +               return 1;
> +       }


Please return -EINVAL.

[U-Boot] [PATCH 1/5] imx:mx6sxsabresd add usb support

[Stefano Babic]

Hi Peng,

On 01/11/2014 03:19, Peng Fan wrote:
> Add usb support for mx6sxsabresd board.
> 
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Signed-off-by: Ye.Li <B37916@freescale.com>
> ---
>  board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 +++++++++++++++++++++++++++++
>  include/configs/mx6sxsabresd.h              | 14 ++++++++++++++
>  2 files changed, 43 insertions(+)
> 
> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> index 256ea29..016b8e8 100644
> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
> @@ -296,3 +296,32 @@ int checkboard(void)
>  
>  	return 0;
>  }
> +
> +#ifdef CONFIG_USB_EHCI_MX6
> +iomux_v3_cfg_t const usb_otg1_pads[] = {
> +	MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +	MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
> +};
> +
> +iomux_v3_cfg_t const usb_otg2_pads[] = {
> +	MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
> +};
> +
> +int board_ehci_hcd_init(int port)
> +{
> +	switch (port) {
> +	case 0:
> +		imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
> +						 ARRAY_SIZE(usb_otg1_pads));
> +		break;
> +	case 1:
> +		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
> +						 ARRAY_SIZE(usb_otg2_pads));
> +		break;
> +	default:
> +		printf("MXC USB port %d not yet supported\n", port);
> +		return 1;
> +	}
> +	return 0;
> +}
> +#endif

Frankly, I am expecting that this function power up the bus instead of
pin multiplexing. If the pins are reserved for USB, why should we set
the pinmux each time board_ehci_hcd_init() is called ? And, in any case,
pins are not reset after their usage for USB. You can move this setup in
board_init() or in another init function.

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

[U-Boot] [PATCH 1/5] imx:mx6sxsabresd add usb support

[Peng Fan]

Hi,

? 11/3/2014 8:28 PM, Stefano Babic ??:
> Hi Peng,
>
> On 01/11/2014 03:19, Peng Fan wrote:
>> Add usb support for mx6sxsabresd board.
>>
>> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
>> Signed-off-by: Ye.Li <B37916@freescale.com>
>> ---
>>   board/freescale/mx6sxsabresd/mx6sxsabresd.c | 29 +++++++++++++++++++++++++++++
>>   include/configs/mx6sxsabresd.h              | 14 ++++++++++++++
>>   2 files changed, 43 insertions(+)
>>
>> diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
>> index 256ea29..016b8e8 100644
>> --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c
>> +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c
>> @@ -296,3 +296,32 @@ int checkboard(void)
>>
>>   	return 0;
>>   }
>> +
>> +#ifdef CONFIG_USB_EHCI_MX6
>> +iomux_v3_cfg_t const usb_otg1_pads[] = {
>> +	MX6_PAD_GPIO1_IO09__USB_OTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
>> +	MX6_PAD_GPIO1_IO10__ANATOP_OTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
>> +};
>> +
>> +iomux_v3_cfg_t const usb_otg2_pads[] = {
>> +	MX6_PAD_GPIO1_IO12__USB_OTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
>> +};
>> +
>> +int board_ehci_hcd_init(int port)
>> +{
>> +	switch (port) {
>> +	case 0:
>> +		imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
>> +						 ARRAY_SIZE(usb_otg1_pads));
>> +		break;
>> +	case 1:
>> +		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
>> +						 ARRAY_SIZE(usb_otg2_pads));
>> +		break;
>> +	default:
>> +		printf("MXC USB port %d not yet supported\n", port);
>> +		return 1;
>> +	}
>> +	return 0;
>> +}
>> +#endif
>
> Frankly, I am expecting that this function power up the bus instead of
> pin multiplexing. If the pins are reserved for USB, why should we set
> the pinmux each time board_ehci_hcd_init() is called ? And, in any case,
> pins are not reset after their usage for USB. You can move this setup in
> board_init() or in another init function.

Because otg power problem which is pointed out by Ye Li, I'll do power 
enable/disable in board_ehci_power function and move the pin settings to 
board_init.
And sent patch v2.

Thanks,
Peng.
>
> Best regards,
> Stefano Babic
>

[U-Boot] [PATCH 2/5] imx:mx6slevk add usb support

[Peng Fan]

Add usb support for mx6slevk board.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
---
 board/freescale/mx6slevk/mx6slevk.c | 29 +++++++++++++++++++++++++++++
 include/configs/mx6slevk.h          | 14 ++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c
index a500133..6d972e8 100644
--- a/board/freescale/mx6slevk/mx6slevk.c
+++ b/board/freescale/mx6slevk/mx6slevk.c
@@ -182,3 +182,32 @@ int checkboard(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_USB_EHCI_MX6
+iomux_v3_cfg_t const usb_otg1_pads[] = {
+	MX6_PAD_KEY_COL4__USB_USBOTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6_PAD_EPDC_PWRCOM__ANATOP_USBOTG1_ID | MUX_PAD_CTRL(NO_PAD_CTRL)
+};
+
+iomux_v3_cfg_t const usb_otg2_pads[] = {
+	MX6_PAD_KEY_COL5__USB_USBOTG2_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+int board_ehci_hcd_init(int port)
+{
+	switch (port) {
+	case 0:
+		imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
+						 ARRAY_SIZE(usb_otg1_pads));
+		break;
+	case 1:
+		imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
+						 ARRAY_SIZE(usb_otg2_pads));
+		break;
+	default:
+		printf("MXC USB port %d not yet supported\n", port);
+		return 1;
+	}
+	return 0;
+}
+#endif
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index fddedf1..021dc0e 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -210,4 +210,18 @@
 #define CONFIG_SF_DEFAULT_MODE		SPI_MODE_0
 #endif
 
+/* USB Configs */
+#define CONFIG_CMD_USB
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS		0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	2
+#endif
+
 #endif				/* __CONFIG_H */
-- 
1.8.4.5

[U-Boot] [PATCH 2/5] imx:mx6slevk add usb support

[Fabio Estevam]

On Sat, Nov 1, 2014 at 12:19 AM, Peng Fan <Peng.Fan@freescale.com> wrote:

>  }
> +
> +#ifdef CONFIG_USB_EHCI_MX6
> +iomux_v3_cfg_t const usb_otg1_pads[] = {
> +       MX6_PAD_KEY_COL4__USB_USBOTG1_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),


This can be 'static'.

> +int board_ehci_hcd_init(int port)
> +{
> +       switch (port) {
> +       case 0:
> +               imx_iomux_v3_setup_multiple_pads(usb_otg1_pads,
> +                                                ARRAY_SIZE(usb_otg1_pads));
> +               break;
> +       case 1:
> +               imx_iomux_v3_setup_multiple_pads(usb_otg2_pads,
> +                                                ARRAY_SIZE(usb_otg2_pads));
> +               break;
> +       default:
> +               printf("MXC USB port %d not yet supported\n", port);
> +               return 1;

It would be better to return -EINVAL instead.

[U-Boot] [PATCH 3/5] arm:imx-common introduce a new function to set gpr

[Peng Fan]

Add a new function mxc_iomux_set_gpr_register to
set the iomux gpr register.

32-bit general purpose registers according to SoC
requirements for any usage.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
---
 arch/arm/imx-common/iomux-v3.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
index 22cd11a..b27aab8 100644
--- a/arch/arm/imx-common/iomux-v3.c
+++ b/arch/arm/imx-common/iomux-v3.c
@@ -77,3 +77,28 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
 		p += stride;
 	}
 }
+
+/*
+ * Configure the IOMUX General Purpose Registers.
+ *
+ * @group, which gpr register to configure.
+ * @start_bit, the first bit to set
+ * @num_bits, how many bits to set
+ * @value, the value will be set to [start_bits...start_bits+num_bits-1]
+ */
+void mxc_iomux_set_gpr_register(int group, int start_bit, int num_bits,
+				int value)
+{
+	int i = 0;
+	u32 reg;
+
+	reg = readl(base + group * 4);
+	while (num_bits) {
+		reg &= ~(1 << (start_bit + i));
+		i++;
+		num_bits--;
+	}
+
+	reg |= (value << start_bit);
+	writel(reg, base + group * 4);
+}
-- 
1.8.4.5

[U-Boot] [PATCH 3/5] arm:imx-common introduce a new function to set gpr

[Li Ye-B37916]

Hi Peng,

 

On 11/1/2014 10:19 AM, Peng Fan wrote:
> Add a new function mxc_iomux_set_gpr_register to
> set the iomux gpr register.
>
> 32-bit general purpose registers according to SoC
> requirements for any usage.
>
> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
> Signed-off-by: Ye.Li <B37916@freescale.com>
> Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
> ---
>  arch/arm/imx-common/iomux-v3.c | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
> index 22cd11a..b27aab8 100644
> --- a/arch/arm/imx-common/iomux-v3.c
> +++ b/arch/arm/imx-common/iomux-v3.c
> @@ -77,3 +77,28 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
>  		p += stride;
>  	}
>  }
> +
> +/*
> + * Configure the IOMUX General Purpose Registers.
> + *
> + * @group, which gpr register to configure.
> + * @start_bit, the first bit to set
> + * @num_bits, how many bits to set
> + * @value, the value will be set to [start_bits...start_bits+num_bits-1]
> + */
> +void mxc_iomux_set_gpr_register(int group, int start_bit, int num_bits,
> +				int value)
> +{
> +	int i = 0;
> +	u32 reg;
> +
> +	reg = readl(base + group * 4);
> +	while (num_bits) {
> +		reg &= ~(1 << (start_bit + i));
> +		i++;
> +		num_bits--;
> +	}
> +
> +	reg |= (value << start_bit);
> +	writel(reg, base + group * 4);
> +}
This function is already in my previous patch (http://patchwork.ozlabs.org/patch/405013/). The function name is changed to imx_iomux_set_gpr_register. 

 

Best regards,

Ye Li

[U-Boot] [PATCH 3/5] arm:imx-common introduce a new function to set gpr

[Peng Fan]

On 11/01/2014 03:39 PM, Li Ye-B37916 wrote:
> Hi Peng,
> 
>  
> 
> On 11/1/2014 10:19 AM, Peng Fan wrote:
>> Add a new function mxc_iomux_set_gpr_register to
>> set the iomux gpr register.
>>
>> 32-bit general purpose registers according to SoC
>> requirements for any usage.
>>
>> Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
>> Signed-off-by: Ye.Li <B37916@freescale.com>
>> Signed-off-by: Nitin Garg <nitin.garg@freescale.com>
>> ---
>>  arch/arm/imx-common/iomux-v3.c | 25 +++++++++++++++++++++++++
>>  1 file changed, 25 insertions(+)
>>
>> diff --git a/arch/arm/imx-common/iomux-v3.c b/arch/arm/imx-common/iomux-v3.c
>> index 22cd11a..b27aab8 100644
>> --- a/arch/arm/imx-common/iomux-v3.c
>> +++ b/arch/arm/imx-common/iomux-v3.c
>> @@ -77,3 +77,28 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,
>>  		p += stride;
>>  	}
>>  }
>> +
>> +/*
>> + * Configure the IOMUX General Purpose Registers.
>> + *
>> + * @group, which gpr register to configure.
>> + * @start_bit, the first bit to set
>> + * @num_bits, how many bits to set
>> + * @value, the value will be set to [start_bits...start_bits+num_bits-1]
>> + */
>> +void mxc_iomux_set_gpr_register(int group, int start_bit, int num_bits,
>> +				int value)
>> +{
>> +	int i = 0;
>> +	u32 reg;
>> +
>> +	reg = readl(base + group * 4);
>> +	while (num_bits) {
>> +		reg &= ~(1 << (start_bit + i));
>> +		i++;
>> +		num_bits--;
>> +	}
>> +
>> +	reg |= (value << start_bit);
>> +	writel(reg, base + group * 4);
>> +}
> This function is already in my previous patch (http://patchwork.ozlabs.org/patch/405013/). The function name is changed to imx_iomux_set_gpr_register. 
> 

oh. I missed this piece of code.
Then please ignore this patch set. Sorry for troubles.

Regards,
Peng.
>  
> 
> Best regards,
> 
> Ye Li
> 
> 

[U-Boot] [PATCH 3/5] arm:imx-common introduce a new function to set gpr

[Wolfgang Denk]

Dear Peng Fan,

In message <1414808359-4750-4-git-send-email-Peng.Fan@freescale.com> you wrote:
> Add a new function mxc_iomux_set_gpr_register to
> set the iomux gpr register.
> 
> 32-bit general purpose registers according to SoC
> requirements for any usage.
...
> +/*
> + * Configure the IOMUX General Purpose Registers.
> + *
> + * @group, which gpr register to configure.
> + * @start_bit, the first bit to set
> + * @num_bits, how many bits to set
> + * @value, the value will be set to [start_bits...start_bits+num_bits-1]
> + */

Can you please rework the API and use a mask instead of counting
bits?  Relying on bit numbers is error prone and inherently
non-portable.

Use the standard register access macros (like setbits, clrbits,
clrsetbits) as example, please.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
All I ask is a chance to prove that money can't make me happy.

[U-Boot] [PATCH 4/5] imx:mx6qarm2 add usb support

[Peng Fan]

Add usb support for mx6qarm2 board.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
---
 board/freescale/mx6qarm2/mx6qarm2.c | 27 +++++++++++++++++++++++++++
 include/configs/mx6qarm2.h          | 14 ++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 667dca5..3108750 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -237,3 +237,30 @@ int checkboard(void)
 
 	return 0;
 }
+
+#ifdef CONFIG_USB_EHCI_MX6
+iomux_v3_cfg_t const usb_otg_pads[] = {
+	MX6_PAD_EIM_D22__USB_OTG_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6_PAD_GPIO_1__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+int board_ehci_hcd_init(int port)
+{
+	switch (port) {
+	case 0:
+		imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
+						 ARRAY_SIZE(usb_otg_pads));
+
+		/*
+		 * set daisy chain for otg_pin_id on 6q.
+		 * for 6dl, this bit is reserved
+		 */
+		mxc_iomux_set_gpr_register(1, 13, 1, 1);
+		break;
+	default:
+		printf("MXC USB port %d not yet supported\n", port);
+		return 1;
+	}
+	return 0;
+}
+#endif
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 6e01fa0..76cfef1 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -189,4 +189,18 @@
 #define CONFIG_OF_LIBFDT
 #define CONFIG_CMD_BOOTZ
 
+/* USB Configs */
+#define CONFIG_CMD_USB
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS		0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	1
+#endif
+
 #endif				/* __CONFIG_H */
-- 
1.8.4.5

[U-Boot] [PATCH 5/5] imx:mx6sabresd add usb support

[Peng Fan]

Add usb support for mx6sabresd.

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Signed-off-by: Ye.Li <B37916@freescale.com>
---
 board/freescale/mx6sabresd/mx6sabresd.c | 53 +++++++++++++++++++++++++++++++++
 include/configs/mx6sabresd.h            | 14 +++++++++
 2 files changed, 67 insertions(+)

diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index 81dcd6e..6bf9b25 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -546,3 +546,56 @@ int checkboard(void)
 	puts("Board: MX6-SabreSD\n");
 	return 0;
 }
+
+#ifdef CONFIG_USB_EHCI_MX6
+iomux_v3_cfg_t const usb_otg_pads[] = {
+	MX6_PAD_EIM_D22__USB_OTG_PWR | MUX_PAD_CTRL(NO_PAD_CTRL),
+	MX6_PAD_ENET_RX_ER__USB_OTG_ID | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+iomux_v3_cfg_t const usb_hc1_pads[] = {
+	MX6_PAD_ENET_TXD1__GPIO1_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL),
+};
+
+int board_ehci_hcd_init(int port)
+{
+	switch (port) {
+	case 0:
+		imx_iomux_v3_setup_multiple_pads(usb_otg_pads,
+						 ARRAY_SIZE(usb_otg_pads));
+
+		/*
+		 * set daisy chain for otg_pin_id on 6q.
+		 * for 6dl, this bit is reserved.
+		 */
+		mxc_iomux_set_gpr_register(1, 13, 1, 0);
+		break;
+	case 1:
+		imx_iomux_v3_setup_multiple_pads(usb_hc1_pads,
+						 ARRAY_SIZE(usb_hc1_pads));
+		break;
+	default:
+		printf("MXC USB port %d not yet supported\n", port);
+		return 1;
+	}
+	return 0;
+}
+
+int board_ehci_power(int port, int on)
+{
+	switch (port) {
+	case 0:
+		break;
+	case 1:
+		if (on)
+			gpio_direction_output(IMX_GPIO_NR(1, 29), 1);
+		else
+			gpio_direction_output(IMX_GPIO_NR(1, 29), 0);
+		break;
+	default:
+		printf("MXC USB port %d not yet supported\n", port);
+		return 1;
+	}
+	return 0;
+}
+#endif
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 938030d..da870f3 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -54,4 +54,18 @@
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
+/* USB Configs */
+#define CONFIG_CMD_USB
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_MX6
+#define CONFIG_USB_STORAGE
+#define CONFIG_EHCI_HCD_INIT_AFTER_RESET
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS		0
+#define CONFIG_USB_MAX_CONTROLLER_COUNT	1 /* Enabled USB controller number */
+#endif
+
 #endif                         /* __MX6QSABRESD_CONFIG_H */
-- 
1.8.4.5