projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'spi/fix/core' into spi-linus
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
plat-samsung
/
dev-backlight.c
diff --git
a/arch/arm/plat-samsung/dev-backlight.c
b/arch/arm/plat-samsung/dev-backlight.c
index d51f9565567cd1d27a197ab83a7ab35618072147..be4ad0b21c082abf990d00bec2f14d665672e78d 100644
(file)
--- a/
arch/arm/plat-samsung/dev-backlight.c
+++ b/
arch/arm/plat-samsung/dev-backlight.c
@@
-70,6
+70,7
@@
static struct samsung_bl_drvdata samsung_dfl_bl_data __initdata = {
.max_brightness = 255,
.dft_brightness = 255,
.pwm_period_ns = 78770,
.max_brightness = 255,
.dft_brightness = 255,
.pwm_period_ns = 78770,
+ .enable_gpio = -1,
.init = samsung_bl_init,
.exit = samsung_bl_exit,
},
.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;
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)
if (bl_data->init)
samsung_bl_data->init = bl_data->init;
if (bl_data->notify)