Commit 6cafe48a authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx5: dynamically allocate fsl-usb2-udc devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 7d92e8e6

arch/arm/mach-mx5/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ comment "i.MX51 machines:" 
config MACH_MX51_BABBAGE

	bool "Support MX51 BABBAGE platforms"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART
@@ -92,6 +93,7 @@ config MACH_MX51_3DS 
config MACH_EUKREA_CPUIMX51

	bool "Support Eukrea CPUIMX51 module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI
@@ -121,6 +123,7 @@ endchoice 
config MACH_EUKREA_CPUIMX51SD

	bool "Support Eukrea CPUIMX51SD module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

arch/arm/mach-mx5/board-cpuimx51.c

+2 −3
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <asm/mach/time.h>



#include "devices-imx51.h"

#include "devices.h"



#define CPUIMX51_USBH1_STP	IMX_GPIO_NR(1, 27)

#define CPUIMX51_QUARTA_GPIO	IMX_GPIO_NR(3, 28)
@@ -211,7 +210,7 @@ static const struct mxc_usbh_platform_data dr_utmi_config __initconst = { 
	.portsc	= MXC_EHCI_UTMI_16BIT,

};



static struct fsl_usb2_platform_data usb_pdata = {

static const struct fsl_usb2_platform_data usb_pdata __initconst = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,

};
@@ -273,7 +272,7 @@ static void __init eukrea_cpuimx51_init(void) 
		imx51_add_mxc_ehci_otg(&dr_utmi_config);

	else {

		initialize_otg_port(NULL);

		mxc_register_device(&mxc_usbdr_udc_device, &usb_pdata);

		imx51_add_fsl_usb2_udc(&usb_pdata);

	}

	imx51_add_mxc_ehci_hs(1, &usbh1_config);

arch/arm/mach-mx5/board-cpuimx51sd.c

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <asm/mach/time.h>



#include "devices-imx51.h"

#include "devices.h"

#include "cpu_op-mx51.h"



#define USBH1_RST		IMX_GPIO_NR(2, 28)
@@ -194,7 +193,7 @@ static const struct mxc_usbh_platform_data dr_utmi_config __initconst = { 
	.portsc	= MXC_EHCI_UTMI_16BIT,

};



static struct fsl_usb2_platform_data usb_pdata = {

static const struct fsl_usb2_platform_data usb_pdata __initconst = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,

};
@@ -306,7 +305,7 @@ static void __init eukrea_cpuimx51sd_init(void) 
		imx51_add_mxc_ehci_otg(&dr_utmi_config);

	else {

		initialize_otg_port(NULL);

		mxc_register_device(&mxc_usbdr_udc_device, &usb_pdata);

		imx51_add_fsl_usb2_udc(&usb_pdata);

	}



	gpio_request(USBH1_RST, "usb_rst");

arch/arm/mach-mx5/board-mx51_babbage.c

+2 −2
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static const struct mxc_usbh_platform_data dr_utmi_config __initconst = { 
	.portsc	= MXC_EHCI_UTMI_16BIT,

};



static struct fsl_usb2_platform_data usb_pdata = {

static const struct fsl_usb2_platform_data usb_pdata __initconst = {

	.operating_mode	= FSL_USB2_DR_DEVICE,

	.phy_mode	= FSL_USB2_PHY_UTMI_WIDE,

};
@@ -387,7 +387,7 @@ static void __init mx51_babbage_init(void) 
		imx51_add_mxc_ehci_otg(&dr_utmi_config);

	else {

		initialize_otg_port(NULL);

		mxc_register_device(&mxc_usbdr_udc_device, &usb_pdata);

		imx51_add_fsl_usb2_udc(&usb_pdata);

	}



	gpio_usbh1_active();

arch/arm/mach-mx5/devices-imx51.h

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ extern const struct imx_fec_data imx51_fec_data; 
#define imx51_add_fec(pdata)	\

	imx_add_fec(&imx51_fec_data, pdata)



extern const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data;

#define imx51_add_fsl_usb2_udc(pdata)	\

	imx_add_fsl_usb2_udc(&imx51_fsl_usb2_udc_data, pdata)



extern const struct imx_imx_i2c_data imx51_imx_i2c_data[];

#define imx51_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)