Merge branch 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux

* 'for-linus/samsung-2635' of git://git.fluff.org/bjdooks/linux:
  DMAENGINE: correct PL080 register header file
  ARM: SAMSUNG: Fix on build warning about dependency in Kconfig
  ARM: SMDK6410: Make virtual screen twice depth of real
  ARM: S3C64XX: Update consistent DMA size to 8MiB
  ARM: S3C64XX: Add audio support to SmartQ
  ARM: S3C64XX: Framebuffer fix for SmartQ5
  ARM: S3C64XX: Set wifi and iNAND as permanently connected SD devices on SmartQ boards
  ARM: S3C64XX: Move SmartQ LCD control platform definition to shared file
  ARM: mach-real6410: add sdhc device support
  ARM: mach-real6410: add dm9000 ethernet support for mach-real6410
  ARM: S3C64XX: Support for Real6410

Fix up trivial conflicts in arch/arm/mach-s3c64xx/mach-smartq5.c
("remove pixclock" vs "Framebuffer fix for SmartQ5")

1 files changed, 4 insertions, 32 deletions

diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index a065062ec2a4..a4d59b076e3d 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -12,7 +12,6 @@
 #include <linux/fb.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
-#include <linux/i2c-gpio.h>
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/leds.h>
@@ -33,31 +32,6 @@
 
 #include "mach-smartq.h"
 
-static void __init smartq5_lcd_setup_gpio(void)
-{
-        gpio_request(S3C64XX_GPM(0), "LCD SCEN pin");
-        gpio_request(S3C64XX_GPM(1), "LCD SCL pin");
-        gpio_request(S3C64XX_GPM(2), "LCD SDA pin");
-        gpio_request(S3C64XX_GPM(3), "LCD power");
-
-        /* turn power off */
-        gpio_direction_output(S3C64XX_GPM(0), 1);
-        gpio_direction_input(S3C64XX_GPM(1));
-        gpio_direction_input(S3C64XX_GPM(2));
-        gpio_direction_output(S3C64XX_GPM(3), 0);
-}
-
-static struct i2c_gpio_platform_data smartq5_lcd_control = {
-        .sda_pin                = S3C64XX_GPM(2),
-        .scl_pin                = S3C64XX_GPM(1),
-};
-
-static struct platform_device smartq5_lcd_control_device = {
-        .name                   = "i2c-gpio",
-        .id                     = 1,
-        .dev.platform_data      = &smartq5_lcd_control,
-};
-
 static struct gpio_led smartq5_leds[] __initdata = {
         {
                 .name                   = "smartq5:green",
@@ -134,10 +108,10 @@ static struct platform_device smartq5_buttons_device  = {
 
 static struct s3c_fb_pd_win smartq5_fb_win0 = {
         .win_mode       = {
-                .left_margin    = 40,
-                .right_margin   = 216,
-                .upper_margin   = 10,
-                .lower_margin   = 35,
+                .left_margin    = 216,
+                .right_margin   = 40,
+                .upper_margin   = 35,
+                .lower_margin   = 10,
                 .hsync_len      = 1,
                 .vsync_len      = 1,
                 .xres           = 800,
@@ -159,7 +133,6 @@ static struct s3c_fb_platdata smartq5_lcd_pdata __initdata = {
 static struct platform_device *smartq5_devices[] __initdata = {
         &smartq5_leds_device,
         &smartq5_buttons_device,
-        &smartq5_lcd_control_device,
 };
 
 static void __init smartq5_machine_init(void)
@@ -167,7 +140,6 @@ static void __init smartq5_machine_init(void)
         s3c_fb_set_platdata(&smartq5_lcd_pdata);
 
         smartq_machine_init();
-        smartq5_lcd_setup_gpio();
 
         platform_add_devices(smartq5_devices, ARRAY_SIZE(smartq5_devices));
 }