Merge branch 'next-samsung-cleanup-samsung' of git://git.kernel.org/pub/scm/linux...

diff --combined arch/arm/mach-s5pv210/mach-smdkv210.c
index 8662ef6e5681a40df5eaaf7eb4dce07127e1b594,10a4ec6989c8a1d9651c1584ca3c3e42bbd90c15..513db9234c41d7168fa4c7c84884ccf399ff9d6b
--- 1/arch/arm/mach-s5pv210/mach-smdkv210.c
--- 2/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@@ -153,15 -153,12 +153,12 @@@ static void smdkv210_lte480wv_set_power
  {
        if (power) {
  #if !defined(CONFIG_BACKLIGHT_PWM)
-               gpio_request(S5PV210_GPD0(3), "GPD0");
-               gpio_direction_output(S5PV210_GPD0(3), 1);
+               gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_HIGH, "GPD0");
                gpio_free(S5PV210_GPD0(3));
  #endif
  
                /* fire nRESET on power up */
-               gpio_request(S5PV210_GPH0(6), "GPH0");
- 
-               gpio_direction_output(S5PV210_GPH0(6), 1);
+               gpio_request_one(S5PV210_GPH0(6), GPIOF_OUT_INIT_HIGH, "GPH0");
  
                gpio_set_value(S5PV210_GPH0(6), 0);
                mdelay(10);
@@@ -172,8 -169,7 +169,7 @@@
                gpio_free(S5PV210_GPH0(6));
        } else {
  #if !defined(CONFIG_BACKLIGHT_PWM)
-               gpio_request(S5PV210_GPD0(3), "GPD0");
-               gpio_direction_output(S5PV210_GPD0(3), 0);
+               gpio_request_one(S5PV210_GPD0(3), GPIOF_OUT_INIT_LOW, "GPD0");
                gpio_free(S5PV210_GPD0(3));
  #endif
        }
@@@ -273,7 -269,6 +269,7 @@@ static struct samsung_bl_gpio_info smdk
  
  static struct platform_pwm_backlight_data smdkv210_bl_data = {
        .pwm_id = 3,
 +      .pwm_period_ns = 1000,
  };
  
  static void __init smdkv210_map_io(void)