Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f871469 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: dynamically allocate imx21-hcd devices 



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

arch/arm/mach-imx/devices-imx21.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,10 @@ 
#include <mach/mx21.h>

#include <mach/mx21.h>

#include <mach/devices-common.h>

#include <mach/devices-common.h>





extern const struct imx_imx21_hcd_data imx21_imx21_hcd_data __initconst;

#define imx21_add_imx21_hcd(pdata)	\

	imx_add_imx21_hcd(&imx21_imx21_hcd_data, pdata)



extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data __initconst;

extern const struct imx_imx2_wdt_data imx21_imx2_wdt_data __initconst;

#define imx21_add_imx2_wdt(pdata)	\

#define imx21_add_imx2_wdt(pdata)	\

	imx_add_imx2_wdt(&imx21_imx2_wdt_data)

	imx_add_imx2_wdt(&imx21_imx2_wdt_data)

arch/arm/mach-imx/devices.c

+0 −26
Original line number Original line Diff line number Diff line
@@ -123,30 +123,4 @@ int __init imx27_register_gpios(void) 
}

}

#endif

#endif





#ifdef CONFIG_MACH_MX21

static struct resource mx21_usbhc_resources[] = {

	{

		.start	= MX21_USBOTG_BASE_ADDR,

		.end	= MX21_USBOTG_BASE_ADDR + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start		= MX21_INT_USBHOST,

		.end		= MX21_INT_USBHOST,

		.flags		= IORESOURCE_IRQ,

	},

};



struct platform_device mx21_usbhc_device = {

	.name		= "imx21-hcd",

	.id		= 0,

	.dev		= {

		.dma_mask = &mx21_usbhc_device.dev.coherent_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.num_resources	= ARRAY_SIZE(mx21_usbhc_resources),

	.resource	= mx21_usbhc_resources,

};

#endif



#endif
 
#endif

arch/arm/mach-imx/devices.h

+0 −3
Original line number Original line Diff line number Diff line 
#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

extern struct platform_device mx21_usbhc_device;

#endif

arch/arm/plat-mxc/devices/Kconfig

+3 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,9 @@ config IMX_HAVE_PLATFORM_GPIO_KEYS 
	bool

	bool

	default y if ARCH_MX51

	default y if ARCH_MX51





config IMX_HAVE_PLATFORM_IMX21_HCD

	bool

	

config IMX_HAVE_PLATFORM_IMX2_WDT

config IMX_HAVE_PLATFORM_IMX2_WDT

	bool

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC) += platform-fsl-usb2-udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS) += platform-gpio_keys.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_GPIO_KEYS) += platform-gpio_keys.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX21_HCD) += platform-imx21-hcd.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT) += platform-imx2-wdt.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT) += platform-imx2-wdt.o

obj-y += platform-imx-dma.o

obj-y += platform-imx-dma.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB) += platform-imx-fb.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_FB) += platform-imx-fb.o