MXC: mach_armadillo5x0: Add USB Host support.
Subsystems (2)
PATCH v2 1/1 MXC: mach_armadillo5x0: Add USB Host support.
This add USB Host capability. The Armadillo 500 board is supplied with two USB Host connectors driven by the USB OTG and USB Host 2 ports, through two NXP isp 1504 transceivers.
---
This patch is based on top of Pengutronix mxc-master branch. Please, if possible add this for 2.6.34.
Thanks.
Alberto!
arch/arm/mach-mx3/Kconfig | 1 + arch/arm/mach-mx3/mach-armadillo5x0.c | 128 +++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-)
arch/arm/mach-mx3/Kconfig +1 -0
@@ -95,6 +95,7 @@ config MACH_PCM043 config MACH_ARMADILLO5X0 bool "Support Atmark Armadillo-500 Development Base Board" select ARCH_MX31 + select MXC_ULPI if USB_ULPI help Include support for Atmark Armadillo-500 platform. This includes specific configurations for the board and its peripherals.
arch/arm/mach-mx3/mach-armadillo5x0.c +128 -0
152 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH v2 1/1 MXC: mach_armadillo5x0: Add USB Host support.
Hello Alberto,
Quoted 159 lines · Alberto Panizzo
This add USB Host capability. The Armadillo 500 board is supplied with two USB Host connectors driven by the USB OTG and USB Host 2 ports, through two NXP isp 1504 transceivers.
Signed-off-by Alberto Panizzo <[email protected]>---
This patch is based on top of Pengutronix mxc-master branch. Please, if possible add this for 2.6.34.
Thanks.Alberto!
arch/arm/mach-mx3/Kconfig | 1 + arch/arm/mach-mx3/mach-armadillo5x0.c | 128 +++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 0 deletions(-)arch/arm/mach-mx3/Kconfig +1
-0@@ -95,6 +95,7 @@ config MACH_PCM043 config MACH_ARMADILLO5X0 bool "Support Atmark Armadillo-500 Development Base Board" select ARCH_MX31 + select MXC_ULPI if USB_ULPI help Include support for Atmark Armadillo-500 platform. This includes specific configurations for the board and its peripherals.arch/arm/mach-mx3/mach-armadillo5x0.c +108
-0@@ -36,6 +36,9 @@#include <linux/input.h> #include <linux/gpio_keys.h> #include <linux/i2c.h> +#include <linux/usb/otg.h> +#include <linux/usb/ulpi.h> +#include <linux/delay.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -52,6 +55,8 @@#include <mach/ipu.h> #include <mach/mx3fb.h> #include <mach/mxc_nand.h> +#include <mach/mxc_ehci.h> +#include <mach/ulpi.h> #include "devices.h" #include "crm_regs.h" @@ -103,6 +108,118 @@ static int armadillo5x0_pins[] = {/* I2C2 */ MX31_PIN_CSPI2_MOSI__SCL ,MX31_PIN_CSPI2_MISO__SDA , +/* OTG */ +MX31_PIN_USBOTG_DATA0__USBOTG_DATA0 , +MX31_PIN_USBOTG_DATA1__USBOTG_DATA1 , +MX31_PIN_USBOTG_DATA2__USBOTG_DATA2 , +MX31_PIN_USBOTG_DATA3__USBOTG_DATA3 , +MX31_PIN_USBOTG_DATA4__USBOTG_DATA4 , +MX31_PIN_USBOTG_DATA5__USBOTG_DATA5 , +MX31_PIN_USBOTG_DATA6__USBOTG_DATA6 , +MX31_PIN_USBOTG_DATA7__USBOTG_DATA7 , +MX31_PIN_USBOTG_CLK__USBOTG_CLK , +MX31_PIN_USBOTG_DIR__USBOTG_DIR , +MX31_PIN_USBOTG_NXT__USBOTG_NXT , +MX31_PIN_USBOTG_STP__USBOTG_STP , +/* USB host 2 */ +IOMUX_MODE (MX31_PIN_USBH2_CLK ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_USBH2_DIR ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_USBH2_NXT ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_USBH2_STP ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_USBH2_DATA0 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_USBH2_DATA1 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_STXD3 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_SRXD3 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_SCK3 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_SFS3 ,IOMUX_CONFIG_FUNC ), +IOMUX_MODE (MX31_PIN_STXD6 ,IOMUX_CONFIG_FUNC ), + IOMUX_MODE(MX31_PIN_SRXD6, IOMUX_CONFIG_FUNC), +}; + +/* USB */ +#define OTG_RESET IOMUX_TO_GPIO(MX31_PIN_STXD4) +#define USBH2_RESET IOMUX_TO_GPIO(MX31_PIN_SCK6) +#define USBH2_CS IOMUX_TO_GPIO(MX31_PIN_GPIO1_3) + +#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \ + PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU) + +static int usbotg_init (struct platform_device *pdev) +{ +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA0 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA1 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA2 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA3 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA4 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA5 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA6 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DATA7 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_CLK ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_DIR ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_NXT ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBOTG_STP ,USB_PAD_CFG ); + +/* Chip already enabled by hardware */ +/* OTG phy reset*/ +gpio_request (OTG_RESET ,"USB-OTG-RESET" ); + +if (gpio_direction_output (OTG_RESET ,1 /*HIGH*/ )) { +pr_warning ("Failed to reset usbotg phy \n" ); +return -1 ; + } +gpio_set_value (OTG_RESET ,0 /*LOW*/ ); +mdelay (5 ); +gpio_set_value (OTG_RESET ,1 /*HIGH*/ ); + +return 0 ; +} + +static int usbh2_init (struct platform_device *pdev) +{ +mxc_iomux_set_pad (MX31_PIN_USBH2_CLK ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBH2_DIR ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBH2_NXT ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBH2_STP ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBH2_DATA0 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_USBH2_DATA1 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_SRXD6 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_STXD6 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_SFS3 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_SCK3 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_SRXD3 ,USB_PAD_CFG ); +mxc_iomux_set_pad (MX31_PIN_STXD3 ,USB_PAD_CFG ); + +mxc_iomux_set_gpr (MUX_PGP_UH2 , true); + + +/* Enable the chip */ +gpio_request (USBH2_CS ,"USB-H2-CS" ); +gpio_direction_output (USBH2_CS ,0 /*Enabled*/ ); + +/* H2 phy reset*/ +gpio_request (USBH2_RESET ,"USB-H2-RESET" ); + +if (gpio_direction_output (USBH2_RESET ,1 /*HIGH*/ )) { +pr_warning ("Failed to reset usbh2 phy \n" ); +return -1 ; + } +gpio_set_value (USBH2_RESET ,0 /*LOW*/ ); +mdelay (5 ); +gpio_set_value (USBH2_RESET ,1 /*HIGH*/ ); + +return 0 ; +} + +static struct mxc_usbh_platform_data usbotg_pdata = {
arch/arm/mach-mx3/mach-armadillo5x0.c static int armadillo5x0_pins[] = { · line 223
Quoted 10 lines
arch/arm/mach-mx3/mach-armadillo5x0.c +9
-0+ .init = usbotg_init, + .portsc = MXC_EHCI_MODE_ULPI | MXC_EHCI_UTMI_8BIT, + .flags = MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_INTERFACE_DIFF_UNI, +}; + +static struct mxc_usbh_platform_data usbh2_pdata = { + .init = usbh2_init, + .portsc =MXC_EHCI_MODE_ULPI |MXC_EHCI_UTMI_8BIT , + .flags =MXC_EHCI_POWER_PINS_ENABLED |MXC_EHCI_INTERFACE_DIFF_UNI , };
I didn't test, but I assume gcc issues a warning about usbotg_pdata and usbh2_pdata not being used if CONFIG_USB_ULPI!=y.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/1 MXC: mach_armadillo5x0: Add USB Host support.
Quoted 12 lines · Uwe Kleine-K?nig
arch/arm/mach-mx3/mach-armadillo5x0.c static int armadillo5x0_pins[] = {
Quoted 4 lines
arch/arm/mach-mx3/mach-armadillo5x0.c +4
-0+static struct mxc_usbh_platform_data usbotg_pdata = { + .init = usbotg_init, + .portsc =MXC_EHCI_MODE_ULPI |MXC_EHCI_UTMI_8BIT , + .flags = MXC_EHCI_POWER_PINS_ENABLED |
MXC_EHCI_INTERFACE_DIFF_UNI,arch/arm/mach-mx3/mach-armadillo5x0.c static int armadillo5x0_pins[] = {
Quoted 6 lines
arch/arm/mach-mx3/mach-armadillo5x0.c +6
-0+}; + +static struct mxc_usbh_platform_data usbh2_pdata = { + .init = usbh2_init, + .portsc =MXC_EHCI_MODE_ULPI |MXC_EHCI_UTMI_8BIT , + .flags = MXC_EHCI_POWER_PINS_ENABLED |
MXC_EHCI_INTERFACE_DIFF_UNI,
Quoted 6 lines
Quoted 1 line
};
I didn't test, but I assume gcc issues a warning about
usbotg_pdataandusbh2_pdatanot being used if CONFIG_USB_ULPI!=y.
yes, it behave the same as pcm037 do...
(another rule added to my pocket: No warnings at all for any combination of configs!)
Let we teach how a machine code have to be developed! :) Stay tuned for version 3
Signature · 4 lines
Alberto!
Be Persistent!
- Greg Kroah-Hartman (FOSDEM 2010)PATCH v2 1/1 MXC: mach_armadillo5x0: Add USB Host support.
In reply to Alberto Panizzoarch/arm/mach-mx3/mach-armadillo5x0.c static int armadillo5x0_pins[] = { · line 168
Quoted 3 lines · Alberto Panizzo
arch/arm/mach-mx3/mach-armadillo5x0.c +3
-0+if (gpio_direction_output (OTG_RESET ,1 /*HIGH*/ )) { +pr_warning ("Failed to reset usbotg phy \n" ); +return -1 ;
Always propagate error codes. Don't invent your own - especially when they mean "permission denied".
arch/arm/mach-mx3/mach-armadillo5x0.c static int armadillo5x0_pins[] = { · line 204
Quoted 3 lines
arch/arm/mach-mx3/mach-armadillo5x0.c +3
-0+if (gpio_direction_output (USBH2_RESET ,1 /*HIGH*/ )) { +pr_warning ("Failed to reset usbh2 phy \n" ); +return -1 ;
Ditto.
Never use -1 as an error code - always use a proper error code from errno*.h