diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/plat-mxc/include/mach/devices-common.h | |
parent | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff) | |
parent | 27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff) | |
download | kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.gz kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.bz2 kernel_samsung_smdk4412-c721be2807467819d16db4d61a4c5db539bcc1c7.zip |
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( const struct imx_imx_udc_data *data, const struct imxusb_platform_data *pdata); +#include <mach/ipu.h> +#include <mach/mx3fb.h> +#include <mach/mx3_camera.h> +struct imx_ipu_core_data { + resource_size_t iobase; + resource_size_t synirq; + resource_size_t errirq; +}; +struct platform_device *__init imx_add_ipu_core( + const struct imx_ipu_core_data *data, + const struct ipu_platform_data *pdata); +struct platform_device *__init imx_alloc_mx3_camera( + const struct imx_ipu_core_data *data, + const struct mx3_camera_pdata *pdata); +struct platform_device *__init imx_add_mx3_sdc_fb( + const struct imx_ipu_core_data *data, + struct mx3fb_platform_data *pdata); + #include <mach/mx1_camera.h> struct imx_mx1_camera_data { resource_size_t iobase; @@ -237,6 +255,15 @@ struct imx_mxc_pwm_data { struct platform_device *__init imx_add_mxc_pwm( const struct imx_mxc_pwm_data *data); +/* mxc_rtc */ +struct imx_mxc_rtc_data { + resource_size_t iobase; + resource_size_t irq; +}; +struct platform_device *__init imx_add_mxc_rtc( + const struct imx_mxc_rtc_data *data); + +/* mxc_w1 */ struct imx_mxc_w1_data { resource_size_t iobase; }; |