Skip to content

L
linux
Commit bc00d68f authored by Vaibhav Hiremath's avatar Vaibhav Hiremath Committed by Lee Jones
Browse files
Options

mfd: 880m80x: Make use of BIT() macro 

Instead of hard coding the shift for bit definition, use
BIT() macro.
Signed-off-by: default avatarVaibhav Hiremath <vaibhav.hiremath@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent acdecb04
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 81 deletions
include/linux/mfd/88pm80x.h
View file @ bc00d68f
...@@ -60,24 +60,24 @@ enum { ...@@ -60,24 +60,24 @@ enum {
/* page 0 basic: slave adder 0x60 */ /* page 0 basic: slave adder 0x60 */
#define PM800_STATUS_1 (0x01) #define PM800_STATUS_1 (0x01)
#define PM800_ONKEY_STS1 (1 << 0) #define PM800_ONKEY_STS1 BIT(0)
#define PM800_EXTON_STS1 (1 << 1) #define PM800_EXTON_STS1 BIT(1)
#define PM800_CHG_STS1 (1 << 2) #define PM800_CHG_STS1 BIT(2)
#define PM800_BAT_STS1 (1 << 3) #define PM800_BAT_STS1 BIT(3)
#define PM800_VBUS_STS1 (1 << 4) #define PM800_VBUS_STS1 BIT(4)
#define PM800_LDO_PGOOD_STS1 (1 << 5) #define PM800_LDO_PGOOD_STS1 BIT(5)
#define PM800_BUCK_PGOOD_STS1 (1 << 6) #define PM800_BUCK_PGOOD_STS1 BIT(6)
#define PM800_STATUS_2 (0x02) #define PM800_STATUS_2 (0x02)
#define PM800_RTC_ALARM_STS2 (1 << 0) #define PM800_RTC_ALARM_STS2 BIT(0)
/* Wakeup Registers */ /* Wakeup Registers */
#define PM800_WAKEUP1 (0x0D) #define PM800_WAKEUP1 (0x0D)
#define PM800_WAKEUP2 (0x0E) #define PM800_WAKEUP2 (0x0E)
#define PM800_WAKEUP2_INV_INT (1 << 0) #define PM800_WAKEUP2_INV_INT BIT(0)
#define PM800_WAKEUP2_INT_CLEAR (1 << 1) #define PM800_WAKEUP2_INT_CLEAR BIT(1)
#define PM800_WAKEUP2_INT_MASK (1 << 2) #define PM800_WAKEUP2_INT_MASK BIT(2)
#define PM800_POWER_UP_LOG (0x10) #define PM800_POWER_UP_LOG (0x10)
...@@ -89,26 +89,26 @@ enum { ...@@ -89,26 +89,26 @@ enum {
/* GPIO register */ /* GPIO register */
#define PM800_GPIO_0_1_CNTRL (0x30) #define PM800_GPIO_0_1_CNTRL (0x30)
#define PM800_GPIO0_VAL (1 << 0) #define PM800_GPIO0_VAL BIT(0)
#define PM800_GPIO0_GPIO_MODE(x) (x << 1) #define PM800_GPIO0_GPIO_MODE(x) (x << 1)
#define PM800_GPIO1_VAL (1 << 4) #define PM800_GPIO1_VAL BIT(4)
#define PM800_GPIO1_GPIO_MODE(x) (x << 5) #define PM800_GPIO1_GPIO_MODE(x) (x << 5)
#define PM800_GPIO_2_3_CNTRL (0x31) #define PM800_GPIO_2_3_CNTRL (0x31)
#define PM800_GPIO2_VAL (1 << 0) #define PM800_GPIO2_VAL BIT(0)
#define PM800_GPIO2_GPIO_MODE(x) (x << 1) #define PM800_GPIO2_GPIO_MODE(x) (x << 1)
#define PM800_GPIO3_VAL (1 << 4) #define PM800_GPIO3_VAL BIT(4)
#define PM800_GPIO3_GPIO_MODE(x) (x << 5) #define PM800_GPIO3_GPIO_MODE(x) (x << 5)
#define PM800_GPIO3_MODE_MASK 0x1F #define PM800_GPIO3_MODE_MASK 0x1F
#define PM800_GPIO3_HEADSET_MODE PM800_GPIO3_GPIO_MODE(6) #define PM800_GPIO3_HEADSET_MODE PM800_GPIO3_GPIO_MODE(6)
#define PM800_GPIO_4_CNTRL (0x32) #define PM800_GPIO_4_CNTRL (0x32)
#define PM800_GPIO4_VAL (1 << 0) #define PM800_GPIO4_VAL BIT(0)
#define PM800_GPIO4_GPIO_MODE(x) (x << 1) #define PM800_GPIO4_GPIO_MODE(x) (x << 1)
#define PM800_HEADSET_CNTRL (0x38) #define PM800_HEADSET_CNTRL (0x38)
#define PM800_HEADSET_DET_EN (1 << 7) #define PM800_HEADSET_DET_EN BIT(7)
#define PM800_HSDET_SLP (1 << 1) #define PM800_HSDET_SLP BIT(1)
/* PWM register */ /* PWM register */
#define PM800_PWM1 (0x40) #define PM800_PWM1 (0x40)
#define PM800_PWM2 (0x41) #define PM800_PWM2 (0x41)
...@@ -123,10 +123,10 @@ enum { ...@@ -123,10 +123,10 @@ enum {
#define PM800_RTC_MISC4 (0xE4) #define PM800_RTC_MISC4 (0xE4)
#define PM800_RTC_MISC5 (0xE7) #define PM800_RTC_MISC5 (0xE7)
/* bit definitions of RTC Register 1 (0xD0) */ /* bit definitions of RTC Register 1 (0xD0) */
#define PM800_ALARM1_EN (1 << 0) #define PM800_ALARM1_EN BIT(0)
#define PM800_ALARM_WAKEUP (1 << 4) #define PM800_ALARM_WAKEUP BIT(4)
#define PM800_ALARM (1 << 5) #define PM800_ALARM BIT(5)
#define PM800_RTC1_USE_XO (1 << 7) #define PM800_RTC1_USE_XO BIT(7)
/* Regulator Control Registers: BUCK1,BUCK5,LDO1 have DVC */ /* Regulator Control Registers: BUCK1,BUCK5,LDO1 have DVC */
...@@ -140,18 +140,18 @@ enum { ...@@ -140,18 +140,18 @@ enum {
/* page 2 GPADC: slave adder 0x02 */ /* page 2 GPADC: slave adder 0x02 */
#define PM800_GPADC_MEAS_EN1 (0x01) #define PM800_GPADC_MEAS_EN1 (0x01)
#define PM800_MEAS_EN1_VBAT (1 << 2) #define PM800_MEAS_EN1_VBAT BIT(2)
#define PM800_GPADC_MEAS_EN2 (0x02) #define PM800_GPADC_MEAS_EN2 (0x02)
#define PM800_MEAS_EN2_RFTMP (1 << 0) #define PM800_MEAS_EN2_RFTMP BIT(0)
#define PM800_MEAS_GP0_EN (1 << 2) #define PM800_MEAS_GP0_EN BIT(2)
#define PM800_MEAS_GP1_EN (1 << 3) #define PM800_MEAS_GP1_EN BIT(3)
#define PM800_MEAS_GP2_EN (1 << 4) #define PM800_MEAS_GP2_EN BIT(4)
#define PM800_MEAS_GP3_EN (1 << 5) #define PM800_MEAS_GP3_EN BIT(5)
#define PM800_MEAS_GP4_EN (1 << 6) #define PM800_MEAS_GP4_EN BIT(6)
#define PM800_GPADC_MISC_CONFIG1 (0x05) #define PM800_GPADC_MISC_CONFIG1 (0x05)
#define PM800_GPADC_MISC_CONFIG2 (0x06) #define PM800_GPADC_MISC_CONFIG2 (0x06)
#define PM800_GPADC_MISC_GPFSM_EN (1 << 0) #define PM800_GPADC_MISC_GPFSM_EN BIT(0)
#define PM800_GPADC_SLOW_MODE(x) (x << 3) #define PM800_GPADC_SLOW_MODE(x) (x << 3)
#define PM800_GPADC_MISC_CONFIG3 (0x09) #define PM800_GPADC_MISC_CONFIG3 (0x09)
...@@ -162,16 +162,16 @@ enum { ...@@ -162,16 +162,16 @@ enum {
#define PM800_GPADC_PREBIAS2 (0x10) #define PM800_GPADC_PREBIAS2 (0x10)
#define PM800_GP_BIAS_ENA1 (0x14) #define PM800_GP_BIAS_ENA1 (0x14)
#define PM800_GPADC_GP_BIAS_EN0 (1 << 0) #define PM800_GPADC_GP_BIAS_EN0 BIT(0)
#define PM800_GPADC_GP_BIAS_EN1 (1 << 1) #define PM800_GPADC_GP_BIAS_EN1 BIT(1)
#define PM800_GPADC_GP_BIAS_EN2 (1 << 2) #define PM800_GPADC_GP_BIAS_EN2 BIT(2)
#define PM800_GPADC_GP_BIAS_EN3 (1 << 3) #define PM800_GPADC_GP_BIAS_EN3 BIT(3)
#define PM800_GP_BIAS_OUT1 (0x15) #define PM800_GP_BIAS_OUT1 (0x15)
#define PM800_BIAS_OUT_GP0 (1 << 0) #define PM800_BIAS_OUT_GP0 BIT(0)
#define PM800_BIAS_OUT_GP1 (1 << 1) #define PM800_BIAS_OUT_GP1 BIT(1)
#define PM800_BIAS_OUT_GP2 (1 << 2) #define PM800_BIAS_OUT_GP2 BIT(2)
#define PM800_BIAS_OUT_GP3 (1 << 3) #define PM800_BIAS_OUT_GP3 BIT(3)
#define PM800_GPADC0_LOW_TH 0x20 #define PM800_GPADC0_LOW_TH 0x20
#define PM800_GPADC1_LOW_TH 0x21 #define PM800_GPADC1_LOW_TH 0x21
...@@ -222,31 +222,31 @@ enum { ...@@ -222,31 +222,31 @@ enum {
#define PM805_INT_STATUS1 (0x03) #define PM805_INT_STATUS1 (0x03)
#define PM805_INT1_HP1_SHRT (1 << 0) #define PM805_INT1_HP1_SHRT BIT(0)
#define PM805_INT1_HP2_SHRT (1 << 1) #define PM805_INT1_HP2_SHRT BIT(1)
#define PM805_INT1_MIC_CONFLICT (1 << 2) #define PM805_INT1_MIC_CONFLICT BIT(2)
#define PM805_INT1_CLIP_FAULT (1 << 3) #define PM805_INT1_CLIP_FAULT BIT(3)
#define PM805_INT1_LDO_OFF (1 << 4) #define PM805_INT1_LDO_OFF BIT(4)
#define PM805_INT1_SRC_DPLL_LOCK (1 << 5) #define PM805_INT1_SRC_DPLL_LOCK BIT(5)
#define PM805_INT_STATUS2 (0x04) #define PM805_INT_STATUS2 (0x04)
#define PM805_INT2_MIC_DET (1 << 0) #define PM805_INT2_MIC_DET BIT(0)
#define PM805_INT2_SHRT_BTN_DET (1 << 1) #define PM805_INT2_SHRT_BTN_DET BIT(1)
#define PM805_INT2_VOLM_BTN_DET (1 << 2) #define PM805_INT2_VOLM_BTN_DET BIT(2)
#define PM805_INT2_VOLP_BTN_DET (1 << 3) #define PM805_INT2_VOLP_BTN_DET BIT(3)
#define PM805_INT2_RAW_PLL_FAULT (1 << 4) #define PM805_INT2_RAW_PLL_FAULT BIT(4)
#define PM805_INT2_FINE_PLL_FAULT (1 << 5) #define PM805_INT2_FINE_PLL_FAULT BIT(5)
#define PM805_INT_MASK1 (0x05) #define PM805_INT_MASK1 (0x05)
#define PM805_INT_MASK2 (0x06) #define PM805_INT_MASK2 (0x06)
#define PM805_SHRT_BTN_DET (1 << 1) #define PM805_SHRT_BTN_DET BIT(1)
/* number of status and int reg in a row */ /* number of status and int reg in a row */
#define PM805_INT_REG_NUM (2) #define PM805_INT_REG_NUM (2)
#define PM805_MIC_DET1 (0x07) #define PM805_MIC_DET1 (0x07)
#define PM805_MIC_DET_EN_MIC_DET (1 << 0) #define PM805_MIC_DET_EN_MIC_DET BIT(0)
#define PM805_MIC_DET2 (0x08) #define PM805_MIC_DET2 (0x08)
#define PM805_MIC_DET_STATUS1 (0x09) #define PM805_MIC_DET_STATUS1 (0x09)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7