diff options
author | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:19 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-01-16 22:46:19 -0800 |
commit | 090e648a20a43d71fc2d63e0d8ff8ec6822e2396 (patch) | |
tree | bc8f67d9c5b0de5a20b251e4fd1f411cc8277deb /arch/arm/mach-exynos | |
parent | 8b0f6d12de91345190f234edba781b2fd03257b6 (diff) | |
parent | 815ed6fc0a4d82bb39ed43d230c4e516214987e7 (diff) | |
download | linux-3.10-090e648a20a43d71fc2d63e0d8ff8ec6822e2396.tar.gz linux-3.10-090e648a20a43d71fc2d63e0d8ff8ec6822e2396.tar.bz2 linux-3.10-090e648a20a43d71fc2d63e0d8ff8ec6822e2396.zip |
Merge branch 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN
ARM: S3C64XX: Fix interrupt configuration for PCA935x on Cragganmore
ARM: S3C64XX: Fix the memory mapped GPIOs on Cragganmore
ARM: S3C64XX: Remove hsmmc1 from Cragganmore
ARM: S3C64XX: Remove unconditional power domain disables
ARM: SAMSUNG: Declare struct platform_device in plat/s3c64xx-spi.h
ARM: SAMSUNG: dma-ops.h needs mach/dma.h
ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 2b11e046d39..0679b8ad2d1 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -597,7 +597,8 @@ static struct s3c_fb_pd_win origen_fb_win0 = { static struct s3c_fb_platdata origen_lcd_pdata __initdata = { .win[0] = &origen_fb_win0, .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, - .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC, + .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC | + VIDCON1_INV_VCLK, .setup_gpio = exynos4_fimd0_gpio_setup_24bpp, }; |