diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/leds/leds-max8997.c | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/leds/leds-max8997.c')
| -rw-r--r-- | drivers/leds/leds-max8997.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/leds-max8997.c b/drivers/leds/leds-max8997.c index 54c4a04..2b7a8c7 100644 --- a/drivers/leds/leds-max8997.c +++ b/drivers/leds/leds-max8997.c @@ -39,7 +39,7 @@ static inline int led_regulator_get_max_brightness(struct regulator *supply) int voltage = regulator_list_voltage(supply, 0); /*TODO*/ -#if defined(CONFIG_MACH_Q1_BD) +#if defined(CONFIG_MACH_Q1_BD) || defined(CONFIG_MACH_U1_NA_USCC) return LED_BRIGHTNESS_MAX_LEVEL; #else return 1; @@ -126,7 +126,7 @@ static void regulator_led_set_value(struct regulator_led *led) /* Q1 has torch light widget, and it changes */ /* its brightness level without disabling rerulator */ /* So, remove the below code for Q1 */ -#if !defined(CONFIG_MACH_Q1_BD) +#if !defined(CONFIG_MACH_Q1_BD) && !defined(CONFIG_MACH_U1_NA_USCC) if (regulator_is_enabled(movie) > 0) { pr_info("%s: led_movie is enabled.\n", __func__); goto end; @@ -146,7 +146,7 @@ static void regulator_led_set_value(struct regulator_led *led) } #endif -#if defined(CONFIG_MACH_Q1_BD) +#if defined(CONFIG_MACH_Q1_BD) || defined(CONFIG_MACH_U1_NA_USCC) switch (led->value) { case LED_BRIGHTNESS_LEVEL1: regulator_set_current_limit(led->vcc, 10000, 20000); |