aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-01-30 14:50:41 +0530
committerTushar Behera <tushar.behera@linaro.org>2012-02-01 17:21:59 +0530
commitd85217fd40a860f5ac7f68707f299907c71b0fda (patch)
tree3d3e0707cf54177ae3e19f8eb9fa571540039348
parent4b364e2c65485bf0245db0c2e3900f434da01dcc (diff)
ARM: EXYNOS: Enable JPEG on SMDKV310
This patch enables JPEG support on SMDKV310 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
-rw-r--r--arch/arm/mach-exynos/Kconfig1
-rw-r--r--arch/arm/mach-exynos/mach-smdkv310.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 1db4a19e9dc..ed96d7e9743 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -195,6 +195,7 @@ config MACH_SMDKV310
select S5P_DEV_FIMC3
select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY
+ select S5P_DEV_JPEG
select S5P_DEV_MFC
select S5P_DEV_TV
select S5P_DEV_USB_EHCI
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c
index 265ce86f711..61aed2eb50c 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -272,6 +272,7 @@ static struct platform_device *smdkv310_devices[] __initdata = {
&s5p_device_fimc3,
&s5p_device_fimc_md,
&s5p_device_g2d,
+ &s5p_device_jpeg,
&exynos4_device_ac97,
&exynos4_device_i2s0,
&exynos4_device_ohci,
@@ -381,6 +382,8 @@ static void __init smdkv310_machine_init(void)
clk_xusbxti.rate = 24000000;
platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
+
+ s5p_device_jpeg.dev.parent = &exynos4_device_pd[PD_CAM].dev;
s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
}