From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Fri, 9 Mar 2012 16:19:27 +0000 (-0800)
Subject: ARM: EXYNOS: Enable JPEG on Origen
X-Git-Tag: v3.4-rc1~88^2~4^2~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=965a330dd5624719b2305b5429d1eedc0417713b;p=users%2Fjedix%2Flinux-maple.git
ARM: EXYNOS: Enable JPEG on Origen
Enables JPEG support on Origen board.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
---
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 2f6cc134c704..c74ae140182c 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -311,6 +311,7 @@ config MACH_ORIGEN
select S5P_DEV_FIMD0
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-origen.c b/arch/arm/mach-exynos/mach-origen.c
index f2201e721459..686d1826c058 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -639,6 +639,7 @@ static struct platform_device *origen_devices[] __initdata = {
&s5p_device_g2d,
&s5p_device_hdmi,
&s5p_device_i2c_hdmiphy,
+ &s5p_device_jpeg,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,