Skip to content

Commit 74f0904

Browse files
committed
Merge tag 'tags/ib-mfd-power-v6.15' into psy-next
Immutable branch between MFD and Power due for the v6.15 merge window Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
2 parents 4529187 + bfad07f commit 74f0904

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/mfd/axp20x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@ static const struct regmap_range axp717_writeable_ranges[] = {
224224
regmap_reg_range(AXP717_VSYS_V_POWEROFF, AXP717_VSYS_V_POWEROFF),
225225
regmap_reg_range(AXP717_IRQ0_EN, AXP717_IRQ4_EN),
226226
regmap_reg_range(AXP717_IRQ0_STATE, AXP717_IRQ4_STATE),
227+
regmap_reg_range(AXP717_TS_PIN_CFG, AXP717_TS_PIN_CFG),
227228
regmap_reg_range(AXP717_ICC_CHG_SET, AXP717_CV_CHG_SET),
228229
regmap_reg_range(AXP717_DCDC_OUTPUT_CONTROL, AXP717_CPUSLDO_CONTROL),
229230
regmap_reg_range(AXP717_ADC_CH_EN_CONTROL, AXP717_ADC_CH_EN_CONTROL),

include/linux/mfd/axp20x.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ enum axp20x_variants {
137137
#define AXP717_IRQ2_STATE 0x4a
138138
#define AXP717_IRQ3_STATE 0x4b
139139
#define AXP717_IRQ4_STATE 0x4c
140+
#define AXP717_TS_PIN_CFG 0x50
140141
#define AXP717_ICC_CHG_SET 0x62
141142
#define AXP717_ITERM_CHG_SET 0x63
142143
#define AXP717_CV_CHG_SET 0x64

0 commit comments

Comments
 (0)