forked from Minki/linux
ARM: SAMSUNG: Initialize PWM backlight enable_gpio field
The GPIO API defines 0 as being a valid GPIO number, so this field needs to be initialized explicitly. Signed-off-by: Thierry Reding <treding@nvidia.com>
This commit is contained in:
parent
db01120c5f
commit
a63652f1a7
@ -504,6 +504,7 @@ static struct platform_pwm_backlight_data backlight_data = {
|
||||
.dft_brightness = 50,
|
||||
/* tcnt = 0x31 */
|
||||
.pwm_period_ns = 36296,
|
||||
.enable_gpio = -1,
|
||||
.init = h1940_backlight_init,
|
||||
.notify = h1940_backlight_notify,
|
||||
.exit = h1940_backlight_exit,
|
||||
|
@ -522,6 +522,7 @@ static struct platform_pwm_backlight_data rx1950_backlight_data = {
|
||||
.max_brightness = 24,
|
||||
.dft_brightness = 4,
|
||||
.pwm_period_ns = 48000,
|
||||
.enable_gpio = -1,
|
||||
.init = rx1950_backlight_init,
|
||||
.notify = rx1950_backlight_notify,
|
||||
.exit = rx1950_backlight_exit,
|
||||
|
@ -114,6 +114,7 @@ static struct platform_pwm_backlight_data crag6410_backlight_data = {
|
||||
.max_brightness = 1000,
|
||||
.dft_brightness = 600,
|
||||
.pwm_period_ns = 100000, /* about 1kHz */
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static struct platform_device crag6410_backlight_device = {
|
||||
|
@ -114,6 +114,7 @@ static struct platform_pwm_backlight_data hmt_backlight_data = {
|
||||
.max_brightness = 100 * 256,
|
||||
.dft_brightness = 40 * 256,
|
||||
.pwm_period_ns = 1000000000 / (100 * 256 * 20),
|
||||
.enable_gpio = -1,
|
||||
.init = hmt_bl_init,
|
||||
.notify = hmt_bl_notify,
|
||||
.exit = hmt_bl_exit,
|
||||
|
@ -151,6 +151,7 @@ static struct platform_pwm_backlight_data smartq_backlight_data = {
|
||||
.max_brightness = 1000,
|
||||
.dft_brightness = 600,
|
||||
.pwm_period_ns = 1000000000 / (1000 * 20),
|
||||
.enable_gpio = -1,
|
||||
.init = smartq_bl_init,
|
||||
};
|
||||
|
||||
|
@ -625,6 +625,7 @@ static struct samsung_bl_gpio_info smdk6410_bl_gpio_info = {
|
||||
|
||||
static struct platform_pwm_backlight_data smdk6410_bl_data = {
|
||||
.pwm_id = 1,
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static struct s3c_hsotg_plat smdk6410_hsotg_pdata;
|
||||
|
@ -223,6 +223,7 @@ static struct samsung_bl_gpio_info smdk6440_bl_gpio_info = {
|
||||
|
||||
static struct platform_pwm_backlight_data smdk6440_bl_data = {
|
||||
.pwm_id = 1,
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static void __init smdk6440_map_io(void)
|
||||
|
@ -242,6 +242,7 @@ static struct samsung_bl_gpio_info smdk6450_bl_gpio_info = {
|
||||
|
||||
static struct platform_pwm_backlight_data smdk6450_bl_data = {
|
||||
.pwm_id = 1,
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static void __init smdk6450_map_io(void)
|
||||
|
@ -216,6 +216,7 @@ static struct samsung_bl_gpio_info smdkc100_bl_gpio_info = {
|
||||
|
||||
static struct platform_pwm_backlight_data smdkc100_bl_data = {
|
||||
.pwm_id = 0,
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static void __init smdkc100_map_io(void)
|
||||
|
@ -279,6 +279,7 @@ static struct samsung_bl_gpio_info smdkv210_bl_gpio_info = {
|
||||
static struct platform_pwm_backlight_data smdkv210_bl_data = {
|
||||
.pwm_id = 3,
|
||||
.pwm_period_ns = 1000,
|
||||
.enable_gpio = -1,
|
||||
};
|
||||
|
||||
static void __init smdkv210_map_io(void)
|
||||
|
@ -70,6 +70,7 @@ static struct samsung_bl_drvdata samsung_dfl_bl_data __initdata = {
|
||||
.max_brightness = 255,
|
||||
.dft_brightness = 255,
|
||||
.pwm_period_ns = 78770,
|
||||
.enable_gpio = -1,
|
||||
.init = samsung_bl_init,
|
||||
.exit = samsung_bl_exit,
|
||||
},
|
||||
@ -121,6 +122,10 @@ void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info,
|
||||
samsung_bl_data->lth_brightness = bl_data->lth_brightness;
|
||||
if (bl_data->pwm_period_ns)
|
||||
samsung_bl_data->pwm_period_ns = bl_data->pwm_period_ns;
|
||||
if (bl_data->enable_gpio >= 0)
|
||||
samsung_bl_data->enable_gpio = bl_data->enable_gpio;
|
||||
if (bl_data->enable_gpio_flags)
|
||||
samsung_bl_data->enable_gpio_flags = bl_data->enable_gpio_flags;
|
||||
if (bl_data->init)
|
||||
samsung_bl_data->init = bl_data->init;
|
||||
if (bl_data->notify)
|
||||
|
Loading…
Reference in New Issue
Block a user