diff options
| author | Evan Wilson <evan@oliodevices.com> | 2016-04-22 03:29:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal> | 2015-04-16 10:08:13 +0000 |
| commit | 3bf4e16d2b0fac75f0db18e0235ed5a79d60f7e4 (patch) | |
| tree | f6801cfa777ca9e2b40fef008b66501f94795c75 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 7622c71e8e291035b8be881889a3abeab7719fa7 (diff) | |
| parent | 4ce93efa724f043aa1a0725f582d01d1693b1812 (diff) | |
| download | olio-linux-3.10-3bf4e16d2b0fac75f0db18e0235ed5a79d60f7e4.tar.xz olio-linux-3.10-3bf4e16d2b0fac75f0db18e0235ed5a79d60f7e4.zip | |
Merge "Changed times used for increasing / decreasing brightness." into android-3.10-bringup
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 7915962e45b..a83a3416f06 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -228,8 +228,8 @@ static struct lm3530_platform_data omap3h1_backlight_platform_data = { //.pwm_pol_hi = true, //.als_avrg_time = LM3530_ALS_AVRG_TIME_512ms, .brt_ramp_law = 0, - .brt_ramp_fall = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ - .brt_ramp_rise = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_fall = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_rise = LM3530_RAMP_TIME_260ms, /* LM3530_RAMP_TIME_1s, */ //.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm, //.als2_resistor_sel = LM3530_ALS_IMPD_Z, //.als_vmin = 730, /* mV */ |