mfd: axp20x: Add usb-power-supply support
v3 cover mfd: axp20x: Add usb-power-supply support
Hi Lee,
AFAICT these 2 are ready for merging but I do not see them in mfd/for-mfd-next hence this resend.
Thanks,
Hans
PATCH RESEND v3 1/2 mfd: axp20x: Add missing registers, and mark more registers volatile
From: Bruno Pr?mont <[email protected]>
Add an extra set of registers which is necessary tu support the PMICs battery charger function, and mark registers which contain status bits, gpio status, and adc readings as volatile.
---
Changes in v2:
-Add a AXP20X_OCV_MAX define
Changes in v3:
-Add Bruno's S-o-b
--- drivers/mfd/axp20x.c | 8 +++++++- include/linux/mfd/axp20x.h | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-)
drivers/mfd/axp20x.c +7 -1
@@ -61,10 +61,16 @@ static const struct regmap_access_table axp152_volatile_table = {static const struct regmap_range axp20x_writeable_ranges[] = {regmap_reg_range (AXP20X_DATACACHE (0 ),AXP20X_IRQ5_STATE ),regmap_reg_range (AXP20X_DCDC_MODE ,AXP20X_FG_RES ), +regmap_reg_range (AXP20X_RDC_H ,AXP20X_OCV (15 )), };static const struct regmap_range axp20x_volatile_ranges[] = { +regmap_reg_range (AXP20X_PWR_INPUT_STATUS ,AXP20X_USB_OTG_STATUS ), +regmap_reg_range (AXP20X_CHRG_CTRL1 ,AXP20X_CHRG_CTRL2 ),regmap_reg_range (AXP20X_IRQ1_EN ,AXP20X_IRQ5_STATE ), +regmap_reg_range (AXP20X_ACIN_V_ADC_H ,AXP20X_IPSOUT_V_HIGH_L ), +regmap_reg_range (AXP20X_GPIO20_SS ,AXP20X_GPIO3_CTRL ), +regmap_reg_range (AXP20X_FG_RES ,AXP20X_RDC_L ), };static const struct regmap_access_table axp20x_writeable_table = {
@@ -195,7 +201,7 @@ static const struct regmap_config axp20x_regmap_config = { .val_bits = 8, .wr_table = &axp20x_writeable_table, .volatile_table = &axp20x_volatile_table, - .max_register = AXP20X_FG_RES, + .max_register = AXP20X_OCV(AXP20X_OCV_MAX), .cache_type = REGCACHE_RBTREE, };
include/linux/mfd/axp20x.h +6 -0
@@ -190,6 +190,12 @@ enum {#define AXP20X_CC_CTRL 0xb8#define AXP20X_FG_RES 0xb9 +/* OCV */ +#define AXP20X_RDC_H 0xba +#define AXP20X_RDC_L 0xbb +#define AXP20X_OCV (m) (0xc0 + (m)) +#define AXP20X_OCV_MAX 0xf +/* AXP22X specific registers */ #define AXP22X_BATLOW_THRES1 0xe6
Signature · 1 line
2.4.3
PATCH RESEND v3 1/2 mfd: axp20x: Add missing registers, and mark more registers volatile
Quoted 26 lines · On Sat, 1 Aug 2015 09:25:17 Hans de Goede <[email protected]> wrote:
From: Bruno Pr?mont <[email protected]>
Add an extra set of registers which is necessary tu support the PMICs battery charger function, and mark registers which contain status bits, gpio status, and adc readings as volatile.
Cc Bruno Pr?mont <[email protected]>Signed-off-by Bruno Pr?mont <[email protected]>Signed-off-by Hans de Goede <[email protected]>Acked-by Lee Jones <[email protected]>Acked-by Maxime Ripard <[email protected]>---
Changes in v2:
-Add aAXP20X_OCV_MAXdefine
Changes in v3:(quoted diff) +0
-2-Add Bruno's S-o-b --- drivers/mfd/axp20x.c | 8 +++++++- include/linux/mfd/axp20x.h | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-)drivers/mfd/axp20x.c +0
-0
drivers/mfd/axp20x.c static const struct regmap_access_table axp152_volatile_table = { · line 64
Quoted 4 lines
drivers/mfd/axp20x.c +1
-0@@ -61,10 +61,16 @@ static const struct regmap_access_table axp152_volatile_table = {static const struct regmap_range axp20x_writeable_ranges[] = {regmap_reg_range (AXP20X_DATACACHE (0 ),AXP20X_IRQ5_STATE ),regmap_reg_range (AXP20X_DCDC_MODE ,AXP20X_FG_RES ), +regmap_reg_range (AXP20X_RDC_H ,AXP20X_OCV (15 )),
As AXP20X_OCV_MAX has been added, this should be:
+ regmap_reg_range(AXP20X_RDC_H, AXP20X_OCV(AXP20X_OCV_MAX)),
Quoted 38 lines
drivers/mfd/axp20x.c +6
-1};static const struct regmap_range axp20x_volatile_ranges[] = { +regmap_reg_range (AXP20X_PWR_INPUT_STATUS ,AXP20X_USB_OTG_STATUS ), +regmap_reg_range (AXP20X_CHRG_CTRL1 ,AXP20X_CHRG_CTRL2 ),regmap_reg_range (AXP20X_IRQ1_EN ,AXP20X_IRQ5_STATE ), +regmap_reg_range (AXP20X_ACIN_V_ADC_H ,AXP20X_IPSOUT_V_HIGH_L ), +regmap_reg_range (AXP20X_GPIO20_SS ,AXP20X_GPIO3_CTRL ), +regmap_reg_range (AXP20X_FG_RES ,AXP20X_RDC_L ), };static const struct regmap_access_table axp20x_writeable_table = {@@ -195,7 +201,7 @@ static const struct regmap_config axp20x_regmap_config = { .val_bits = 8, .wr_table = &axp20x_writeable_table, .volatile_table = &axp20x_volatile_table, - .max_register = AXP20X_FG_RES, + .max_register = AXP20X_OCV(AXP20X_OCV_MAX), .cache_type = REGCACHE_RBTREE, };include/linux/mfd/axp20x.h +6
-0@@ -190,6 +190,12 @@ enum {#define AXP20X_CC_CTRL 0xb8#define AXP20X_FG_RES 0xb9 +/* OCV */ +#define AXP20X_RDC_H 0xba +#define AXP20X_RDC_L 0xbb +#define AXP20X_OCV (m) (0xc0 + (m)) +#define AXP20X_OCV_MAX 0xf +/* AXP22X specific registers */ #define AXP22X_BATLOW_THRES1 0xe6
PATCH RESEND v3 2/2 mfd: axp20x: Add a cell for the usb power_supply part of the axp20x PMICs
In reply to Hans de GoedeAdd a cell for the usb power_supply part of the axp20x PMICs.
Note that this cell is only for the usb power_supply part and not the ac-power / battery-charger / rtc-backup-bat-charger bits.
Depending on the board each of those must be enabled / disabled separately in devicetree as most boards do not use all 4. So in dt each one needs its own child-node of the axp20x node. Another reason for using separate child nodes for each is so that other devicetree nodes can have a power-supply property with a phandle referencing a node representing a single power-supply.
The decision to use a separate devicetree node for each is reflected on the kernel side by each getting its own mfd-cell / platform_device and platform-driver.
Note this commit also makes some whitespace changes to the intialization of existing cells in axp20x_cells, these are pure whitespace changes, functionally nothing changes.
---
Changes in v2:
-Use DEFINE_RES_IRQ_NAMED
-Change indentation of axp20x_cells initializers to avoid line wrapping Changes in v3:
-Improve commit message
-Add Bruno's S-o-b
--- drivers/mfd/axp20x.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/mfd/axp20x.c +16 -4
@@ -140,6 +140,13 @@ static struct resource axp20x_pek_resources[] = { }, }; +static struct resource axp20x_usb_power_supply_resources[] = { +DEFINE_RES_IRQ_NAMED (AXP20X_IRQ_VBUS_PLUGIN ,"VBUS_PLUGIN" ), +DEFINE_RES_IRQ_NAMED (AXP20X_IRQ_VBUS_REMOVAL ,"VBUS_REMOVAL" ), +DEFINE_RES_IRQ_NAMED (AXP20X_IRQ_VBUS_VALID ,"VBUS_VALID" ), +DEFINE_RES_IRQ_NAMED (AXP20X_IRQ_VBUS_NOT_VALID ,"VBUS_NOT_VALID" ), +}; +static struct resource axp22x_pek_resources[] = { { .name ="PEK_DBR" ,
@@ -432,11 +439,16 @@ static const struct regmap_irq_chip axp288_regmap_irq_chip = {static struct mfd_cell axp20x_cells[] = { { - .name ="axp20x-pek" , - .num_resources =ARRAY_SIZE (axp20x_pek_resources), - .resources = axp20x_pek_resources, + .name ="axp20x-pek" , + .num_resources =ARRAY_SIZE (axp20x_pek_resources), + .resources = axp20x_pek_resources, }, { - .name ="axp20x-regulator" , + .name ="axp20x-regulator" , + }, { + .name ="axp20x-usb-power-supply" , + .of_compatible ="x-powers,axp202-usb-power-supply" , + .num_resources =ARRAY_SIZE (axp20x_usb_power_supply_resources), + .resources = axp20x_usb_power_supply_resources, }, };
Signature · 1 line
2.4.3