Commit 03c13ecc authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Sascha Hauer
Browse files

mx31moboard: add support for usb OTG device (v3) 



This is used on all board of our system, so again this is done in the
mx31moboard.c file.

changes since v2: call to gpio_request added in platform code, and
moved device initialization in baseboard files.

changes since v1: pins are claimed in another patch

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4f163eb8

arch/arm/mach-mx3/mx31moboard-devboard.c

+43 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/fsl_devices.h>

#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/interrupt.h>
@@ -39,6 +40,18 @@ static unsigned int devboard_pins[] = { 
	MX31_PIN_PC_READY__SD2_DATA1, MX31_PIN_PC_WAIT_B__SD2_DATA0,

	MX31_PIN_PC_CD2_B__SD2_CLK, MX31_PIN_PC_CD1_B__SD2_CMD,

	MX31_PIN_ATA_DIOR__GPIO3_28, MX31_PIN_ATA_DIOW__GPIO3_29,

	/* USB 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,

	MX31_PIN_USB_OC__GPIO1_30,

};



static struct imxuart_platform_data uart_pdata = {
@@ -98,6 +111,33 @@ static struct imxmmc_platform_data sdhc2_pdata = { 
	.exit	= devboard_sdhc2_exit,

};



static struct fsl_usb2_platform_data usb_pdata = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_ULPI,

};



#define OTG_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST)

#define OTG_EN_B IOMUX_TO_GPIO(MX31_PIN_USB_OC)



static void devboard_usbotg_init(void)

{

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, OTG_PAD_CFG);



	gpio_request(OTG_EN_B, "usb-udc-en");

	gpio_direction_output(OTG_EN_B, 0);

}



/*

 * system init for baseboard usage. Will be called by mx31moboard init.

 */
@@ -111,4 +151,7 @@ void __init mx31moboard_devboard_init(void) 
	mxc_register_device(&mxc_uart_device1, &uart_pdata);



	mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);



	devboard_usbotg_init();

	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);

}

arch/arm/mach-mx3/mx31moboard-marxbot.c

+43 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include <linux/fsl_devices.h>

#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/interrupt.h>
@@ -47,6 +48,18 @@ static unsigned int marxbot_pins[] = { 
	MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,

	MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,

	MX31_PIN_TXD2__GPIO1_28,

	/* USB 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,

	MX31_PIN_USB_OC__GPIO1_30,

};



#define SDHC2_CD IOMUX_TO_GPIO(MX31_PIN_ATA_DIOR)
@@ -102,6 +115,33 @@ static struct imxmmc_platform_data sdhc2_pdata = { 
	.exit	= marxbot_sdhc2_exit,

};



static struct fsl_usb2_platform_data usb_pdata = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_ULPI,

};



#define OTG_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST)

#define OTG_EN_B IOMUX_TO_GPIO(MX31_PIN_USB_OC)



static void marxbot_usbotg_init(void)

{

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA0, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA1, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA2, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA3, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA4, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA5, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA6, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DATA7, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_CLK, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_DIR, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_NXT, OTG_PAD_CFG);

	mxc_iomux_set_pad(MX31_PIN_USBOTG_STP, OTG_PAD_CFG);



	gpio_request(OTG_EN_B, "usb-udc-en");

	gpio_direction_output(OTG_EN_B, 0);

}



/*

 * system init for baseboard usage. Will be called by mx31moboard init.

 */
@@ -113,4 +153,7 @@ void __init mx31moboard_marxbot_init(void) 
		"marxbot");



	mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);



	marxbot_usbotg_init();

	mxc_register_device(&mxc_otg_udc_device, &usb_pdata);

}

arch/arm/mach-mx3/mx31moboard.c

+0 −12
Original line number Diff line number Diff line
@@ -55,18 +55,6 @@ static unsigned int moboard_pins[] = { 
	MX31_PIN_SD1_DATA1__SD1_DATA1, MX31_PIN_SD1_DATA0__SD1_DATA0,

	MX31_PIN_SD1_CLK__SD1_CLK, MX31_PIN_SD1_CMD__SD1_CMD,

	MX31_PIN_ATA_CS0__GPIO3_26, MX31_PIN_ATA_CS1__GPIO3_27,

	/* USB 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,

	MX31_PIN_USB_OC__GPIO1_30,

};



static struct physmap_flash_data mx31moboard_flash_data = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE