power: add AXP313 PMIC support
Subsystems (3)
cover power: add AXP313 PMIC support
The X-Powers AXP313 is a small PMIC that is controlled via I2C and provides just three buck converters and three LDOs, plus a power button. It is used on many newer boards using the Allwinner H616 or H618 SoCs.
Mostly all rails need to be always on, since each of them supplies an essential part of the system, consequentially the reset default is to have all of them enabled.
However the voltages need to be adjusted, especially the DRAM rail is typically at 900mV, for instance, which is too low.
This series adds support for the proper DM AXP PMIC driver (patch 3/3), but also adds a small driver to be used in (our non-DM) SPL, to adjust the DRAM voltage before the DRAM initialisation starts (patch 2/3).
This also uses the opportunity to clean up an #ifdef nightmare in our board.c (patch 1/3), which was actually duplicating some dependencies already described in Kconfig.
This is one part of the enablement of many newer boards with the H616/H618 SoC: without the DRAM voltage increased to 1.1V they won't boot.
Cheers,
Andre
Andre Przywara (3):
sunxi: board: simplify early PMIC setup conditions
power: pmic: sunxi: add AXP313 SPL driver
power: regulator: add AXP313 support
arch/arm/mach-sunxi/pmic_bus.c | 3 + board/sunxi/board.c | 35 +++---- drivers/power/Kconfig | 19 +++- drivers/power/Makefile | 1 + drivers/power/axp313.c | 134 ++++++++++++++++++++++++ drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 +++ include/axp_pmic.h | 1 + 8 files changed, 189 insertions(+), 22 deletions(-) create mode 100644 drivers/power/axp313.c
Signature · 1 line
2.25.1
PATCH 1/3 sunxi: board: simplify early PMIC setup conditions
So far we have a convoluted #ifdef mesh that guards the early AXP PMIC setup in board.c. That combination of &&, || and negations is very hard to read, maintain and especially to extend.
Fortunately we have those same conditions already modelled in the Kconfig file, so they are actually redundant. On top of that the real reason we have those preprocessor guards in the first place is about the symbols that are *conditionally* defined: without #ifdefs the build would break because of them being undefined for many boards.
To simplify this, just change the guards to actually look at the symbols needed, so CONFIG_AXP_xxx_VOLT instead of CONFIG_AXPyyy_POWER. This drastically improves the readability of this code, and makes adding PMIC support a pure Kconfig matter.
--- board/sunxi/board.c | 32 ++++++++++++++------------------ drivers/power/Kconfig | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-)
board/sunxi/board.c +14 -18
@@ -597,50 +597,46 @@ void sunxi_board_init(void) } } -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_DCDC1_VOLT power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT ); + power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_DCDC2_VOLT 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 ) +#ifdef CONFIG_AXP_DCDC4_VOLT power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER - power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT ); -#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_ALDO1_VOLT power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO2_VOLT power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT );#endif -#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO3_VOLT power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif -#ifdef CONFIG_AXP209_POWER +#ifdef CONFIG_AXP_ALDO4_VOLT power_failed |=axp_set_aldo4 (CONFIG_AXP_ALDO4_VOLT );#endif -#if defined(CONFIG_AXP221_POWER ) || defined(CONFIG_AXP809_POWER ) || \ - defined(CONFIG_AXP818_POWER ) +#ifdef CONFIG_AXP_DLDO1_VOLT power_failed |=axp_set_dldo (1 ,CONFIG_AXP_DLDO1_VOLT ); power_failed |=axp_set_dldo (2 ,CONFIG_AXP_DLDO2_VOLT ); -#if !definedCONFIG_AXP809_POWER +#endif +#ifdef CONFIG_AXP_DLDO3_VOLT power_failed |=axp_set_dldo (3 ,CONFIG_AXP_DLDO3_VOLT ); power_failed |=axp_set_dldo (4 ,CONFIG_AXP_DLDO4_VOLT );#endif +#ifdef CONFIG_AXP_ELDO1_VOLT power_failed |=axp_set_eldo (1 ,CONFIG_AXP_ELDO1_VOLT ); power_failed |=axp_set_eldo (2 ,CONFIG_AXP_ELDO2_VOLT ); power_failed |=axp_set_eldo (3 ,CONFIG_AXP_ELDO3_VOLT );#endif -#ifdef CONFIG_AXP818_POWER +#ifdef CONFIG_AXP_FLDO1_VOLT power_failed |=axp_set_fldo (1 ,CONFIG_AXP_FLDO1_VOLT ); power_failed |=axp_set_fldo (2 ,CONFIG_AXP_FLDO2_VOLT ); power_failed |=axp_set_fldo (3 ,CONFIG_AXP_FLDO3_VOLT );
@@ -649,7 +645,7 @@ void sunxi_board_init(void)#if definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed |=axp_set_sw (IS_ENABLED (CONFIG_AXP_SW_ON ));#endif -#endif +#endif /* CONFIG_AXPxxx_POWER */ printf ("DRAM:" ); gd->ram_size =sunxi_dram_init ();printf (" %d MiB\n" , (int )(gd->ram_size >>20 ));
drivers/power/Kconfig +1 -1
@@ -180,7 +180,7 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP305_POWER + depends on AXP152_POWER || AXP221_POWER || AXP809_POWER || AXP305_POWER default 1250 if AXP152_POWER default 1200 if MACH_SUN6I default 0 if MACH_SUN8I
Signature · 1 line
2.25.1
Jernej Škrabec
maintainerRe: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditions
Quoted 103 lines · CEST Andre Przywara
So far we have a convoluted #ifdef mesh that guards the early AXP PMIC setup in
board.c. That combination of &&, || and negations is very hard to read, maintain and especially to extend.Fortunately we have those same conditions already modelled in the
Kconfigfile, so they are actually redundant. On top of that the real reason we have those preprocessor guards in the first place is about the symbols that are *conditionally* defined: without #ifdefs the build would break because of them being undefined for many boards.To simplify this, just change the guards to actually look at the symbols needed, so
CONFIG_AXP_xxx_VOLTinstead ofCONFIG_AXPyyy_POWER. This drastically improves the readability of this code, and makes adding PMIC support a pureKconfigmatter.Signed-off-by Andre Przywara <[email protected]>--- board/sunxi/board.c | 32 ++++++++++++++------------------ drivers/power/Kconfig | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-)board/sunxi/board.c +14
-18@@ -597,50 +597,46 @@ void sunxi_board_init(void) } } -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_DCDC1_VOLT power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT ); + power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_DCDC2_VOLT 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 ) +#ifdef CONFIG_AXP_DCDC4_VOLT power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER - power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT ); -#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_ALDO1_VOLT power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO2_VOLT power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT );#endif -#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO3_VOLT power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif -#ifdef CONFIG_AXP209_POWER +#ifdef CONFIG_AXP_ALDO4_VOLT power_failed |=axp_set_aldo4 (CONFIG_AXP_ALDO4_VOLT );#endif -#if defined(CONFIG_AXP221_POWER ) || defined(CONFIG_AXP809_POWER ) || \ - defined(CONFIG_AXP818_POWER ) +#ifdef CONFIG_AXP_DLDO1_VOLT power_failed |=axp_set_dldo (1 ,CONFIG_AXP_DLDO1_VOLT ); power_failed |=axp_set_dldo (2 ,CONFIG_AXP_DLDO2_VOLT ); -#if !definedCONFIG_AXP809_POWER +#endif +#ifdef CONFIG_AXP_DLDO3_VOLT power_failed |=axp_set_dldo (3 ,CONFIG_AXP_DLDO3_VOLT ); power_failed |=axp_set_dldo (4 ,CONFIG_AXP_DLDO4_VOLT );#endif +#ifdef CONFIG_AXP_ELDO1_VOLT power_failed |=axp_set_eldo (1 ,CONFIG_AXP_ELDO1_VOLT ); power_failed |=axp_set_eldo (2 ,CONFIG_AXP_ELDO2_VOLT ); power_failed |=axp_set_eldo (3 ,CONFIG_AXP_ELDO3_VOLT );#endif -#ifdef CONFIG_AXP818_POWER +#ifdef CONFIG_AXP_FLDO1_VOLT power_failed |=axp_set_fldo (1 ,CONFIG_AXP_FLDO1_VOLT ); power_failed |=axp_set_fldo (2 ,CONFIG_AXP_FLDO2_VOLT ); power_failed |=axp_set_fldo (3 ,CONFIG_AXP_FLDO3_VOLT );@@ -649,7 +645,7 @@ void sunxi_board_init(void)#if definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed |=axp_set_sw (IS_ENABLED (CONFIG_AXP_SW_ON ));#endif -#endif +#endif /* CONFIG_AXPxxx_POWER */ printf ("DRAM:" ); gd->ram_size =sunxi_dram_init ();printf (" %d MiB\n" , (int )(gd->ram_size >>20 ));drivers/power/Kconfig +0
-0
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 183
Quoted 4 lines
drivers/power/Kconfig +0
-1@@ -180,7 +180,7 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER ||
Quoted 1 line
AXP305_POWER+ depends onAXP152_POWER||AXP221_POWER||AXP809_POWER
||
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 186
Quoted 3 lines
AXP305_POWERdefault 1250 ifAXP152_POWERdrivers/power/Kconfig +0
-0default 1200 if MACH_SUN6I default 0 if MACH_SUN8I
This patch is great, but this last change doesn't seem to be directly connected?
Best regards,
Jernej
Re: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditions
Quoted 109 lines · On Sat, 21 Oct 2023 08:34:06 +0200 Jernej Škrabec <[email protected]>…
Quoted 103 lines · CEST Andre Przywara
So far we have a convoluted #ifdef mesh that guards the early AXP PMIC setup in
board.c. That combination of &&, || and negations is very hard to read, maintain and especially to extend.Fortunately we have those same conditions already modelled in the
Kconfigfile, so they are actually redundant. On top of that the real reason we have those preprocessor guards in the first place is about the symbols that are *conditionally* defined: without #ifdefs the build would break because of them being undefined for many boards.To simplify this, just change the guards to actually look at the symbols needed, so
CONFIG_AXP_xxx_VOLTinstead ofCONFIG_AXPyyy_POWER. This drastically improves the readability of this code, and makes adding PMIC support a pureKconfigmatter.Signed-off-by Andre Przywara <[email protected]>--- board/sunxi/board.c | 32 ++++++++++++++------------------ drivers/power/Kconfig | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-)board/sunxi/board.c +14
-18@@ -597,50 +597,46 @@ void sunxi_board_init(void) } } -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_DCDC1_VOLT power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT ); + power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_DCDC2_VOLT 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 ) +#ifdef CONFIG_AXP_DCDC4_VOLT power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER - power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT ); -#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_ALDO1_VOLT power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO2_VOLT power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT );#endif -#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO3_VOLT power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif -#ifdef CONFIG_AXP209_POWER +#ifdef CONFIG_AXP_ALDO4_VOLT power_failed |=axp_set_aldo4 (CONFIG_AXP_ALDO4_VOLT );#endif -#if defined(CONFIG_AXP221_POWER ) || defined(CONFIG_AXP809_POWER ) || \ - defined(CONFIG_AXP818_POWER ) +#ifdef CONFIG_AXP_DLDO1_VOLT power_failed |=axp_set_dldo (1 ,CONFIG_AXP_DLDO1_VOLT ); power_failed |=axp_set_dldo (2 ,CONFIG_AXP_DLDO2_VOLT ); -#if !definedCONFIG_AXP809_POWER +#endif +#ifdef CONFIG_AXP_DLDO3_VOLT power_failed |=axp_set_dldo (3 ,CONFIG_AXP_DLDO3_VOLT ); power_failed |=axp_set_dldo (4 ,CONFIG_AXP_DLDO4_VOLT );#endif +#ifdef CONFIG_AXP_ELDO1_VOLT power_failed |=axp_set_eldo (1 ,CONFIG_AXP_ELDO1_VOLT ); power_failed |=axp_set_eldo (2 ,CONFIG_AXP_ELDO2_VOLT ); power_failed |=axp_set_eldo (3 ,CONFIG_AXP_ELDO3_VOLT );#endif -#ifdef CONFIG_AXP818_POWER +#ifdef CONFIG_AXP_FLDO1_VOLT power_failed |=axp_set_fldo (1 ,CONFIG_AXP_FLDO1_VOLT ); power_failed |=axp_set_fldo (2 ,CONFIG_AXP_FLDO2_VOLT ); power_failed |=axp_set_fldo (3 ,CONFIG_AXP_FLDO3_VOLT );@@ -649,7 +645,7 @@ void sunxi_board_init(void)#if definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed |=axp_set_sw (IS_ENABLED (CONFIG_AXP_SW_ON ));#endif -#endif +#endif /* CONFIG_AXPxxx_POWER */ printf ("DRAM:" ); gd->ram_size =sunxi_dram_init ();printf (" %d MiB\n" , (int )(gd->ram_size >>20 ));drivers/power/Kconfig +0
-0drivers/power/Kconfig config AXP_DCDC3_VOLT · line 183
Quoted 4 lines
drivers/power/Kconfig +0
-1@@ -180,7 +180,7 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER||
Quoted 8 lines
Quoted 1 line
AXP305_POWER+ depends onAXP152_POWER||AXP221_POWER||AXP809_POWER||
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 186
Quoted 3 lines
AXP305_POWERdefault 1250 ifAXP152_POWERdrivers/power/Kconfig +0
-0default 1200 if MACH_SUN6I default 0 if MACH_SUN8IThis patch is great, but this last change doesn't seem to be directly connected?
It is an existing bug: there is no axp_set_dcdc4() for the AXP818, but since the AXP818 is not included in the guards at the calling site in board.c above, we didn't notice.
So without this change, all A83T boards (the only ones using AXP818) would fail compilation.
I just forgot to mention it in the commit message, will add it.
Cheers,
Andre
RE: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditions
Hi,
Quoted 130 lines
-----Original Message-----
From: Andre Przywara <[email protected]>
Sent: Sunday, October 22, 2023 6:19 AM
To: Jernej Škrabec <[email protected]>
Cc: Jagan Teki <[email protected]>; Jaehoon Chung <[email protected]>; Samuel Holland <[email protected]>; SASANO Takayoshi <[email protected]>; Mikhail Kalashnikov <[email protected]>; Piotr Oniszczuk <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditionsQuoted 109 lines · On Sat, 21 Oct 2023 08:34:06 +0200 Jernej Škrabec <[email protected]>…
Quoted 103 lines · CEST Andre Przywara
So far we have a convoluted #ifdef mesh that guards the early AXP PMIC setup in
board.c. That combination of &&, || and negations is very hard to read, maintain and especially to extend.Fortunately we have those same conditions already modelled in the
Kconfigfile, so they are actually redundant. On top of that the real reason we have those preprocessor guards in the first place is about the symbols that are *conditionally* defined: without #ifdefs the build would break because of them being undefined for many boards.To simplify this, just change the guards to actually look at the symbols needed, so
CONFIG_AXP_xxx_VOLTinstead ofCONFIG_AXPyyy_POWER. This drastically improves the readability of this code, and makes adding PMIC support a pureKconfigmatter.Signed-off-by Andre Przywara <[email protected]>--- board/sunxi/board.c | 32 ++++++++++++++------------------ drivers/power/Kconfig | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-)board/sunxi/board.c +14
-18@@ -597,50 +597,46 @@ void sunxi_board_init(void) } } -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_DCDC1_VOLT power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT ); + power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_DCDC2_VOLT 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 ) +#ifdef CONFIG_AXP_DCDC4_VOLT power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER - power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT ); -#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_ALDO1_VOLT power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO2_VOLT power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT );#endif -#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO3_VOLT power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif -#ifdef CONFIG_AXP209_POWER +#ifdef CONFIG_AXP_ALDO4_VOLT power_failed |=axp_set_aldo4 (CONFIG_AXP_ALDO4_VOLT );#endif -#if defined(CONFIG_AXP221_POWER ) || defined(CONFIG_AXP809_POWER ) || \ - defined(CONFIG_AXP818_POWER ) +#ifdef CONFIG_AXP_DLDO1_VOLT power_failed |=axp_set_dldo (1 ,CONFIG_AXP_DLDO1_VOLT ); power_failed |=axp_set_dldo (2 ,CONFIG_AXP_DLDO2_VOLT ); -#if !definedCONFIG_AXP809_POWER +#endif +#ifdef CONFIG_AXP_DLDO3_VOLT power_failed |=axp_set_dldo (3 ,CONFIG_AXP_DLDO3_VOLT ); power_failed |=axp_set_dldo (4 ,CONFIG_AXP_DLDO4_VOLT );#endif +#ifdef CONFIG_AXP_ELDO1_VOLT power_failed |=axp_set_eldo (1 ,CONFIG_AXP_ELDO1_VOLT ); power_failed |=axp_set_eldo (2 ,CONFIG_AXP_ELDO2_VOLT ); power_failed |=axp_set_eldo (3 ,CONFIG_AXP_ELDO3_VOLT );#endif -#ifdef CONFIG_AXP818_POWER +#ifdef CONFIG_AXP_FLDO1_VOLT power_failed |=axp_set_fldo (1 ,CONFIG_AXP_FLDO1_VOLT ); power_failed |=axp_set_fldo (2 ,CONFIG_AXP_FLDO2_VOLT ); power_failed |=axp_set_fldo (3 ,CONFIG_AXP_FLDO3_VOLT );@@ -649,7 +645,7 @@ void sunxi_board_init(void)#if definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed |=axp_set_sw (IS_ENABLED (CONFIG_AXP_SW_ON ));#endif -#endif +#endif /* CONFIG_AXPxxx_POWER */ printf ("DRAM:" ); gd->ram_size =sunxi_dram_init ();printf (" %d MiB\n" , (int )(gd->ram_size >>20 ));drivers/power/Kconfig +0
-0drivers/power/Kconfig config AXP_DCDC3_VOLT · line 183
Quoted 4 lines
drivers/power/Kconfig +0
-1@@ -180,7 +180,7 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER||Quoted 8 lines
Quoted 1 line
AXP305_POWER+ depends onAXP152_POWER||AXP221_POWER||AXP809_POWER||
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 186
Quoted 3 lines
AXP305_POWERdefault 1250 ifAXP152_POWERdrivers/power/Kconfig +0
-0default 1200 if MACH_SUN6I default 0 if MACH_SUN8IThis patch is great, but this last change doesn't seem to be directly connected?
Quoted 6 lines
It is an existing bug: there is no
axp_set_dcdc4()for the AXP818, but since the AXP818 is not included in the guards at the calling site inboard.cabove, we didn't notice.
So without this change, all A83T boards (the only ones using AXP818) would fail compilation.
I just forgot to mention it in the commit message, will add it.
Will you resend this patch after updating the commit message?
Best Regards,
Jaehoon Chung
Quoted 3 lines
Cheers,
Andre
Re: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditions
On Tue, 31 Oct 2023 15:42:54 +0900
"Jaehoon Chung" <[email protected]> wrote:
Hi Jaehoon,
Quoted 132 lines
Hi,
Quoted 130 lines
-----Original Message-----
From: Andre Przywara <[email protected]>
Sent: Sunday, October 22, 2023 6:19 AM
To: Jernej Škrabec <[email protected]>
Cc: Jagan Teki <[email protected]>; Jaehoon Chung <[email protected]>; Samuel Holland <[email protected]>; SASANO Takayoshi <[email protected]>; Mikhail Kalashnikov <[email protected]>; Piotr Oniszczuk <[email protected]>; [email protected]; [email protected]
Subject: Re: [PATCH 1/3] sunxi: board: simplify early PMIC setup conditionsQuoted 117 lines · On Sat, 21 Oct 2023 08:34:06 +0200 Jernej Škrabec <[email protected]>…
Quoted 103 lines · CEST Andre Przywara
So far we have a convoluted #ifdef mesh that guards the early AXP PMIC setup in
board.c. That combination of &&, || and negations is very hard to read, maintain and especially to extend.Fortunately we have those same conditions already modelled in the
Kconfigfile, so they are actually redundant. On top of that the real reason we have those preprocessor guards in the first place is about the symbols that are *conditionally* defined: without #ifdefs the build would break because of them being undefined for many boards.To simplify this, just change the guards to actually look at the symbols needed, so
CONFIG_AXP_xxx_VOLTinstead ofCONFIG_AXPyyy_POWER. This drastically improves the readability of this code, and makes adding PMIC support a pureKconfigmatter.Signed-off-by Andre Przywara <[email protected]>--- board/sunxi/board.c | 32 ++++++++++++++------------------ drivers/power/Kconfig | 2 +- 2 files changed, 15 insertions(+), 19 deletions(-)board/sunxi/board.c +14
-18@@ -597,50 +597,46 @@ void sunxi_board_init(void) } } -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_DCDC1_VOLT power_failed |=axp_set_dcdc1 (CONFIG_AXP_DCDC1_VOLT ); + power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_DCDC2_VOLT 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 ) +#ifdef CONFIG_AXP_DCDC4_VOLT power_failed |=axp_set_dcdc4 (CONFIG_AXP_DCDC4_VOLT );#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER - power_failed |=axp_set_dcdc5 (CONFIG_AXP_DCDC5_VOLT ); -#endif -#if definedCONFIG_AXP221_POWER || definedCONFIG_AXP809_POWER || \ - definedCONFIG_AXP818_POWER +#ifdef CONFIG_AXP_ALDO1_VOLT power_failed |=axp_set_aldo1 (CONFIG_AXP_ALDO1_VOLT );#endif -#if !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO2_VOLT power_failed |=axp_set_aldo2 (CONFIG_AXP_ALDO2_VOLT );#endif -#if !defined(CONFIG_AXP152_POWER ) && !defined(CONFIG_AXP305_POWER ) +#ifdef CONFIG_AXP_ALDO3_VOLT power_failed |=axp_set_aldo3 (CONFIG_AXP_ALDO3_VOLT );#endif -#ifdef CONFIG_AXP209_POWER +#ifdef CONFIG_AXP_ALDO4_VOLT power_failed |=axp_set_aldo4 (CONFIG_AXP_ALDO4_VOLT );#endif -#if defined(CONFIG_AXP221_POWER ) || defined(CONFIG_AXP809_POWER ) || \ - defined(CONFIG_AXP818_POWER ) +#ifdef CONFIG_AXP_DLDO1_VOLT power_failed |=axp_set_dldo (1 ,CONFIG_AXP_DLDO1_VOLT ); power_failed |=axp_set_dldo (2 ,CONFIG_AXP_DLDO2_VOLT ); -#if !definedCONFIG_AXP809_POWER +#endif +#ifdef CONFIG_AXP_DLDO3_VOLT power_failed |=axp_set_dldo (3 ,CONFIG_AXP_DLDO3_VOLT ); power_failed |=axp_set_dldo (4 ,CONFIG_AXP_DLDO4_VOLT );#endif +#ifdef CONFIG_AXP_ELDO1_VOLT power_failed |=axp_set_eldo (1 ,CONFIG_AXP_ELDO1_VOLT ); power_failed |=axp_set_eldo (2 ,CONFIG_AXP_ELDO2_VOLT ); power_failed |=axp_set_eldo (3 ,CONFIG_AXP_ELDO3_VOLT );#endif -#ifdef CONFIG_AXP818_POWER +#ifdef CONFIG_AXP_FLDO1_VOLT power_failed |=axp_set_fldo (1 ,CONFIG_AXP_FLDO1_VOLT ); power_failed |=axp_set_fldo (2 ,CONFIG_AXP_FLDO2_VOLT ); power_failed |=axp_set_fldo (3 ,CONFIG_AXP_FLDO3_VOLT );@@ -649,7 +645,7 @@ void sunxi_board_init(void)#if definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER power_failed |=axp_set_sw (IS_ENABLED (CONFIG_AXP_SW_ON ));#endif -#endif +#endif /* CONFIG_AXPxxx_POWER */ printf ("DRAM:" ); gd->ram_size =sunxi_dram_init ();printf (" %d MiB\n" , (int )(gd->ram_size >>20 ));drivers/power/Kconfig +0
-0drivers/power/Kconfig config AXP_DCDC3_VOLT · line 183
Quoted 4 lines
drivers/power/Kconfig +0
-1@@ -180,7 +180,7 @@ config AXP_DCDC3_VOLT config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage" - depends on AXP152_POWER || AXP221_POWER || AXP809_POWER ||
AXP818_POWER||Quoted 1 line
AXP305_POWER+ depends onAXP152_POWER||AXP221_POWER||AXP809_POWER||
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 186
Quoted 3 lines
AXP305_POWERdefault 1250 ifAXP152_POWERdrivers/power/Kconfig +0
-0default 1200 if MACH_SUN6I default 0 if MACH_SUN8IThis patch is great, but this last change doesn't seem to be directly connected?
Quoted 8 lines
Quoted 6 lines
It is an existing bug: there is no
axp_set_dcdc4()for the AXP818, but since the AXP818 is not included in the guards at the calling site inboard.cabove, we didn't notice.
So without this change, all A83T boards (the only ones using AXP818) would fail compilation.
I just forgot to mention it in the commit message, will add it.Will you resend this patch after updating the commit message?
Well, I was actually thinking of merging it straight away (with the updated commit message), since I think that plus a tiny typo were the only changes requested in that series.
Unless there is more from your side?
Cheers,
Andre
PATCH 2/3 power: pmic: sunxi: add AXP313 SPL driver
In reply to Andre PrzywaraOn boards using the AXP313 PMIC, the DRAM rail is often not setup correctly at reset time, so we have to program the PMIC very early in the SPL, before running the DRAM initialisation.
Add a simple AXP313 PMIC driver that knows about DCDC2(CPU) and DCDC3(DRAM), so that we can bump up the voltage before the DRAM init.
--- arch/arm/mach-sunxi/pmic_bus.c | 3 + board/sunxi/board.c | 3 +- drivers/power/Kconfig | 17 ++++- drivers/power/Makefile | 1 + drivers/power/axp313.c | 134 +++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 3 deletions(-) create mode 100644 drivers/power/axp313.c
arch/arm/mach-sunxi/pmic_bus.c +3 -0
@@ -22,6 +22,7 @@#define AXP209_I2C_ADDR 0x34#define AXP305_I2C_ADDR 0x36 +#define AXP313_I2C_ADDR 0x36#define AXP221_CHIP_ADDR 0x68
@@ -34,6 +35,8 @@ static int pmic_i2c_address(void)return AXP152_I2C_ADDR ;if (IS_ENABLED (CONFIG_AXP305_POWER ))return AXP305_I2C_ADDR ; +if (IS_ENABLED (CONFIG_AXP313_POWER )) +return AXP313_I2C_ADDR ;/* Other AXP2xx and AXP8xx variants */ return AXP209_I2C_ADDR ;
board/sunxi/board.c +2 -1
@@ -584,7 +584,8 @@ void sunxi_board_init(void)#if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ - definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER || \ + definedCONFIG_AXP313_POWER power_failed =axp_init ();if (IS_ENABLED (CONFIG_AXP_DISABLE_BOOT_ON_POWERON ) && !power_failed) {
drivers/power/Kconfig +15 -2
@@ -101,6 +101,15 @@ config AXP305_POWER Select this to enable support for the axp305 pmic found on most H616 boards. +config AXP313_POWER + bool "axp311 pmic support" + depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the AXP313 PMIC found on some + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I
@@ -143,9 +152,10 @@ config AXP_DCDC1_VOLT config AXP_DCDC2_VOLT int "axp pmic dcdc2 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP313_POWER default 900 if AXP818_POWER default 1400 if AXP152_POWER || AXP209_POWER + default 1000 if AXP313_POWER default 1200 if MACH_SUN6I default 1100 if MACH_SUN8I default 0 if MACH_SUN9I
@@ -158,13 +168,15 @@ config AXP_DCDC2_VOLT On A80 boards dcdc2 powers the GPU and can be left off. On A83T boards dcdc2 is used for VDD-CPUA(cluster 0) and should be 0.9V. On R40 boards dcdc2 is VDD-CPU and should be 1.1V + On boards using the AXP313 it's often VDD-CPU. config AXP_DCDC3_VOLT int "axp pmic dcdc3 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER + depends on AXP152_POWER || AXP209_POWER || AXP221_POWER || AXP809_POWER || AXP818_POWER || AXP313_POWER default 900 if AXP809_POWER || AXP818_POWER default 1500 if AXP152_POWER default 1250 if AXP209_POWER + default 1100 if AXP313_POWER default 1100 if MACH_SUN8I_R40 default 1200 if MACH_SUN6I || MACH_SUN8I ---help---
@@ -177,6 +189,7 @@ config AXP_DCDC3_VOLT On A80 boards dcdc3 is used for VDD-CPUA(cluster 0) and should be 0.9V. On A83T boards dcdc3 is used for VDD-CPUB(cluster 1) and should be 0.9V. On R40 boards dcdc3 is VDD-SYS and VDD-GPU and should be 1.1V. + On boards using the AXP313 it's often VDD-DRAM and should be 1.1V for LPDDR4. config AXP_DCDC4_VOLT int "axp pmic dcdc4 voltage"
drivers/power/Makefile +1 -0
@@ -12,6 +12,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o obj-$(CONFIG_AXP305_POWER) += axp305.o +obj-$(CONFIG_AXP313_POWER) += axp313.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.o
drivers/power/axp313.c new file +134 -0
134 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 2/3] power: pmic: sunxi: add AXP313 SPL driver
Quoted 43 lines · CEST Andre Przywara
On boards using the AXP313 PMIC, the DRAM rail is often not setup correctly at reset time, so we have to program the PMIC very early in the SPL, before running the DRAM initialisation.
Add a simple AXP313 PMIC driver that knows about DCDC2(CPU) and DCDC3(DRAM), so that we can bump up the voltage before the DRAM init.
Signed-off-by Andre Przywara <[email protected]>--- arch/arm/mach-sunxi/pmic_bus.c | 3 + board/sunxi/board.c | 3 +- drivers/power/Kconfig | 17 ++++- drivers/power/Makefile | 1 + drivers/power/axp313.c | 134 +++++++++++++++++++++++++++++++++ 5 files changed, 155 insertions(+), 3 deletions(-) create mode 100644 drivers/power/axp313.carch/arm/mach-sunxi/pmic_bus.c +3
-0@@ -22,6 +22,7 @@#define AXP209_I2C_ADDR 0x34#define AXP305_I2C_ADDR 0x36 +#define AXP313_I2C_ADDR 0x36#define AXP221_CHIP_ADDR 0x68@@ -34,6 +35,8 @@ static int pmic_i2c_address(void)return AXP152_I2C_ADDR ;if (IS_ENABLED (CONFIG_AXP305_POWER ))return AXP305_I2C_ADDR ; +if (IS_ENABLED (CONFIG_AXP313_POWER )) +return AXP313_I2C_ADDR ;/* Other AXP2xx and AXP8xx variants */ return AXP209_I2C_ADDR ;board/sunxi/board.c +0
-0
board/sunxi/board.c void sunxi_board_init(void) · line 591
Quoted 9 lines
board/sunxi/board.c +2
-1@@ -584,7 +584,8 @@ void sunxi_board_init(void)#if definedCONFIG_AXP152_POWER || definedCONFIG_AXP209_POWER || \ definedCONFIG_AXP221_POWER || definedCONFIG_AXP305_POWER || \ - definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER + definedCONFIG_AXP809_POWER || definedCONFIG_AXP818_POWER || \ + definedCONFIG_AXP313_POWER power_failed =axp_init (); if (IS_ENABLED(CONFIG_AXP_DISABLE_BOOT_ON_POWERON) && !
power_failed) {
drivers/power/Kconfig config AXP305_POWER · line 105
Quoted 10 lines
drivers/power/Kconfig +2
-0@@ -101,6 +101,15 @@ config AXP305_POWER Select this to enable support for the axp305 pmic found on most H616 boards. +config AXP313_POWER + bool "axp311 pmic support"
Typo: axp311 -> axp313
Other than that, it looks good. I can't test it since I don't have any hardware with such PMIC.
So FWIW:
Best regards,
Jernej
Quoted 11 lines
drivers/power/Kconfig +7
-0+ depends on MACH_SUN50I_H616 + select AXP_PMIC_BUS + select CMD_POWEROFF + ---help--- + Select this to enable support for the AXP313 PMIC found on some + H616 boards. + config AXP809_POWER bool "axp809 pmic support" depends on MACH_SUN9I
drivers/power/Kconfig config AXP_DCDC1_VOLT · line 146
Quoted 4 lines
drivers/power/Kconfig +0
-1@@ -143,9 +152,10 @@ config AXP_DCDC1_VOLT config AXP_DCDC2_VOLT int "axp pmic dcdc2 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER ||
AXP809_POWER ||
Quoted 1 line
AXP818_POWER+ depends onAXP152_POWER||AXP209_POWER||AXP221_POWER
|| > AXP809_POWER || AXP818_POWER || AXP313_POWER default 900 if AXP818_POWER > default 1400 if AXP152_POWER || AXP209_POWER
drivers/power/Kconfig config AXP_DCDC2_VOLT · line 169
Quoted 7 lines
drivers/power/Kconfig +1
-0+ default 1000 if AXP313_POWER default 1200 if MACH_SUN6I default 1100 if MACH_SUN8I default 0 if MACH_SUN9I@@ -158,13 +168,15 @@ config AXP_DCDC2_VOLT On A80 boards dcdc2 powers the GPU and can be left off. On A83T boards dcdc2 is used for VDD-CPUA(cluster 0) and should be
0.9V.
drivers/power/Kconfig config AXP_DCDC2_VOLT
Quoted 6 lines
drivers/power/Kconfig +1
-1On R40 boards dcdc2 is VDD-CPU and should be 1.1V + On boards using the AXP313 it's often VDD-CPU. config AXP_DCDC3_VOLT int "axp pmic dcdc3 voltage" - depends on AXP152_POWER || AXP209_POWER || AXP221_POWER ||
AXP809_POWER ||
Quoted 1 line
AXP818_POWER+ depends onAXP152_POWER||AXP209_POWER||AXP221_POWER
|| > AXP809_POWER || AXP818_POWER || AXP313_POWER default 900 if AXP809_POWER ||
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 189
Quoted 9 lines
AXP818_POWERdrivers/power/Kconfig +1
-0default 1500 if AXP152_POWER default 1250 if AXP209_POWER + default 1100 if AXP313_POWER default 1100 if MACH_SUN8I_R40 default 1200 if MACH_SUN6I || MACH_SUN8I ---help---@@ -177,6 +189,7 @@ config AXP_DCDC3_VOLT On A80 boards dcdc3 is used for VDD-CPUA(cluster 0) and should be
0.9V.
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 190
Quoted 1 line
drivers/power/Kconfig +0
-0On A83T boards dcdc3 is used for VDD-CPUB(cluster 1) and should be
0.9V.
drivers/power/Kconfig config AXP_DCDC3_VOLT · line 192
Quoted 2 lines
drivers/power/Kconfig +1
-0On R40 boards dcdc3 is VDD-SYS and VDD-GPU and should be 1.1V. + On boards using the AXP313 it's often VDD-DRAM and should be 1.1V
for
Quoted 83 lines
LPDDR4.
config
AXP_DCDC4_VOLTdrivers/power/Kconfig +0
-0int "axp pmic dcdc4 voltage"drivers/power/Makefile +1
-0@@ -12,6 +12,7 @@ obj-$(CONFIG_AXP152_POWER) += axp152.o obj-$(CONFIG_AXP209_POWER) += axp209.o obj-$(CONFIG_AXP221_POWER) += axp221.o obj-$(CONFIG_AXP305_POWER) += axp305.o +obj-$(CONFIG_AXP313_POWER) += axp313.o obj-$(CONFIG_AXP809_POWER) += axp809.o obj-$(CONFIG_AXP818_POWER) += axp818.o obj-$(CONFIG_EXYNOS_TMU) += exynos-tmu.odrivers/power/axp313.c new file +61
-0@@ -0,0 +1,134 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* AXP313(a) driver +* +* (C) Copyright 2023 Arm Ltd. +* +* Based on axp305.c +* (C) Copyright 2020 Jernej Skrabec <[email protected]> +* (C) Copyright 2014 Hans de Goede <[email protected]> +* (C) Copyright 2013 Oliver Schinagl <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <errno.h> +#include <asm/arch/pmic_bus.h> +#include <axp_pmic.h> + +enum axp313_reg { +AXP313_CHIP_VERSION =0x03 , +AXP313_OUTPUT_CTRL =0x10 , +AXP313_DCDC1_CTRL =0x13 , +AXP313_SHUTDOWN =0x1a , +}; + +#define AXP313_CHIP_VERSION_MASK 0xcf +#define AXP313_CHIP_VERSION_AXP1530 0x48 +#define AXP313_CHIP_VERSION_AXP313A 0x4b +#define AXP313_CHIP_VERSION_AXP313B 0x4c + +#define AXP313_DCDC_SPLIT_OFFSET 71 +#define AXP313_DCDC_SPLIT_MVOLT 1200 + +#define AXP313_POWEROFF BIT(7) + +static u8 mvolt_to_cfg (int mvolt,int min,int max,int div) +{ +if (mvolt < min) + mvolt = min; +else if (mvolt > max) + mvolt = max; + +return (mvolt - min) / div; +} + +static int axp_set_dcdc (int dcdc_num,unsigned int mvolt) +{ +int ret; +u8 cfg, enable_mask =1U << (dcdc_num -1 ); +int volt_reg =AXP313_DCDC1_CTRL + dcdc_num -1 ; +int max_mV; + +switch (dcdc_num) { +case 1 : +case 2 : + max_mV =1540 ; +break ; +case 3 : +/* +* The manual defines a different split point, but tests +* show that it's the same 1200mV as for DCDC1/2.
drivers/power/axp313.c line 71
Quoted 10 lines
drivers/power/axp313.c new file +10
-0+*/ + max_mV =1840 ; +break ; +default : +return -EINVAL ; + } + +if (mvolt >AXP313_DCDC_SPLIT_MVOLT ) + cfg = AXP313_DCDC_SPLIT_OFFSET + mvolt_to_cfg(mvolt, + AXP313_DCDC_SPLIT_MVOLT + 20,
max_mV, 20);
drivers/power/axp313.c line 73
Quoted 2 lines
drivers/power/axp313.c new file +2
-0+else + cfg = mvolt_to_cfg(mvolt, 500, AXP313_DCDC_SPLIT_MVOLT,
10);
drivers/power/axp313.c
Quoted 3 lines
drivers/power/axp313.c new file +3
-0+ +if (mvolt ==0 ) + return pmic_bus_clrbits(AXP313_OUTPUT_CTRL,
enable_mask);
drivers/power/axp313.c line 78
Quoted 2 lines
drivers/power/axp313.c new file +2
-0+ + debug("DCDC%d: writing 0x%x to reg 0x%x\n", dcdc_num, cfg,
volt_reg);
Quoted 56 lines
drivers/power/axp313.c new file +45
-0+ ret =pmic_bus_write (volt_reg, cfg); +if (ret) +return ret; + +return pmic_bus_setbits (AXP313_OUTPUT_CTRL , enable_mask); +} + +int axp_set_dcdc2 (unsigned int mvolt) +{ +return axp_set_dcdc (2 , mvolt); +} + +int axp_set_dcdc3 (unsigned int mvolt) +{ +return axp_set_dcdc (3 , mvolt); +} + +int axp_init (void ) +{ +u8 axp_chip_id; +int ret; + + ret =pmic_bus_init (); +if (ret) +return ret; + + ret =pmic_bus_read (AXP313_CHIP_VERSION , &axp_chip_id); +if (ret) +return ret; + + axp_chip_id &=AXP313_CHIP_VERSION_MASK ; +switch (axp_chip_id) { +case AXP313_CHIP_VERSION_AXP1530 : +case AXP313_CHIP_VERSION_AXP313A : +case AXP313_CHIP_VERSION_AXP313B : +break ; +default : +debug ("unknown PMIC: 0x%x\n" , axp_chip_id); +return -EINVAL ; + } + +return ret; +} + +#if !CONFIG_IS_ENABLED(ARM_PSCI_FW) &&!IS_ENABLED(CONFIG_SYSRESET_CMD_POWEROFF) +int
do_poweroff(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])+{drivers/power/axp313.c new file +9
-0+pmic_bus_write (AXP313_SHUTDOWN ,AXP313_POWEROFF ); + +/* infinite loop during shutdown */ +while (1 ) {} + +/* not reached */ + return 0; +} +#endif
PATCH 3/3 power: regulator: add AXP313 support
In reply to Andre PrzywaraThe X-Powers AXP313a is a small PMIC with just three buck converters and three LDOs, one of which is actually fixed (so not modelled here).
Add the compatible string and the respective regulator ranges to allow drivers to adjust voltages.
--- drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 +++++++++++++++++ include/axp_pmic.h | 1 + 3 files changed, 19 insertions(+)
drivers/power/pmic/axp.c +1 -0
@@ -87,6 +87,7 @@ static const struct udevice_id axp_pmic_ids[] = { { .compatible = "x-powers,axp209", .data = AXP209_ID }, { .compatible = "x-powers,axp221", .data = AXP221_ID }, { .compatible = "x-powers,axp223", .data = AXP223_ID }, + { .compatible = "x-powers,axp313a", .data = AXP313_ID }, { .compatible = "x-powers,axp803", .data = AXP803_ID }, { .compatible = "x-powers,axp806", .data = AXP806_ID }, { .compatible = "x-powers,axp809", .data = AXP809_ID },
drivers/power/regulator/axp_regulator.c +17 -0
@@ -173,6 +173,22 @@ static const struct axp_regulator_plat axp22x_regulators[] = { { } }; +/* +* The "dcdc1" regulator has another range, beyond 1.54V up to 3.4V, in +* steps of 100mV. We cannot model this easily, but also don't need that, +* since it's typically only used for ~1.1V anyway, so just ignore it. +* Also the DCDC3 regulator is described wrongly in the (available) manual, +* experiments show that the split point is at 1200mV, as for DCDC1/2. +*/ +static const struct axp_regulator_plat axp313_regulators[] = { + {"dcdc1" ,0x10 ,BIT (0 ),0x13 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc2" ,0x10 ,BIT (1 ),0x14 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc3" ,0x10 ,BIT (2 ),0x15 ,0x7f ,500 ,1840 ,10 ,70 }, + {"aldo1" ,0x10 ,BIT (3 ),0x16 ,0x1f ,500 ,3500 ,100 ,NA }, + {"dldo1" ,0x10 ,BIT (4 ),0x17 ,0x1f ,500 ,3500 ,100 ,NA }, + { } +}; +static const struct axp_regulator_plat axp803_regulators[] = { {"dcdc1" ,0x10 ,BIT (0 ),0x20 ,0x1f ,1600 ,3400 ,100 ,NA }, {"dcdc2" ,0x10 ,BIT (1 ),0x21 ,0x7f ,500 ,1300 ,10 ,70 },
@@ -274,6 +290,7 @@ static const struct axp_regulator_plat *const axp_regulators[] = { [AXP209_ID] = axp20x_regulators, [AXP221_ID] = axp22x_regulators, [AXP223_ID] = axp22x_regulators, + [AXP313_ID] = axp313_regulators, [AXP803_ID] = axp803_regulators, [AXP806_ID] = axp806_regulators, [AXP809_ID] = axp809_regulators,
include/axp_pmic.h +1 -0
@@ -32,6 +32,7 @@ enum {AXP209_ID ,AXP221_ID ,AXP223_ID , +AXP313_ID ,AXP803_ID ,AXP806_ID , AXP809_ID,
Signature · 1 line
2.25.1
Jernej Škrabec
maintainerRe: [PATCH 3/3] power: regulator: add AXP313 support
Quoted 31 lines · CEST Andre Przywara
The X-Powers AXP313a is a small PMIC with just three buck converters and three LDOs, one of which is actually fixed (so not modelled here).
Add the compatible string and the respective regulator ranges to allow drivers to adjust voltages.
Signed-off-by Andre Przywara <[email protected]>--- drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 +++++++++++++++++ include/axp_pmic.h | 1 + 3 files changed, 19 insertions(+)drivers/power/pmic/axp.c +1
-0@@ -87,6 +87,7 @@ static const struct udevice_id axp_pmic_ids[] = { { .compatible = "x-powers,axp209", .data = AXP209_ID }, { .compatible = "x-powers,axp221", .data = AXP221_ID }, { .compatible = "x-powers,axp223", .data = AXP223_ID }, + { .compatible = "x-powers,axp313a", .data = AXP313_ID }, { .compatible = "x-powers,axp803", .data = AXP803_ID }, { .compatible = "x-powers,axp806", .data = AXP806_ID }, { .compatible = "x-powers,axp809", .data = AXP809_ID },(quoted diff) +0
-0
b/drivers/power/regulator/axp_regulator.cindex02f320eac1e..d27e09538e0100644
drivers/power/regulator/axp_regulator.c static const struct axp_regulator_plat · line 179
Quoted 7 lines
drivers/power/regulator/axp_regulator.c +4
-0@@ -173,6 +173,22 @@ static const struct axp_regulator_plat axp22x_regulators[] = { { } }; +/* +* The "dcdc1" regulator has another range, beyond 1.54V up to 3.4V, in +* steps of 100mV. We cannot model this easily, but also don't need that, +* since it's typically only used for ~1.1V anyway, so just ignore it.
It can be modelled with look up table, as it's already done for some other regulators?
Best regards,
Jernej
Quoted 35 lines
drivers/power/regulator/axp_regulator.c +12
-0+* Also the DCDC3 regulator is described wrongly in the (available) manual, +* experiments show that the split point is at 1200mV, as for DCDC1/2. + */ +static const struct axp_regulator_plat axp313_regulators[] = { + {"dcdc1" ,0x10 ,BIT (0 ),0x13 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc2" ,0x10 ,BIT (1 ),0x14 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc3" ,0x10 ,BIT (2 ),0x15 ,0x7f ,500 ,1840 ,10 ,70 }, + {"aldo1" ,0x10 ,BIT (3 ),0x16 ,0x1f ,500 ,3500 ,100 ,NA }, + {"dldo1" ,0x10 ,BIT (4 ),0x17 ,0x1f ,500 ,3500 ,100 ,NA }, + { } +}; +static const struct axp_regulator_plat axp803_regulators[] = { {"dcdc1" ,0x10 ,BIT (0 ),0x20 ,0x1f ,1600 ,3400 ,100 ,NA }, {"dcdc2" ,0x10 ,BIT (1 ),0x21 ,0x7f ,500 ,1300 ,10 ,70 },@@ -274,6 +290,7 @@ static const struct axp_regulator_plat *const axp_regulators[] = { [AXP209_ID] = axp20x_regulators, [AXP221_ID] = axp22x_regulators, [AXP223_ID] = axp22x_regulators, + [AXP313_ID] = axp313_regulators, [AXP803_ID] = axp803_regulators, [AXP806_ID] = axp806_regulators, [AXP809_ID] = axp809_regulators,include/axp_pmic.h +1
-0@@ -32,6 +32,7 @@ enum {AXP209_ID ,AXP221_ID ,AXP223_ID , +AXP313_ID ,AXP803_ID ,AXP806_ID , AXP809_ID,
Re: [PATCH 3/3] power: regulator: add AXP313 support
Quoted 35 lines · On Sat, 21 Oct 2023 08:51:09 +0200 Jernej Škrabec <[email protected]>…
Quoted 34 lines · CEST Andre Przywara
The X-Powers AXP313a is a small PMIC with just three buck converters and three LDOs, one of which is actually fixed (so not modelled here).
Add the compatible string and the respective regulator ranges to allow drivers to adjust voltages.
Signed-off-by Andre Przywara <[email protected]>--- drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 +++++++++++++++++ include/axp_pmic.h | 1 + 3 files changed, 19 insertions(+)drivers/power/pmic/axp.c +1
-0@@ -87,6 +87,7 @@ static const struct udevice_id axp_pmic_ids[] = { { .compatible = "x-powers,axp209", .data = AXP209_ID }, { .compatible = "x-powers,axp221", .data = AXP221_ID }, { .compatible = "x-powers,axp223", .data = AXP223_ID }, + { .compatible = "x-powers,axp313a", .data = AXP313_ID }, { .compatible = "x-powers,axp803", .data = AXP803_ID }, { .compatible = "x-powers,axp806", .data = AXP806_ID }, { .compatible = "x-powers,axp809", .data = AXP809_ID },(quoted diff) +0
-0
b/drivers/power/regulator/axp_regulator.cindex02f320eac1e..d27e09538e0100644drivers/power/regulator/axp_regulator.c +0
-0@@ -173,6 +173,22 @@ static const struct axp_regulator_plat axp22x_regulators[] = { { } };
Quoted 7 lines
drivers/power/regulator/axp_regulator.c static const struct axp_regulator_plat axp22x_regulators[] = { · line 179
Quoted 4 lines
drivers/power/regulator/axp_regulator.c +4
-0+/* +* The "dcdc1" regulator has another range, beyond 1.54V up to 3.4V, in +* steps of 100mV. We cannot model this easily, but also don't need that, +* since it's typically only used for ~1.1V anyway, so just ignore it. It can be modelled with look up table, as it's already done for some other regulators?
Theoretically yes, but it would require about 105 entries, that's quite a lot for something we don't need. As mentioned, it's typically VDD_GPU/VDD_SYS, at 0.9V at reset, and no device used in U-Boot directly references this regulator, so I think it wouldn't be used anyways. I doubt that even with a user we ever would go beyond 1.54V. So for the sake of simplicity, I'd like to keep this cut to those two ranges.
Thanks for having a look!
Cheers,
Andre
Quoted 44 lines
Best regards,
JernejQuoted 35 lines
drivers/power/regulator/axp_regulator.c +12
-0+* Also the DCDC3 regulator is described wrongly in the (available) manual, +* experiments show that the split point is at 1200mV, as for DCDC1/2. + */ +static const struct axp_regulator_plat axp313_regulators[] = { + {"dcdc1" ,0x10 ,BIT (0 ),0x13 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc2" ,0x10 ,BIT (1 ),0x14 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc3" ,0x10 ,BIT (2 ),0x15 ,0x7f ,500 ,1840 ,10 ,70 }, + {"aldo1" ,0x10 ,BIT (3 ),0x16 ,0x1f ,500 ,3500 ,100 ,NA }, + {"dldo1" ,0x10 ,BIT (4 ),0x17 ,0x1f ,500 ,3500 ,100 ,NA }, + { } +}; +static const struct axp_regulator_plat axp803_regulators[] = { {"dcdc1" ,0x10 ,BIT (0 ),0x20 ,0x1f ,1600 ,3400 ,100 ,NA }, {"dcdc2" ,0x10 ,BIT (1 ),0x21 ,0x7f ,500 ,1300 ,10 ,70 },@@ -274,6 +290,7 @@ static const struct axp_regulator_plat *const axp_regulators[] = { [AXP209_ID] = axp20x_regulators, [AXP221_ID] = axp22x_regulators, [AXP223_ID] = axp22x_regulators, + [AXP313_ID] = axp313_regulators, [AXP803_ID] = axp803_regulators, [AXP806_ID] = axp806_regulators, [AXP809_ID] = axp809_regulators,include/axp_pmic.h +1
-0@@ -32,6 +32,7 @@ enum {AXP209_ID ,AXP221_ID ,AXP223_ID , +AXP313_ID ,AXP803_ID ,AXP806_ID , AXP809_ID,
Re: [PATCH 3/3] power: regulator: add AXP313 support
In reply to Andre PrzywaraQuoted 7 lines · Andre Przywara
The X-Powers AXP313a is a small PMIC with just three buck converters and three LDOs, one of which is actually fixed (so not modelled here).
Add the compatible string and the respective regulator ranges to allow drivers to adjust voltages.
Signed-off-by Andre Przywara <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 65 lines
--- drivers/power/pmic/axp.c | 1 + drivers/power/regulator/axp_regulator.c | 17 +++++++++++++++++ include/axp_pmic.h | 1 + 3 files changed, 19 insertions(+)drivers/power/pmic/axp.c +1
-0@@ -87,6 +87,7 @@ static const struct udevice_id axp_pmic_ids[] = { { .compatible = "x-powers,axp209", .data = AXP209_ID }, { .compatible = "x-powers,axp221", .data = AXP221_ID }, { .compatible = "x-powers,axp223", .data = AXP223_ID }, + { .compatible = "x-powers,axp313a", .data = AXP313_ID }, { .compatible = "x-powers,axp803", .data = AXP803_ID }, { .compatible = "x-powers,axp806", .data = AXP806_ID }, { .compatible = "x-powers,axp809", .data = AXP809_ID },drivers/power/regulator/axp_regulator.c +17
-0@@ -173,6 +173,22 @@ static const struct axp_regulator_plat axp22x_regulators[] = { { } }; +/* +* The "dcdc1" regulator has another range, beyond 1.54V up to 3.4V, in +* steps of 100mV. We cannot model this easily, but also don't need that, +* since it's typically only used for ~1.1V anyway, so just ignore it. +* Also the DCDC3 regulator is described wrongly in the (available) manual, +* experiments show that the split point is at 1200mV, as for DCDC1/2. +*/ +static const struct axp_regulator_plat axp313_regulators[] = { + {"dcdc1" ,0x10 ,BIT (0 ),0x13 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc2" ,0x10 ,BIT (1 ),0x14 ,0x7f ,500 ,1540 ,10 ,70 }, + {"dcdc3" ,0x10 ,BIT (2 ),0x15 ,0x7f ,500 ,1840 ,10 ,70 }, + {"aldo1" ,0x10 ,BIT (3 ),0x16 ,0x1f ,500 ,3500 ,100 ,NA }, + {"dldo1" ,0x10 ,BIT (4 ),0x17 ,0x1f ,500 ,3500 ,100 ,NA }, + { } +}; +static const struct axp_regulator_plat axp803_regulators[] = { {"dcdc1" ,0x10 ,BIT (0 ),0x20 ,0x1f ,1600 ,3400 ,100 ,NA }, {"dcdc2" ,0x10 ,BIT (1 ),0x21 ,0x7f ,500 ,1300 ,10 ,70 },@@ -274,6 +290,7 @@ static const struct axp_regulator_plat *const axp_regulators[] = { [AXP209_ID] = axp20x_regulators, [AXP221_ID] = axp22x_regulators, [AXP223_ID] = axp22x_regulators, + [AXP313_ID] = axp313_regulators, [AXP803_ID] = axp803_regulators, [AXP806_ID] = axp806_regulators, [AXP809_ID] = axp809_regulators,include/axp_pmic.h +1
-0@@ -32,6 +32,7 @@ enum {AXP209_ID ,AXP221_ID ,AXP223_ID , +AXP313_ID ,AXP803_ID ,AXP806_ID , AXP809_ID,