[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
On 1/11/21 9:02 AM, André Przywara wrote: > On 03/01/2021 09:26, Jernej Skrabec wrote: >> This PMIC can be found on H616 boards and it's very similar to AXP805 >> and AXP806. >>> Signed-off-by: Jernej Skrabec > > The existing sunxi PMIC code is the typical U-Boot mess, but I don't > want to block this series on a rework. I put some comments and ideas > below how to improve the whole "framework". Agreed. it seems that it needs to make more time about refactoring whole codes. > > For this actual patch I checked the bits against the AXP305 datasheet, > it does what we need. > > (reluctantly) > Reviewed-by: Andre Przywara Reviewed-by: Jaehoon Chung Best Regards, Jaehoon Chung > > Thanks, > Andre > >> --- >> arch/arm/mach-sunxi/pmic_bus.c | 6 +++ >> board/sunxi/board.c| 10 +++-- >> drivers/power/Kconfig | 13 +- >> drivers/power/Makefile | 1 + >> drivers/power/axp305.c | 80 ++ >> include/axp305.h | 17 >> include/axp_pmic.h | 3 ++ >> 7 files changed, 126 insertions(+), 4 deletions(-) >> create mode 100644 drivers/power/axp305.c >> create mode 100644 include/axp305.h >> >> diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c >> index dea42de833f1..0394ce856448 100644 >> --- a/arch/arm/mach-sunxi/pmic_bus.c >> +++ b/arch/arm/mach-sunxi/pmic_bus.c >> @@ -18,6 +18,8 @@ >> >> #define AXP209_I2C_ADDR 0x34 >> >> +#define AXP305_I2C_ADDR 0x36 >> + >> #define AXP221_CHIP_ADDR0x68 >> #define AXP221_CTRL_ADDR0x3e >> #define AXP221_INIT_DATA0x3e >> @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) >> return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); >> #elif defined CONFIG_AXP209_POWER >> return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); >> +#elif defined CONFIG_AXP305_POWER >> +return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); >> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined >> CONFIG_AXP818_POWER >> # ifdef CONFIG_MACH_SUN6I >> return p2wi_read(reg, data); >> @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) >> return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); >> #elif defined CONFIG_AXP209_POWER >> return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); >> +#elif defined CONFIG_AXP305_POWER >> +return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); >> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined >> CONFIG_AXP818_POWER >> # ifdef CONFIG_MACH_SUN6I >> return p2wi_write(reg, data); >> diff --git a/board/sunxi/board.c b/board/sunxi/board.c >> index 708a27ed78e9..54ff9bc92396 100644 >> --- a/board/sunxi/board.c >> +++ b/board/sunxi/board.c >> @@ -634,16 +634,18 @@ void sunxi_board_init(void) >> #endif > > This whole function is really a mess, but we can clean this up later. > I wonder if we can guard with the actual CONFIG_AXP_*_VOLT symbols > directly instead of specifying the list of PMICs requiring this rail > (this list is already in Kconfig). > Maybe with some macro magic to avoid the repetitions and move the ifdefs > out of the function? > power_failed |= axp_set_rail(dcdc1, DCDC1); > and assemble the function name and CONFIG_ symbol in that macro, plus > having the guard there? > >> >> #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ >> -defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >> -defined CONFIG_AXP818_POWER >> +defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ >> +defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER >> power_failed = axp_init(); >> >> #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >> defined CONFIG_AXP818_POWER >> power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); >> #endif >> +#if !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); >> power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); >> +#endif >> #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) >> power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); >> #endif >> @@ -656,8 +658,10 @@ void sunxi_board_init(void) >> defined CONFIG_AXP818_POWER >> power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); >> #endif >> +#if !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); >> -#if !defined(CONFIG_AXP152_POWER) >> +#endif >> +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); >> #endif >> #ifdef CONFIG_AXP209_POWER > > Verified this hunk by playing CPP and removing all non-applicable calls. > This ended up in: > power_failed = axp_init(); > power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); > > Which looks like the idea behind this patch, but is totally non-obvious >
[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
On 03/01/2021 09:26, Jernej Skrabec wrote: > This PMIC can be found on H616 boards and it's very similar to AXP805 > and AXP806. >> Signed-off-by: Jernej Skrabec The existing sunxi PMIC code is the typical U-Boot mess, but I don't want to block this series on a rework. I put some comments and ideas below how to improve the whole "framework". For this actual patch I checked the bits against the AXP305 datasheet, it does what we need. (reluctantly) Reviewed-by: Andre Przywara Thanks, Andre > --- > arch/arm/mach-sunxi/pmic_bus.c | 6 +++ > board/sunxi/board.c| 10 +++-- > drivers/power/Kconfig | 13 +- > drivers/power/Makefile | 1 + > drivers/power/axp305.c | 80 ++ > include/axp305.h | 17 > include/axp_pmic.h | 3 ++ > 7 files changed, 126 insertions(+), 4 deletions(-) > create mode 100644 drivers/power/axp305.c > create mode 100644 include/axp305.h > > diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c > index dea42de833f1..0394ce856448 100644 > --- a/arch/arm/mach-sunxi/pmic_bus.c > +++ b/arch/arm/mach-sunxi/pmic_bus.c > @@ -18,6 +18,8 @@ > > #define AXP209_I2C_ADDR 0x34 > > +#define AXP305_I2C_ADDR 0x36 > + > #define AXP221_CHIP_ADDR 0x68 > #define AXP221_CTRL_ADDR 0x3e > #define AXP221_INIT_DATA 0x3e > @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) > return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); > #elif defined CONFIG_AXP209_POWER > return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); > +#elif defined CONFIG_AXP305_POWER > + return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); > #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined > CONFIG_AXP818_POWER > # ifdef CONFIG_MACH_SUN6I > return p2wi_read(reg, data); > @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) > return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); > #elif defined CONFIG_AXP209_POWER > return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); > +#elif defined CONFIG_AXP305_POWER > + return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); > #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined > CONFIG_AXP818_POWER > # ifdef CONFIG_MACH_SUN6I > return p2wi_write(reg, data); > diff --git a/board/sunxi/board.c b/board/sunxi/board.c > index 708a27ed78e9..54ff9bc92396 100644 > --- a/board/sunxi/board.c > +++ b/board/sunxi/board.c > @@ -634,16 +634,18 @@ void sunxi_board_init(void) > #endif This whole function is really a mess, but we can clean this up later. I wonder if we can guard with the actual CONFIG_AXP_*_VOLT symbols directly instead of specifying the list of PMICs requiring this rail (this list is already in Kconfig). Maybe with some macro magic to avoid the repetitions and move the ifdefs out of the function? power_failed |= axp_set_rail(dcdc1, DCDC1); and assemble the function name and CONFIG_ symbol in that macro, plus having the guard there? > > #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ > - defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ > - defined CONFIG_AXP818_POWER > + defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ > + defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER > power_failed = axp_init(); > > #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ > defined CONFIG_AXP818_POWER > power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); > #endif > +#if !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); > power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); > +#endif > #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) > power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); > #endif > @@ -656,8 +658,10 @@ void sunxi_board_init(void) > defined CONFIG_AXP818_POWER > power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); > #endif > +#if !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); > -#if !defined(CONFIG_AXP152_POWER) > +#endif > +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); > #endif > #ifdef CONFIG_AXP209_POWER Verified this hunk by playing CPP and removing all non-applicable calls. This ended up in: power_failed = axp_init(); power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); Which looks like the idea behind this patch, but is totally non-obvious from the diff. > diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig > index 02050f6f3569..d17cf2d9112a 100644 > --- a/drivers/power/Kconfig > +++ b/drivers/power/Kconfig > @@ -48,6 +48,15 @@ config AXP221_POWER > Select this to enable support for the axp221/axp223 pmic found on most >
[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
On 06/01/2021 23:33, Jaehoon Chung wrote: > On 1/6/21 7:11 PM, André Przywara wrote: >> On 05/01/2021 22:36, Jaehoon Chung wrote: >> >> Hi, >> >> thanks for having a look! >> >>> Hi Jernej >>> >>> On 1/3/21 6:26 PM, Jernej Skrabec wrote: This PMIC can be found on H616 boards and it's very similar to AXP805 and AXP806. >>> >>> Is there any plan to cleanup codes? >> >> There is no support for either of these, we use the PMICs only in >> Trusted Firmware or Linux. So nothing to consolidate, yet. This might >> change in the future, and then of course we will use a common code base. >> >>> Signed-off-by: Jernej Skrabec --- arch/arm/mach-sunxi/pmic_bus.c | 6 +++ board/sunxi/board.c| 10 +++-- drivers/power/Kconfig | 13 +- drivers/power/Makefile | 1 + drivers/power/axp305.c | 80 ++ include/axp305.h | 17 include/axp_pmic.h | 3 ++ 7 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 drivers/power/axp305.c create mode 100644 include/axp305.h diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c index dea42de833f1..0394ce856448 100644 --- a/arch/arm/mach-sunxi/pmic_bus.c +++ b/arch/arm/mach-sunxi/pmic_bus.c @@ -18,6 +18,8 @@ #define AXP209_I2C_ADDR 0x34 +#define AXP305_I2C_ADDR 0x36 + #define AXP221_CHIP_ADDR 0x68 #define AXP221_CTRL_ADDR 0x3e #define AXP221_INIT_DATA 0x3e @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); #elif defined CONFIG_AXP209_POWER return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); +#elif defined CONFIG_AXP305_POWER + return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_read(reg, data); @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); #elif defined CONFIG_AXP209_POWER return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); +#elif defined CONFIG_AXP305_POWER + return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER # ifdef CONFIG_MACH_SUN6I return p2wi_write(reg, data); diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 708a27ed78e9..54ff9bc92396 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -634,16 +634,18 @@ void sunxi_board_init(void) #endif #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ - defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ - defined CONFIG_AXP818_POWER + defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ + defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER power_failed = axp_init(); #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ defined CONFIG_AXP818_POWER power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); #endif +#if !defined(CONFIG_AXP305_POWER) power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); +#endif #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); #endif @@ -656,8 +658,10 @@ void sunxi_board_init(void) defined CONFIG_AXP818_POWER power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); #endif +#if !defined(CONFIG_AXP305_POWER) power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); -#if !defined(CONFIG_AXP152_POWER) +#endif +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); #endif #ifdef CONFIG_AXP209_POWER diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 02050f6f3569..d17cf2d9112a 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -48,6 +48,15 @@ config AXP221_POWER Select this to enable support for the axp221/axp223 pmic found on most A23 and A31 boards. +config AXP305_POWER + bool "axp305 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the axp305 pmic found on most + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I @@ -127,11 +136,12 @@ config
[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
On 1/6/21 7:11 PM, André Przywara wrote: > On 05/01/2021 22:36, Jaehoon Chung wrote: > > Hi, > > thanks for having a look! > >> Hi Jernej >> >> On 1/3/21 6:26 PM, Jernej Skrabec wrote: >>> This PMIC can be found on H616 boards and it's very similar to AXP805 >>> and AXP806. >> >> Is there any plan to cleanup codes? > > There is no support for either of these, we use the PMICs only in > Trusted Firmware or Linux. So nothing to consolidate, yet. This might > change in the future, and then of course we will use a common code base. > >> >>> >>> Signed-off-by: Jernej Skrabec >>> --- >>> arch/arm/mach-sunxi/pmic_bus.c | 6 +++ >>> board/sunxi/board.c| 10 +++-- >>> drivers/power/Kconfig | 13 +- >>> drivers/power/Makefile | 1 + >>> drivers/power/axp305.c | 80 ++ >>> include/axp305.h | 17 >>> include/axp_pmic.h | 3 ++ >>> 7 files changed, 126 insertions(+), 4 deletions(-) >>> create mode 100644 drivers/power/axp305.c >>> create mode 100644 include/axp305.h >>> >>> diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c >>> index dea42de833f1..0394ce856448 100644 >>> --- a/arch/arm/mach-sunxi/pmic_bus.c >>> +++ b/arch/arm/mach-sunxi/pmic_bus.c >>> @@ -18,6 +18,8 @@ >>> >>> #define AXP209_I2C_ADDR0x34 >>> >>> +#define AXP305_I2C_ADDR0x36 >>> + >>> #define AXP221_CHIP_ADDR 0x68 >>> #define AXP221_CTRL_ADDR 0x3e >>> #define AXP221_INIT_DATA 0x3e >>> @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) >>> return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); >>> #elif defined CONFIG_AXP209_POWER >>> return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); >>> +#elif defined CONFIG_AXP305_POWER >>> + return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); >>> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || >>> defined CONFIG_AXP818_POWER >>> # ifdef CONFIG_MACH_SUN6I >>> return p2wi_read(reg, data); >>> @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) >>> return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); >>> #elif defined CONFIG_AXP209_POWER >>> return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); >>> +#elif defined CONFIG_AXP305_POWER >>> + return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); >>> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || >>> defined CONFIG_AXP818_POWER >>> # ifdef CONFIG_MACH_SUN6I >>> return p2wi_write(reg, data); >>> diff --git a/board/sunxi/board.c b/board/sunxi/board.c >>> index 708a27ed78e9..54ff9bc92396 100644 >>> --- a/board/sunxi/board.c >>> +++ b/board/sunxi/board.c >>> @@ -634,16 +634,18 @@ void sunxi_board_init(void) >>> #endif >>> >>> #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ >>> - defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >>> - defined CONFIG_AXP818_POWER >>> + defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ >>> + defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER >>> power_failed = axp_init(); >>> >>> #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >>> defined CONFIG_AXP818_POWER >>> power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); >>> #endif >>> +#if !defined(CONFIG_AXP305_POWER) >>> power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); >>> power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); >>> +#endif >>> #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) >>> power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); >>> #endif >>> @@ -656,8 +658,10 @@ void sunxi_board_init(void) >>> defined CONFIG_AXP818_POWER >>> power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); >>> #endif >>> +#if !defined(CONFIG_AXP305_POWER) >>> power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); >>> -#if !defined(CONFIG_AXP152_POWER) >>> +#endif >>> +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) >>> power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); >>> #endif >>> #ifdef CONFIG_AXP209_POWER >>> diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig >>> index 02050f6f3569..d17cf2d9112a 100644 >>> --- a/drivers/power/Kconfig >>> +++ b/drivers/power/Kconfig >>> @@ -48,6 +48,15 @@ config AXP221_POWER >>> Select this to enable support for the axp221/axp223 pmic found on most >>> A23 and A31 boards. >>> >>> +config AXP305_POWER >>> + bool "axp305 pmic support" >>> + depends on MACH_SUN50I_H616 >>> + select AXP_PMIC_BUS >>> + select CMD_POWEROFF >>> + ---help--- >>> + Select this to enable support for the axp305 pmic found on most >>> + H616 boards. >>> + >>> config AXP809_POWER >>> bool "axp809 pmic support" >>> depends on MACH_SUN9I >>> @@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT >>> >>> config AXP_DCDC4_VOLT >>> int "axp pmic dcdc4 voltage" >>> - depends on AXP152_POWER || AXP221_POWER ||
[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
On 05/01/2021 22:36, Jaehoon Chung wrote: Hi, thanks for having a look! > Hi Jernej > > On 1/3/21 6:26 PM, Jernej Skrabec wrote: >> This PMIC can be found on H616 boards and it's very similar to AXP805 >> and AXP806. > > Is there any plan to cleanup codes? There is no support for either of these, we use the PMICs only in Trusted Firmware or Linux. So nothing to consolidate, yet. This might change in the future, and then of course we will use a common code base. > >> >> Signed-off-by: Jernej Skrabec >> --- >> arch/arm/mach-sunxi/pmic_bus.c | 6 +++ >> board/sunxi/board.c| 10 +++-- >> drivers/power/Kconfig | 13 +- >> drivers/power/Makefile | 1 + >> drivers/power/axp305.c | 80 ++ >> include/axp305.h | 17 >> include/axp_pmic.h | 3 ++ >> 7 files changed, 126 insertions(+), 4 deletions(-) >> create mode 100644 drivers/power/axp305.c >> create mode 100644 include/axp305.h >> >> diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c >> index dea42de833f1..0394ce856448 100644 >> --- a/arch/arm/mach-sunxi/pmic_bus.c >> +++ b/arch/arm/mach-sunxi/pmic_bus.c >> @@ -18,6 +18,8 @@ >> >> #define AXP209_I2C_ADDR 0x34 >> >> +#define AXP305_I2C_ADDR 0x36 >> + >> #define AXP221_CHIP_ADDR0x68 >> #define AXP221_CTRL_ADDR0x3e >> #define AXP221_INIT_DATA0x3e >> @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) >> return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); >> #elif defined CONFIG_AXP209_POWER >> return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); >> +#elif defined CONFIG_AXP305_POWER >> +return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); >> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined >> CONFIG_AXP818_POWER >> # ifdef CONFIG_MACH_SUN6I >> return p2wi_read(reg, data); >> @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) >> return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); >> #elif defined CONFIG_AXP209_POWER >> return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); >> +#elif defined CONFIG_AXP305_POWER >> +return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); >> #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined >> CONFIG_AXP818_POWER >> # ifdef CONFIG_MACH_SUN6I >> return p2wi_write(reg, data); >> diff --git a/board/sunxi/board.c b/board/sunxi/board.c >> index 708a27ed78e9..54ff9bc92396 100644 >> --- a/board/sunxi/board.c >> +++ b/board/sunxi/board.c >> @@ -634,16 +634,18 @@ void sunxi_board_init(void) >> #endif >> >> #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ >> -defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >> -defined CONFIG_AXP818_POWER >> +defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ >> +defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER >> power_failed = axp_init(); >> >> #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ >> defined CONFIG_AXP818_POWER >> power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); >> #endif >> +#if !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); >> power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); >> +#endif >> #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) >> power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); >> #endif >> @@ -656,8 +658,10 @@ void sunxi_board_init(void) >> defined CONFIG_AXP818_POWER >> power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); >> #endif >> +#if !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); >> -#if !defined(CONFIG_AXP152_POWER) >> +#endif >> +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) >> power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); >> #endif >> #ifdef CONFIG_AXP209_POWER >> diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig >> index 02050f6f3569..d17cf2d9112a 100644 >> --- a/drivers/power/Kconfig >> +++ b/drivers/power/Kconfig >> @@ -48,6 +48,15 @@ config AXP221_POWER >> Select this to enable support for the axp221/axp223 pmic found on most >> A23 and A31 boards. >> >> +config AXP305_POWER >> +bool "axp305 pmic support" >> +depends on MACH_SUN50I_H616 >> +select AXP_PMIC_BUS >> +select CMD_POWEROFF >> +---help--- >> +Select this to enable support for the axp305 pmic found on most >> +H616 boards. >> + >> config AXP809_POWER >> bool "axp809 pmic support" >> depends on MACH_SUN9I >> @@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT >> >> config AXP_DCDC4_VOLT >> int "axp pmic dcdc4 voltage" >> -depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER >> +depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER >> || AXP305_POWER >>
[linux-sunxi] Re: [PATCH 01/17] sunxi: Add support for AXP305 PMIC
Hi Jernej On 1/3/21 6:26 PM, Jernej Skrabec wrote: > This PMIC can be found on H616 boards and it's very similar to AXP805 > and AXP806. Is there any plan to cleanup codes? > > Signed-off-by: Jernej Skrabec > --- > arch/arm/mach-sunxi/pmic_bus.c | 6 +++ > board/sunxi/board.c| 10 +++-- > drivers/power/Kconfig | 13 +- > drivers/power/Makefile | 1 + > drivers/power/axp305.c | 80 ++ > include/axp305.h | 17 > include/axp_pmic.h | 3 ++ > 7 files changed, 126 insertions(+), 4 deletions(-) > create mode 100644 drivers/power/axp305.c > create mode 100644 include/axp305.h > > diff --git a/arch/arm/mach-sunxi/pmic_bus.c b/arch/arm/mach-sunxi/pmic_bus.c > index dea42de833f1..0394ce856448 100644 > --- a/arch/arm/mach-sunxi/pmic_bus.c > +++ b/arch/arm/mach-sunxi/pmic_bus.c > @@ -18,6 +18,8 @@ > > #define AXP209_I2C_ADDR 0x34 > > +#define AXP305_I2C_ADDR 0x36 > + > #define AXP221_CHIP_ADDR 0x68 > #define AXP221_CTRL_ADDR 0x3e > #define AXP221_INIT_DATA 0x3e > @@ -64,6 +66,8 @@ int pmic_bus_read(u8 reg, u8 *data) > return i2c_read(AXP152_I2C_ADDR, reg, 1, data, 1); > #elif defined CONFIG_AXP209_POWER > return i2c_read(AXP209_I2C_ADDR, reg, 1, data, 1); > +#elif defined CONFIG_AXP305_POWER > + return i2c_read(AXP305_I2C_ADDR, reg, 1, data, 1); > #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined > CONFIG_AXP818_POWER > # ifdef CONFIG_MACH_SUN6I > return p2wi_read(reg, data); > @@ -81,6 +85,8 @@ int pmic_bus_write(u8 reg, u8 data) > return i2c_write(AXP152_I2C_ADDR, reg, 1, , 1); > #elif defined CONFIG_AXP209_POWER > return i2c_write(AXP209_I2C_ADDR, reg, 1, , 1); > +#elif defined CONFIG_AXP305_POWER > + return i2c_write(AXP305_I2C_ADDR, reg, 1, , 1); > #elif defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || defined > CONFIG_AXP818_POWER > # ifdef CONFIG_MACH_SUN6I > return p2wi_write(reg, data); > diff --git a/board/sunxi/board.c b/board/sunxi/board.c > index 708a27ed78e9..54ff9bc92396 100644 > --- a/board/sunxi/board.c > +++ b/board/sunxi/board.c > @@ -634,16 +634,18 @@ void sunxi_board_init(void) > #endif > > #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ > - defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ > - defined CONFIG_AXP818_POWER > + defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ > + defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER > power_failed = axp_init(); > > #if defined CONFIG_AXP221_POWER || defined CONFIG_AXP809_POWER || \ > defined CONFIG_AXP818_POWER > power_failed |= axp_set_dcdc1(CONFIG_AXP_DCDC1_VOLT); > #endif > +#if !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_dcdc2(CONFIG_AXP_DCDC2_VOLT); > power_failed |= axp_set_dcdc3(CONFIG_AXP_DCDC3_VOLT); > +#endif > #if !defined(CONFIG_AXP209_POWER) && !defined(CONFIG_AXP818_POWER) > power_failed |= axp_set_dcdc4(CONFIG_AXP_DCDC4_VOLT); > #endif > @@ -656,8 +658,10 @@ void sunxi_board_init(void) > defined CONFIG_AXP818_POWER > power_failed |= axp_set_aldo1(CONFIG_AXP_ALDO1_VOLT); > #endif > +#if !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_aldo2(CONFIG_AXP_ALDO2_VOLT); > -#if !defined(CONFIG_AXP152_POWER) > +#endif > +#if !defined(CONFIG_AXP152_POWER) && !defined(CONFIG_AXP305_POWER) > power_failed |= axp_set_aldo3(CONFIG_AXP_ALDO3_VOLT); > #endif > #ifdef CONFIG_AXP209_POWER > diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig > index 02050f6f3569..d17cf2d9112a 100644 > --- a/drivers/power/Kconfig > +++ b/drivers/power/Kconfig > @@ -48,6 +48,15 @@ config AXP221_POWER > Select this to enable support for the axp221/axp223 pmic found on most > A23 and A31 boards. > > +config AXP305_POWER > + bool "axp305 pmic support" > + depends on MACH_SUN50I_H616 > + select AXP_PMIC_BUS > + select CMD_POWEROFF > + ---help--- > + Select this to enable support for the axp305 pmic found on most > + H616 boards. > + > config AXP809_POWER > bool "axp809 pmic support" > depends on MACH_SUN9I > @@ -127,11 +136,12 @@ config AXP_DCDC3_VOLT > > config AXP_DCDC4_VOLT > int "axp pmic dcdc4 voltage" > - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER > + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER > || AXP305_POWER > default 1250 if AXP152_POWER > default 1200 if MACH_SUN6I > default 0 if MACH_SUN8I > default 900 if MACH_SUN9I > + default 1500 if AXP305_POWER > ---help--- > Set the voltage (mV) to program the axp pmic dcdc4 at, set to 0 to > disable dcdc4. > @@ -140,6 +150,7 @@ config AXP_DCDC4_VOLT > On A23 / A33 boards dcdc4 is unused
