diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2012-03-09 11:19:27 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-11 01:32:27 -0500 |
commit | 965a330dd5624719b2305b5429d1eedc0417713b (patch) | |
tree | b8a4255085de38b0ed75b419a7234f3cc662b9f9 /arch/arm | |
parent | 9fbe8c7a481daa94a5f87b47b0ffd54f05447e4c (diff) |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 1 |
2 files changed, 2 insertions, 0 deletions
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 | |||
311 | select S5P_DEV_FIMD0 | 311 | select S5P_DEV_FIMD0 |
312 | select S5P_DEV_G2D | 312 | select S5P_DEV_G2D |
313 | select S5P_DEV_I2C_HDMIPHY | 313 | select S5P_DEV_I2C_HDMIPHY |
314 | select S5P_DEV_JPEG | ||
314 | select S5P_DEV_MFC | 315 | select S5P_DEV_MFC |
315 | select S5P_DEV_TV | 316 | select S5P_DEV_TV |
316 | select S5P_DEV_USB_EHCI | 317 | 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 = { | |||
639 | &s5p_device_g2d, | 639 | &s5p_device_g2d, |
640 | &s5p_device_hdmi, | 640 | &s5p_device_hdmi, |
641 | &s5p_device_i2c_hdmiphy, | 641 | &s5p_device_i2c_hdmiphy, |
642 | &s5p_device_jpeg, | ||
642 | &s5p_device_mfc, | 643 | &s5p_device_mfc, |
643 | &s5p_device_mfc_l, | 644 | &s5p_device_mfc_l, |
644 | &s5p_device_mfc_r, | 645 | &s5p_device_mfc_r, |