github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Immutable branch between MFD and Power due for the v6.15 merge window

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEdrbJNaO+IJqU8IdIUa+KL4f8d2EFAme3UvEACgkQUa+KL4f8
 d2FIixAAlLfbwUkv3mkD18jBhGlJKd3SnARoM/M5hRJOh7B3G8xtMIrA7JTsfqs8
 eoUPNZkstKqJasya0clSf3DYoF3KrPnH45He2yppMMwzIneC12ffcAziSd1Vs3T/
 z469doQJ/GC2reRKCKLKfNG9lFGYUlBCwPLbcLq/9LrcNHR1FKa9KvKqXSfa+c1y
 Q6Zn6Q0Ekapw/JhJc9xV3bRVRzh32VbIAUJluFk2kcxTpabetsgA5xCKIEZ5TCo8
 ov+vv1GI+lZaDXW4WUhMFwrpf771cCiGeb/lIPC7CstMc43OZpPcjvYIQpJXCWPm
 byxvhEcKkxtBVdHGQV6z/f/ha9cmdhv4d5zTE7AornZaS7aTDsS1M/VNxBy8Rafd
 eQqlsjC0iE6GRc7DgaFbvBvEY6G6E83a5wrPC4/1NjA3eHfKQ5BTo7+fUixfnaQX
 3V22PMHlnXdO814CosULyFU0Pw8o45NJ6mDhGUnkKXZRJUXU7GFnEGHA04ZaH5Op
 EE+CPjrgRSvCvxPeWtVtAPJkISUgtCWG/TRkLD2cEkUSg3LuRJQJtPZen3I3khWK
 +6S4E64NwE9fDDpoRwcG03gZzkVUH8rhHnGY60TJIAXhkp6UkQ0fcDGsWeZa3/4/
 ZpjszM97a9t0SN6HWTetgXnPZEJZEo2r2/EU6UHnx3jF3pOYe1Y=
 =6RmG
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Sebastian Reichel 2025-02-21 02:14:45 +01:00
commit 74f0904dc0
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mfd/axp20x.c
View File

@ -224,6 +224,7 @@ static const struct regmap_range axp717_writeable_ranges[] = {
regmap_reg_range(AXP717_VSYS_V_POWEROFF, AXP717_VSYS_V_POWEROFF),
regmap_reg_range(AXP717_IRQ0_EN, AXP717_IRQ4_EN),
regmap_reg_range(AXP717_IRQ0_STATE, AXP717_IRQ4_STATE),
regmap_reg_range(AXP717_TS_PIN_CFG, AXP717_TS_PIN_CFG),
regmap_reg_range(AXP717_ICC_CHG_SET, AXP717_CV_CHG_SET),
regmap_reg_range(AXP717_DCDC_OUTPUT_CONTROL, AXP717_CPUSLDO_CONTROL),
regmap_reg_range(AXP717_ADC_CH_EN_CONTROL, AXP717_ADC_CH_EN_CONTROL),

1
include/linux/mfd/axp20x.h
View File

@ -137,6 +137,7 @@ enum axp20x_variants {
#define AXP717_IRQ2_STATE 0x4a
#define AXP717_IRQ3_STATE 0x4b
#define AXP717_IRQ4_STATE 0x4c
#define AXP717_TS_PIN_CFG 0x50
#define AXP717_ICC_CHG_SET 0x62
#define AXP717_ITERM_CHG_SET 0x63
#define AXP717_CV_CHG_SET 0x64