diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-03-03 15:32:02 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-19 07:11:20 -0400 |
commit | afa77ef30ead4865ce2c0c1c55054d45521ce1c7 (patch) | |
tree | 87a455605b7d0ae9685e71ae7fd48a1a0d87d379 /arch/arm/plat-mxc/include | |
parent | 031e912741746e4350204bb0436590ca0e993a7d (diff) |
ARM: mx3: dynamically allocate "ipu-core" devices
... together with the related devices "mx3_camera" and "mx3_sdc_fb".
"mx3_camera" doesn't fit the scheme of the other devices that just are
allocated and registered in a single function because it needs additional
care to get some dmaable memory. So currently imx31_alloc_mx3_camera
duplicates most of imx_add_platform_device_dmamask, but I'm not sure it's
worth to split the latter to be able to reuse more code.
This gets rid of mach-mx3/devices.[ch] and so several files need to be
adapted not to #include devices.h anymore.
LAKML-Reference: 1299271882-2130-5-git-send-email-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/devices-common.h b/arch/arm/plat-mxc/include/mach/devices-common.h index b0bc1987c1d3..fa8477337f91 100644 --- a/arch/arm/plat-mxc/include/mach/devices-common.h +++ b/arch/arm/plat-mxc/include/mach/devices-common.h | |||
@@ -166,6 +166,24 @@ struct platform_device *__init imx_add_imx_udc( | |||
166 | const struct imx_imx_udc_data *data, | 166 | const struct imx_imx_udc_data *data, |
167 | const struct imxusb_platform_data *pdata); | 167 | const struct imxusb_platform_data *pdata); |
168 | 168 | ||
169 | #include <mach/ipu.h> | ||
170 | #include <mach/mx3fb.h> | ||
171 | #include <mach/mx3_camera.h> | ||
172 | struct imx_ipu_core_data { | ||
173 | resource_size_t iobase; | ||
174 | resource_size_t synirq; | ||
175 | resource_size_t errirq; | ||
176 | }; | ||
177 | struct platform_device *__init imx_add_ipu_core( | ||
178 | const struct imx_ipu_core_data *data, | ||
179 | const struct ipu_platform_data *pdata); | ||
180 | struct platform_device *__init imx_alloc_mx3_camera( | ||
181 | const struct imx_ipu_core_data *data, | ||
182 | const struct mx3_camera_pdata *pdata); | ||
183 | struct platform_device *__init imx_add_mx3_sdc_fb( | ||
184 | const struct imx_ipu_core_data *data, | ||
185 | struct mx3fb_platform_data *pdata); | ||
186 | |||
169 | #include <mach/mx1_camera.h> | 187 | #include <mach/mx1_camera.h> |
170 | struct imx_mx1_camera_data { | 188 | struct imx_mx1_camera_data { |
171 | resource_size_t iobase; | 189 | resource_size_t iobase; |