diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-08-14 17:34:38 +0200 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-14 17:34:38 +0200 |
| commit | a739260d4e3d88c5c810b14231dbdce73665b0b2 (patch) | |
| tree | 352aeed2d9dad32503eb465eee450e048e309576 /arch/arm/mach-s3c64xx/mach-smartq5.c | |
| parent | DMAENGINE: correct PL080 register header file (diff) | |
| parent | ARM: SMDK6410: Make virtual screen twice depth of real (diff) | |
| download | linux-a739260d4e3d88c5c810b14231dbdce73665b0b2.tar.xz linux-a739260d4e3d88c5c810b14231dbdce73665b0b2.zip | |
Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq5.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq5.c | 36 |
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 1d0326ead90f..70bcbcac4f0f 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", @@ -136,10 +110,10 @@ static struct s3c_fb_pd_win smartq5_fb_win0 = { .win_mode = { .pixclock = 1000000000000ULL / ((40+1+216+800)*(10+1+35+480)*80), - .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, @@ -160,7 +134,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) @@ -168,7 +141,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)); } |