Re: [PATCH v3 1/2] mfd: axp20x: Add a few missing defines for AXP288 specific registers

From: Lee Jones
Date: Wed Jan 04 2017 - 04:10:38 EST


On Fri, 16 Dec 2016, Hans de Goede wrote:

> Add defines for the AXP288_POWER_REASON and AXP288_RT_BATT_V_H and
> AXP288_RT_BATT_V_L and AXP288_BC_* registers. While at it also move the
> AXP288_TS_ADC_H-AXP288_GP_ADC_L defines, which for some reason where
> in a different place, together with the rest of the AXP288 specific
> defines.
>
> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> ---
> Changes v2:
> -New patch in v2 of this set
> Changes v3:
> -Also add defines for the AXP288_BC_* registers
> ---
> include/linux/mfd/axp20x.h | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)

Applied, thanks.

> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index fe93e00..5edf421 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -229,9 +229,20 @@ enum {
> #define AXP22X_BATLOW_THRES1 0xe6
>
> /* AXP288 specific registers */
> +#define AXP288_POWER_REASON 0x02
> +#define AXP288_BC_GLOBAL 0x2c
> +#define AXP288_BC_VBUS_CNTL 0x2d
> +#define AXP288_BC_USB_STAT 0x2e
> +#define AXP288_BC_DET_STAT 0x2f
> #define AXP288_PMIC_ADC_H 0x56
> #define AXP288_PMIC_ADC_L 0x57
> +#define AXP288_TS_ADC_H 0x58
> +#define AXP288_TS_ADC_L 0x59
> +#define AXP288_GP_ADC_H 0x5a
> +#define AXP288_GP_ADC_L 0x5b
> #define AXP288_ADC_TS_PIN_CTRL 0x84
> +#define AXP288_RT_BATT_V_H 0xa0
> +#define AXP288_RT_BATT_V_L 0xa1
>
> /* Fuel Gauge */
> #define AXP288_FG_RDC1_REG 0xba
> @@ -508,11 +519,6 @@ enum axp809_irqs {
> AXP809_IRQ_GPIO0_INPUT,
> };
>
> -#define AXP288_TS_ADC_H 0x58
> -#define AXP288_TS_ADC_L 0x59
> -#define AXP288_GP_ADC_H 0x5a
> -#define AXP288_GP_ADC_L 0x5b
> -
> struct axp20x_dev {
> struct device *dev;
> int irq;

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog