diff options
| author | Werner Almesberger <werner@openmoko.org> | 2009-03-05 14:40:08 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-05 14:40:08 +0000 |
| commit | 8bbe6c423b04238764e04885ad78450a1d43cb07 (patch) | |
| tree | 3bc949294973533751aff9107a1eb4f6b1b26a3b /arch | |
| parent | 068527fc6e416d1e2673429721c1dd4f25285655 (diff) | |
Add camera interface driver to 3D7K
This patch adds the camera interface driver and the corresponding
configuration option to the 3D7K machine.
Signed-off-by: Werner Almesberger <werner@openmoko.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c6410/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6410/mach-om-3d7k.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6410/Kconfig b/arch/arm/mach-s3c6410/Kconfig index bbe158ac523..373ce9c3ac4 100644 --- a/arch/arm/mach-s3c6410/Kconfig +++ b/arch/arm/mach-s3c6410/Kconfig @@ -70,6 +70,7 @@ config MACH_OM_3D7K select S3C6410_SETUP_SDHCI select S3C64XX_SETUP_I2C1 select S3C_DEV_FB + select S3C_DEV_CAMIF select S3C64XX_SETUP_FB_24BPP # select SENSORS_PCF50633 select POWER_SUPPLY diff --git a/arch/arm/mach-s3c6410/mach-om-3d7k.c b/arch/arm/mach-s3c6410/mach-om-3d7k.c index 628f2afb011..2dccffd7347 100644 --- a/arch/arm/mach-s3c6410/mach-om-3d7k.c +++ b/arch/arm/mach-s3c6410/mach-om-3d7k.c @@ -84,6 +84,8 @@ #include <plat/regs-usb-hs-otg.h> extern struct platform_device s3c_device_usbgadget; +extern struct platform_device s3c_device_camif; /* @@@ change plat/devs.h */ + /* ------------------------------------------------------------------------------- * OM_3D7K FIQ related @@ -962,6 +964,7 @@ static struct platform_device *om_3d7k_devices[] __initdata = { &om_3d7k_device_spi_lcm, &s3c_device_usbgadget, &s3c24xx_pwm_device, + &s3c_device_camif, }; |