diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-02 06:59:08 -0400 |
---|---|---|
committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-17 04:01:22 -0500 |
commit | 9bb39b3f600101b09cbb35e0a0deb9d56c4fe67f (patch) | |
tree | 65e5b6b88415b4ff2600fd006b2d24df97e8c9c1 /arch/arm/mach-imx | |
parent | 6332c1071811a1d588cfc93330d87a57a7460a1b (diff) |
ARM: imx: dynamically allocate mx1-camera device
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/devices.c | 25 | ||||
-rw-r--r-- | arch/arm/mach-imx/devices.h | 4 |
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/arm/mach-imx/devices.c b/arch/arm/mach-imx/devices.c index fba628551dc9..31c9d6c583a3 100644 --- a/arch/arm/mach-imx/devices.c +++ b/arch/arm/mach-imx/devices.c | |||
@@ -45,31 +45,6 @@ | |||
45 | #include "devices.h" | 45 | #include "devices.h" |
46 | 46 | ||
47 | #if defined(CONFIG_ARCH_MX1) | 47 | #if defined(CONFIG_ARCH_MX1) |
48 | static struct resource imx1_camera_resources[] = { | ||
49 | { | ||
50 | .start = 0x00224000, | ||
51 | .end = 0x00224010, | ||
52 | .flags = IORESOURCE_MEM, | ||
53 | }, { | ||
54 | .start = MX1_CSI_INT, | ||
55 | .end = MX1_CSI_INT, | ||
56 | .flags = IORESOURCE_IRQ, | ||
57 | }, | ||
58 | }; | ||
59 | |||
60 | static u64 imx1_camera_dmamask = DMA_BIT_MASK(32); | ||
61 | |||
62 | struct platform_device imx1_camera_device = { | ||
63 | .name = "mx1-camera", | ||
64 | .id = 0, /* This is used to put cameras on this interface */ | ||
65 | .dev = { | ||
66 | .dma_mask = &imx1_camera_dmamask, | ||
67 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
68 | }, | ||
69 | .resource = imx1_camera_resources, | ||
70 | .num_resources = ARRAY_SIZE(imx1_camera_resources), | ||
71 | }; | ||
72 | |||
73 | /* GPIO port description */ | 48 | /* GPIO port description */ |
74 | static struct mxc_gpio_port imx_gpio_ports[] = { | 49 | static struct mxc_gpio_port imx_gpio_ports[] = { |
75 | { | 50 | { |
diff --git a/arch/arm/mach-imx/devices.h b/arch/arm/mach-imx/devices.h index 91906ce21c40..8f14452c7d23 100644 --- a/arch/arm/mach-imx/devices.h +++ b/arch/arm/mach-imx/devices.h | |||
@@ -1,7 +1,3 @@ | |||
1 | #ifdef CONFIG_ARCH_MX1 | ||
2 | extern struct platform_device imx1_camera_device; | ||
3 | #endif | ||
4 | |||
5 | #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) | 1 | #if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27) |
6 | extern struct platform_device mxc_wdt; | 2 | extern struct platform_device mxc_wdt; |
7 | extern struct platform_device mxc_fb_device; | 3 | extern struct platform_device mxc_fb_device; |