summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-03-09 08:19:27 -0800
committerKukjin Kim <kgene.kim@samsung.com>2012-03-10 22:32:27 -0800
commit965a330dd5624719b2305b5429d1eedc0417713b (patch)
treeb8a4255085de38b0ed75b419a7234f3cc662b9f9
parent9fbe8c7a481daa94a5f87b47b0ffd54f05447e4c (diff)
downloadlinux-3.10-965a330dd5624719b2305b5429d1eedc0417713b.tar.gz
linux-3.10-965a330dd5624719b2305b5429d1eedc0417713b.tar.bz2
linux-3.10-965a330dd5624719b2305b5429d1eedc0417713b.zip
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>
-rw-r--r--arch/arm/mach-exynos/Kconfig1
-rw-r--r--arch/arm/mach-exynos/mach-origen.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 2f6cc134c70..c74ae140182 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 f2201e72145..686d1826c05 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,