diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-08-03 14:20:08 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-08-03 14:20:26 -0700 |
| commit | 920ea5534e560d7780ac927f13b94ac547f2e5ad (patch) | |
| tree | 5e00668ec92241b64ddae30ee75364594b0a35cc /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 44c268bc561b85a2f26b4337cd812671f9701f26 (diff) | |
| parent | 96c073888c2a35f6133b109b333cedec6da4910b (diff) | |
| download | olio-linux-3.10-920ea5534e560d7780ac927f13b94ac547f2e5ad.tar.xz olio-linux-3.10-920ea5534e560d7780ac927f13b94ac547f2e5ad.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
Change-Id: Ib528797d744241bfc7dced7ad755ded74d9701b4
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 d81c63eb628..063b3851b4e 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -204,8 +204,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_1s, /* LM3530_RAMP_TIME_1s, */ - .brt_ramp_rise = LM3530_RAMP_TIME_1s, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_fall = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ + .brt_ramp_rise = LM3530_RAMP_TIME_1ms, /* LM3530_RAMP_TIME_1s, */ //.als1_resistor_sel = LM3530_ALS_IMPD_13_53kOhm, //.als2_resistor_sel = LM3530_ALS_IMPD_Z, //.als_vmin = 730, /* mV */ |