diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-08-14 16:34:38 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-08-14 16:34:38 +0100 |
| commit | a739260d4e3d88c5c810b14231dbdce73665b0b2 (patch) | |
| tree | 352aeed2d9dad32503eb465eee450e048e309576 /arch/arm/mach-s3c64xx/mach-smartq7.c | |
| parent | d92342df2a06baa8f5d7bf609b0bc0dc87067e82 (diff) | |
| parent | 001ca74f185f32bd8383146f9ffedd2de9b882ed (diff) | |
| download | kernel_samsung_smdk4412-a739260d4e3d88c5c810b14231dbdce73665b0b2.tar.gz kernel_samsung_smdk4412-a739260d4e3d88c5c810b14231dbdce73665b0b2.tar.bz2 kernel_samsung_smdk4412-a739260d4e3d88c5c810b14231dbdce73665b0b2.zip | |
Merge branch 'for-2636/s3c64xx' into for-linus/samsung-2635
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smartq7.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index e0bc78ecb15..c4868dbd2fe 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.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 smartq7_lcd_setup_gpio(void) -{ - gpio_request(S3C64XX_GPM(0), "LCD CSB pin"); - gpio_request(S3C64XX_GPM(3), "LCD power"); - gpio_request(S3C64XX_GPM(4), "LCD power status"); - - /* turn power off */ - gpio_direction_output(S3C64XX_GPM(0), 1); - gpio_direction_output(S3C64XX_GPM(3), 0); - gpio_direction_input(S3C64XX_GPM(4)); -} - -static struct i2c_gpio_platform_data smartq7_lcd_control = { - .sda_pin = S3C64XX_GPM(2), - .scl_pin = S3C64XX_GPM(1), - .sda_is_open_drain = 1, - .scl_is_open_drain = 1, -}; - -static struct platform_device smartq7_lcd_control_device = { - .name = "i2c-gpio", - .id = 1, - .dev.platform_data = &smartq7_lcd_control, -}; - static struct gpio_led smartq7_leds[] __initdata = { { .name = "smartq7:red", @@ -176,7 +150,6 @@ static struct s3c_fb_platdata smartq7_lcd_pdata __initdata = { static struct platform_device *smartq7_devices[] __initdata = { &smartq7_leds_device, &smartq7_buttons_device, - &smartq7_lcd_control_device, }; static void __init smartq7_machine_init(void) @@ -184,7 +157,6 @@ static void __init smartq7_machine_init(void) s3c_fb_set_platdata(&smartq7_lcd_pdata); smartq_machine_init(); - smartq7_lcd_setup_gpio(); platform_add_devices(smartq7_devices, ARRAY_SIZE(smartq7_devices)); } |