aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2015-03-04 11:14:29 -0500
committerLee Jones <lee.jones@linaro.org>2015-03-12 05:07:27 -0400
commit3be62b957d2c02cf744d3845091dd8a5fdca2039 (patch)
treed07f42ae8b527cd6073c4e364f095394eb893dce /include/linux
parent60ae5b9f5cdd80c529eda13bfdd600a0fc857afb (diff)
mfd: max77693: Adjust FLASH_EN_SHIFT and TORCH_EN_SHIFT macros
Modify FLASH_EN_SHIFT and TORCH_EN_SHIFT macros to work properly when passed enum max77693_fled values (0 for FLED1 and 1 for FLED2) from leds-max77693 driver. Previous definitions were compatible with one of the previous RFC versions of leds-max77693.c driver, which was not merged. Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mfd/max77693-private.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h
index 955dd990beaf..5acd7104ad34 100644
--- a/include/linux/mfd/max77693-private.h
+++ b/include/linux/mfd/max77693-private.h
@@ -113,8 +113,8 @@ enum max77693_pmic_reg {
113#define FLASH_EN_FLASH 0x1 113#define FLASH_EN_FLASH 0x1
114#define FLASH_EN_TORCH 0x2 114#define FLASH_EN_TORCH 0x2
115#define FLASH_EN_ON 0x3 115#define FLASH_EN_ON 0x3
116#define FLASH_EN_SHIFT(x) (6 - ((x) - 1) * 2) 116#define FLASH_EN_SHIFT(x) (6 - (x) * 2)
117#define TORCH_EN_SHIFT(x) (2 - ((x) - 1) * 2) 117#define TORCH_EN_SHIFT(x) (2 - (x) * 2)
118 118
119/* MAX77693 MAX_FLASH1 register */ 119/* MAX77693 MAX_FLASH1 register */
120#define MAX_FLASH1_MAX_FL_EN 0x80 120#define MAX_FLASH1_MAX_FL_EN 0x80