Message ID | 4fa8e8327308d8111aed87a3dc493bc6c3a58799.1542823428.git-series.plaes@plaes.org |
---|---|
State | Accepted |
Commit | f5eebc792559d33ddf973f640f7570d042e3bbe8 |
Delegated to: | Jagannadha Sutradharudu Teki |
Headers | show |
Series | Stop AXP from crashing when enabling LDO3 | expand |
diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c index 6de5ec6..e13c762 100644 --- a/drivers/power/axp209.c +++ b/drivers/power/axp209.c @@ -153,10 +153,7 @@ int axp_init(void) if (rc) return rc; - /* Low 4 bits is chip version */ - ver &= 0x0f; - - if (ver != 0x1) + if ((ver & AXP209_CHIP_VERSION_MASK) != 0x1) return -EINVAL; /* Mask all interrupts */ diff --git a/include/axp209.h b/include/axp209.h index 3a4fc28..43e3873 100644 --- a/include/axp209.h +++ b/include/axp209.h @@ -25,6 +25,8 @@ enum axp209_reg { #define AXP209_POWER_STATUS_ON_BY_DC BIT(0) #define AXP209_POWER_STATUS_VBUS_USABLE BIT(4) +#define AXP209_CHIP_VERSION_MASK 0x0f + #define AXP209_OUTPUT_CTRL_EXTEN BIT(0) #define AXP209_OUTPUT_CTRL_DCDC3 BIT(1) #define AXP209_OUTPUT_CTRL_LDO2 BIT(2)