diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 05:38:27 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 05:38:27 -0400 |
commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/plat-mxc/include/mach/devices-common.h | |
parent | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff) | |
parent | 27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff) |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/devices-common.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/devices-common.h | 27 |
1 files changed, 27 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 8658c9caa65..fa8477337f9 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; |
@@ -237,6 +255,15 @@ struct imx_mxc_pwm_data { | |||
237 | struct platform_device *__init imx_add_mxc_pwm( | 255 | struct platform_device *__init imx_add_mxc_pwm( |
238 | const struct imx_mxc_pwm_data *data); | 256 | const struct imx_mxc_pwm_data *data); |
239 | 257 | ||
258 | /* mxc_rtc */ | ||
259 | struct imx_mxc_rtc_data { | ||
260 | resource_size_t iobase; | ||
261 | resource_size_t irq; | ||
262 | }; | ||
263 | struct platform_device *__init imx_add_mxc_rtc( | ||
264 | const struct imx_mxc_rtc_data *data); | ||
265 | |||
266 | /* mxc_w1 */ | ||
240 | struct imx_mxc_w1_data { | 267 | struct imx_mxc_w1_data { |
241 | resource_size_t iobase; | 268 | resource_size_t iobase; |
242 | }; | 269 | }; |