diff options
| author | Hyunwoong Kim <khw0178.kim@samsung.com> | 2010-08-02 19:39:39 +0900 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2011-11-16 21:48:22 -0800 |
| commit | 50663b54f486ad0304a84c95d50896d00fae046f (patch) | |
| tree | 24f5f57c1a87ba6d4d338028b95085f905a843fd /arch/arm | |
| parent | 1155be7c304e1792896afa22186ad58056e1b26c (diff) | |
| download | kernel_samsung_crespo-50663b54f486ad0304a84c95d50896d00fae046f.zip kernel_samsung_crespo-50663b54f486ad0304a84c95d50896d00fae046f.tar.gz kernel_samsung_crespo-50663b54f486ad0304a84c95d50896d00fae046f.tar.bz2 | |
S5PC110: HERRING: Modified machine file
Change-Id: If13e3e2c968f93b6dbe08325da76658709666271
Signed-off-by: Hyunwoong Kim <khw0178.kim@samsung.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s5pv210/mach-herring.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pv210/mach-herring.c b/arch/arm/mach-s5pv210/mach-herring.c index 849ec08..606d70b 100644 --- a/arch/arm/mach-s5pv210/mach-herring.c +++ b/arch/arm/mach-s5pv210/mach-herring.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/serial_core.h> #include <linux/gpio.h> +#include <linux/videodev2.h> #include <linux/i2c.h> #include <linux/i2c-gpio.h> #include <linux/regulator/max8998.h> @@ -44,7 +45,8 @@ #include <plat/iic.h> #include <plat/s5p-time.h> -#include <plat/gpio-cfg.h> +#include <plat/fimc.h> +#include <plat/clock.h> struct class *sec_class; EXPORT_SYMBOL(sec_class); @@ -1201,7 +1203,8 @@ static struct s3c_platform_camera s5ka3dfx = { /* Interface setting */ static struct s3c_platform_fimc fimc_plat = { .srclk_name = "mout_mpll", - .clk_name = "sclk_fimc_lclk", + .clk_name = "sclk_fimc", + .lclk_name = "fimc", .clk_rate = 166750000, .default_cam = CAMERA_PAR_A, .camera = { @@ -2749,6 +2752,13 @@ static struct platform_device *herring_devices[] __initdata = { #ifdef CONFIG_FB_S3C &s3c_device_fb, #endif + +#ifdef CONFIG_VIDEO_FIMC + &s3c_device_fimc0, + &s3c_device_fimc1, + &s3c_device_fimc2, +#endif + #ifdef CONFIG_FB_S3C_TL2796 &s3c_device_spi_gpio, #endif @@ -3057,7 +3067,6 @@ static void __init herring_machine_init(void) s3c_fimc0_set_platdata(&fimc_plat); s3c_fimc1_set_platdata(&fimc_plat); s3c_fimc2_set_platdata(&fimc_plat); - s3c_csis_set_platdata(NULL); #endif #ifdef CONFIG_VIDEO_MFC50 |