pmic: pca9450: Make warm reset on WDOG_B assertion
PATCH 1/2 pmic: pca9450: Make warm reset on WDOG_B assertion
The default configuration of the PMIC behavior makes the PMIC power cycle most regulators on WDOG_B assertion. This power cycling causes the memory contents of OCRAM to be lost. Some systems neeeds some memory that survives reset and reboot, therefore this patch is created.
The implementation is taken almost verbatim from Linux commit 2364a64d0673f ("regulator: pca9450: Make warm reset on WDOG_B assertion")
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: "Ying-Chun Liu (PaulLiu)" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Frieder Schrempf <[email protected]>
Cc: Manoj Sai <[email protected]>
Cc: Marcel Ziswiler <[email protected]>
Cc: Matteo Lisi <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Rickard x Andersson <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tim Harvey <[email protected]>
--- drivers/power/pmic/pca9450.c | 11 ++++++++++- include/power/pca9450.h | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/power/pmic/pca9450.c +10 -1
@@ -86,6 +86,7 @@ static int pca9450_bind(struct udevice *dev)static int pca9450_probe (struct udevice *dev) {struct pca9450_priv *priv =dev_get_priv (dev); +unsigned int reset_ctrl;int ret =0 ;if (CONFIG_IS_ENABLED (DM_GPIO ) &&CONFIG_IS_ENABLED (DM_REGULATOR_PCA9450 )) {
@@ -95,10 +96,18 @@ static int pca9450_probe(struct udevice *dev)if (IS_ERR (priv->sd_vsel_gpio)) { ret =PTR_ERR (priv->sd_vsel_gpio);dev_err (dev,"Failed to request SD_VSEL GPIO: %d\n" , ret); +if (ret) +return ret; } } -return ret; +if (ofnode_read_bool (dev_ofnode (dev),"nxp,wdog_b-warm-reset" )) + reset_ctrl =PCA9450_PMIC_RESET_WDOG_B_CFG_WARM ; +else + reset_ctrl =PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12 ; + +return pmic_clrsetbits (dev,PCA9450_RESET_CTRL , +PCA9450_PMIC_RESET_WDOG_B_CFG_MASK , reset_ctrl); }static struct dm_pmic_ops pca9450_ops = {
include/power/pca9450.h +4 -0
@@ -67,4 +67,8 @@ enum {#define PCA9450_LDO34_MASK 0x1f#define PCA9450_LDO5_MASK 0x0f +#define PCA9450_PMIC_RESET_WDOG_B_CFG_MASK 0xc0 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_WARM 0x40 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12 0x80 +#endif
Signature · 1 line
2.35.1
PATCH 2/2 ARM: imx: Remove PMIC reset configuration from board files
The PCA9450 reset configuration can now be performed by the PCA9450 PMIC driver itself, remove the hard-coded variant from board code and let the PMIC driver perform this task using one-liner:
``` $ sed -i '/set WDOG_B_CFG to cold reset/,+2 d' $(git grep -l PCA9450_RESET_CTRL.*0xA1 board/) ```
Venice and i.MX93 EVK required slight manual fix up.
---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: "Ying-Chun Liu (PaulLiu)" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Frieder Schrempf <[email protected]>
Cc: Manoj Sai <[email protected]>
Cc: Marcel Ziswiler <[email protected]>
Cc: Matteo Lisi <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tim Harvey <[email protected]>
--- board/advantech/imx8mp_rsb3720a1/spl.c | 3 --- board/dhelectronics/dh_imx8mp/spl.c | 3 --- board/engicam/imx8mp/spl.c | 3 --- board/freescale/imx8mm_evk/spl.c | 3 --- board/freescale/imx8mn_evk/spl.c | 3 --- board/freescale/imx8mp_evk/spl.c | 3 --- board/freescale/imx93_evk/spl.c | 3 --- board/gateworks/venice/spl.c | 3 --- board/kontron/sl-mx8mm/spl.c | 3 --- board/toradex/verdin-imx8mm/spl.c | 3 --- board/toradex/verdin-imx8mp/spl.c | 3 --- 11 files changed, 33 deletions(-)
board/advantech/imx8mp_rsb3720a1/spl.c +0 -3
@@ -209,9 +209,6 @@ int power_init_board(void)/* To avoid timing risk from SOC to ARM,increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (pdev,PCA9450_BUCK2OUT_DVS0 ,0x1C ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (pdev,PCA9450_RESET_CTRL ,0xA1 ); -/* Forced enable the I2C level translator*/ pmic_reg_write (pdev,PCA9450_CONFIG2 ,0x03 );
board/dhelectronics/dh_imx8mp/spl.c +0 -3
@@ -88,9 +88,6 @@ static int dh_imx8mp_board_power_init(void)/* To avoid timing risk from SoC to ARM, increase VDD_ARM to OD voltage 0.95V */ pmic_reg_write (dev,PCA9450_BUCK2OUT_DVS0 ,0x1c ); -/* Set WDOG_B_CFG to cold reset. */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -/* Set LDO4 and CONFIG2 to enable the I2C level translator. */ pmic_reg_write (dev,PCA9450_LDO4CTRL ,0x59 );pmic_reg_write (dev,PCA9450_CONFIG2 ,0x1 );
board/engicam/imx8mp/spl.c +0 -3
@@ -95,9 +95,6 @@ int power_init_board(void)pmic_reg_write (p,PCA9450_BUCK6OUT ,0x18 );#endif -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif
board/freescale/imx8mm_evk/spl.c +0 -3
@@ -99,9 +99,6 @@ static int power_init_board(void)/* set VDD_SNVS_0V8 from default 0.85V */ pmic_reg_write (dev,PCA9450_LDO2CTRL ,0xC0 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -return 0 ; }
board/freescale/imx8mn_evk/spl.c +0 -3
@@ -95,9 +95,6 @@ int power_init_board(void)/* enable LDO4 to 1.2v */ pmic_reg_write (dev,PCA9450_LDO4CTRL ,0x44 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif
board/freescale/imx8mp_evk/spl.c +0 -3
@@ -102,9 +102,6 @@ int power_init_board(void)/* To avoid timing risk from SOC to ARM,increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (p,PCA9450_BUCK2OUT_DVS0 ,0x1C ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif
board/freescale/imx93_evk/spl.c +0 -3
@@ -74,9 +74,6 @@ int power_init_board(void)/* I2C_LT_EN*/ pmic_reg_write (dev,0xa ,0x3 ); - -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); return 0; }#endif
board/gateworks/venice/spl.c +0 -3
@@ -165,9 +165,6 @@ static int power_init_board(void)/* Kernel uses OD/OD freq for SOC */ /* To avoid timing risk from SOC to ARM, increase VDD_ARM to OD voltage 0.95v */ dm_i2c_reg_write (dev,PCA9450_BUCK2OUT_DVS0 ,0x1C ); - -/* set WDOG_B_CFG to cold reset */ -dm_i2c_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); } else if ((!strncmp(model, "GW7901", 6)) ||
board/kontron/sl-mx8mm/spl.c +0 -3
@@ -193,9 +193,6 @@ static int power_init_board(void)/* set VDD_SNVS_0V8 from default 0.85V to 0.8V */ pmic_reg_write (dev,PCA9450_LDO2CTRL ,0xC0 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -return 0 ; }
board/toradex/verdin-imx8mm/spl.c +0 -3
@@ -92,9 +92,6 @@ int power_init_board(void)/* increase VDD_DRAM to 0.975v for 1.5Ghz DDR */ pmic_reg_write (dev,PCA9450_BUCK3OUT_DVS0 ,0x1c ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -pmic_reg_write (dev,PCA9450_CONFIG2 ,0x1 );return 0 ;
board/toradex/verdin-imx8mp/spl.c +0 -3
@@ -116,9 +116,6 @@ int power_init_board(void)/* To avoid timing risk from SoC to ARM, increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (p,PCA9450_BUCK2OUT_DVS0 ,0x1c ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); -/* set LDO4 and CONFIG2 to enable the I2C level translator */ pmic_reg_write (p,PCA9450_LDO4CTRL ,0x59 );pmic_reg_write (p,PCA9450_CONFIG2 ,0x1 );
Signature · 1 line
2.35.1
Re: [PATCH 2/2] ARM: imx: Remove PMIC reset configuration from board files
Quoted 4 lines · Marek Vasut
The PCA9450 reset configuration can now be performed by the PCA9450 PMIC driver itself, remove the hard-coded variant from board code and let the PMIC driver perform this task using one-liner:
Quoted 8 lines
``` $ sed -i '/set WDOG_B_CFG to cold reset/,+2 d' $(git grep -l PCA9450_RESET_CTRL.*0xA1 board/) ```Venice and i.MX93 EVK required slight manual fix up.
Signed-off-by Marek Vasut <[email protected]>
Re: [PATCH 2/2] ARM: imx: Remove PMIC reset configuration from board files
In reply to Marek VasutQuoted 182 lines · Marek Vasut
The PCA9450 reset configuration can now be performed by the PCA9450 PMIC driver itself, remove the hard-coded variant from board code and let the PMIC driver perform this task using one-liner:
``` $ sed -i '/set WDOG_B_CFG to cold reset/,+2 d' $(git grep -l PCA9450_RESET_CTRL.*0xA1 board/) ```Venice and i.MX93 EVK required slight manual fix up.
Signed-off-by Marek Vasut <[email protected]>---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: "Ying-Chun Liu (PaulLiu)" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Frieder Schrempf <[email protected]>
Cc: Manoj Sai <[email protected]>
Cc: Marcel Ziswiler <[email protected]>
Cc: Matteo Lisi <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tim Harvey <[email protected]>--- board/advantech/imx8mp_rsb3720a1/spl.c | 3 --- board/dhelectronics/dh_imx8mp/spl.c | 3 --- board/engicam/imx8mp/spl.c | 3 --- board/freescale/imx8mm_evk/spl.c | 3 --- board/freescale/imx8mn_evk/spl.c | 3 --- board/freescale/imx8mp_evk/spl.c | 3 --- board/freescale/imx93_evk/spl.c | 3 --- board/gateworks/venice/spl.c | 3 --- board/kontron/sl-mx8mm/spl.c | 3 --- board/toradex/verdin-imx8mm/spl.c | 3 --- board/toradex/verdin-imx8mp/spl.c | 3 --- 11 files changed, 33 deletions(-)board/advantech/imx8mp_rsb3720a1/spl.c +0
-3@@ -209,9 +209,6 @@ int power_init_board(void)/* To avoid timing risk from SOC to ARM,increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (pdev,PCA9450_BUCK2OUT_DVS0 ,0x1C ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (pdev,PCA9450_RESET_CTRL ,0xA1 ); -/* Forced enable the I2C level translator*/ pmic_reg_write (pdev,PCA9450_CONFIG2 ,0x03 );board/dhelectronics/dh_imx8mp/spl.c +0
-3@@ -88,9 +88,6 @@ static int dh_imx8mp_board_power_init(void)/* To avoid timing risk from SoC to ARM, increase VDD_ARM to OD voltage 0.95V */ pmic_reg_write (dev,PCA9450_BUCK2OUT_DVS0 ,0x1c ); -/* Set WDOG_B_CFG to cold reset. */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -/* Set LDO4 and CONFIG2 to enable the I2C level translator. */ pmic_reg_write (dev,PCA9450_LDO4CTRL ,0x59 );pmic_reg_write (dev,PCA9450_CONFIG2 ,0x1 );board/engicam/imx8mp/spl.c +0
-3@@ -95,9 +95,6 @@ int power_init_board(void)pmic_reg_write (p,PCA9450_BUCK6OUT ,0x18 );#endif -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif board/freescale/imx8mm_evk/spl.c +0
-3@@ -99,9 +99,6 @@ static int power_init_board(void)/* set VDD_SNVS_0V8 from default 0.85V */ pmic_reg_write (dev,PCA9450_LDO2CTRL ,0xC0 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -return 0 ; }board/freescale/imx8mn_evk/spl.c +0
-3@@ -95,9 +95,6 @@ int power_init_board(void)/* enable LDO4 to 1.2v */ pmic_reg_write (dev,PCA9450_LDO4CTRL ,0x44 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif board/freescale/imx8mp_evk/spl.c +0
-3@@ -102,9 +102,6 @@ int power_init_board(void)/* To avoid timing risk from SOC to ARM,increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (p,PCA9450_BUCK2OUT_DVS0 ,0x1C ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); - return 0; }#endif board/freescale/imx93_evk/spl.c +0
-3@@ -74,9 +74,6 @@ int power_init_board(void)/* I2C_LT_EN*/ pmic_reg_write (dev,0xa ,0x3 ); - -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); return 0; }#endif board/gateworks/venice/spl.c +0
-3@@ -165,9 +165,6 @@ static int power_init_board(void)/* Kernel uses OD/OD freq for SOC */ /* To avoid timing risk from SOC to ARM, increase VDD_ARM to OD voltage 0.95v */ dm_i2c_reg_write (dev,PCA9450_BUCK2OUT_DVS0 ,0x1C ); - -/* set WDOG_B_CFG to cold reset */ -dm_i2c_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); } else if ((!strncmp(model, "GW7901", 6)) ||board/kontron/sl-mx8mm/spl.c +0
-3@@ -193,9 +193,6 @@ static int power_init_board(void)/* set VDD_SNVS_0V8 from default 0.85V to 0.8V */ pmic_reg_write (dev,PCA9450_LDO2CTRL ,0xC0 ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -return 0 ; }board/toradex/verdin-imx8mm/spl.c +0
-3@@ -92,9 +92,6 @@ int power_init_board(void)/* increase VDD_DRAM to 0.975v for 1.5Ghz DDR */ pmic_reg_write (dev,PCA9450_BUCK3OUT_DVS0 ,0x1c ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (dev,PCA9450_RESET_CTRL ,0xA1 ); -pmic_reg_write (dev,PCA9450_CONFIG2 ,0x1 );return 0 ;board/toradex/verdin-imx8mp/spl.c +0
-0
board/toradex/verdin-imx8mp/spl.c int power_init_board(void) · line 121
Quoted 9 lines
board/toradex/verdin-imx8mp/spl.c +0
-3@@ -116,9 +116,6 @@ int power_init_board(void)/* To avoid timing risk from SoC to ARM, increase VDD_ARM to OD voltage 0.95v */ pmic_reg_write (p,PCA9450_BUCK2OUT_DVS0 ,0x1c ); -/* set WDOG_B_CFG to cold reset */ -pmic_reg_write (p,PCA9450_RESET_CTRL ,0xA1 ); -/* set LDO4 and CONFIG2 to enable the I2C level translator */ pmic_reg_write (p,PCA9450_LDO4CTRL ,0x59 );pmic_reg_write (p,PCA9450_CONFIG2 ,0x1 );
PATCH 2/2 ARM: imx: Remove PMIC reset configuration from board files
In reply to Marek VasutQuoted 10 lines
The PCA9450 reset configuration can now be performed by the PCA9450 PMIC driver itself, remove the hard-coded variant from board code and let the PMIC driver perform this task using one-liner:
``` $ sed -i '/set WDOG_B_CFG to cold reset/,+2 d' $(git grep -l PCA9450_RESET_CTRL.*0xA1 board/) ```Venice and i.MX93 EVK required slight manual fix up.
Signed-off-by Marek Vasut <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Quoted 10 lines · Marek Vasut
The default configuration of the PMIC behavior makes the PMIC power cycle most regulators on
WDOG_Bassertion. This power cycling causes the memory contents of OCRAM to be lost. Some systems neeeds some memory that survives reset and reboot, therefore this patch is created.The implementation is taken almost verbatim from Linux commit
2364a64d0673f("regulator: pca9450: Make warm reset onWDOG_Bassertion")Signed-off-by Marek Vasut <[email protected]>
Quoted 65 lines · Marek Vasut
The default configuration of the PMIC behavior makes the PMIC power cycle most regulators on
WDOG_Bassertion. This power cycling causes the memory contents of OCRAM to be lost. Some systems neeeds some memory that survives reset and reboot, therefore this patch is created.The implementation is taken almost verbatim from Linux commit
2364a64d0673f("regulator: pca9450: Make warm reset onWDOG_Bassertion")Signed-off-by Marek Vasut <[email protected]>---
Cc: "NXP i.MX U-Boot Team" <[email protected]>
Cc: "Ying-Chun Liu (PaulLiu)" <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Frieder Schrempf <[email protected]>
Cc: Manoj Sai <[email protected]>
Cc: Marcel Ziswiler <[email protected]>
Cc: Matteo Lisi <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Rickard x Andersson <[email protected]>
Cc: Stefano Babic <[email protected]>
Cc: Tim Harvey <[email protected]>--- drivers/power/pmic/pca9450.c | 11 ++++++++++- include/power/pca9450.h | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-)drivers/power/pmic/pca9450.c +10
-1@@ -86,6 +86,7 @@ static int pca9450_bind(struct udevice *dev)static int pca9450_probe (struct udevice *dev) {struct pca9450_priv *priv =dev_get_priv (dev); +unsigned int reset_ctrl;int ret =0 ;if (CONFIG_IS_ENABLED (DM_GPIO ) &&CONFIG_IS_ENABLED (DM_REGULATOR_PCA9450 )) {@@ -95,10 +96,18 @@ static int pca9450_probe(struct udevice *dev)if (IS_ERR (priv->sd_vsel_gpio)) { ret =PTR_ERR (priv->sd_vsel_gpio);dev_err (dev,"Failed to request SD_VSEL GPIO: %d\n" , ret); +if (ret) +return ret; } } -return ret; +if (ofnode_read_bool (dev_ofnode (dev),"nxp,wdog_b-warm-reset" )) + reset_ctrl =PCA9450_PMIC_RESET_WDOG_B_CFG_WARM ; +else + reset_ctrl =PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12 ; + +return pmic_clrsetbits (dev,PCA9450_RESET_CTRL , +PCA9450_PMIC_RESET_WDOG_B_CFG_MASK , reset_ctrl); }static struct dm_pmic_ops pca9450_ops = {include/power/pca9450.h +0
-0
include/power/pca9450.h enum { · line 74
Quoted 8 lines
include/power/pca9450.h +4
-0@@ -67,4 +67,8 @@ enum {#define PCA9450_LDO34_MASK 0x1f#define PCA9450_LDO5_MASK 0x0f +#define PCA9450_PMIC_RESET_WDOG_B_CFG_MASK 0xc0 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_WARM 0x40 +#define PCA9450_PMIC_RESET_WDOG_B_CFG_COLD_LDO12 0x80 +#endif
PATCH 1/2 pmic: pca9450: Make warm reset on WDOG_B assertion
In reply to Marek VasutQuoted 10 lines
The default configuration of the PMIC behavior makes the PMIC power cycle most regulators on
WDOG_Bassertion. This power cycling causes the memory contents of OCRAM to be lost.
Some systems neeeds some memory that survives reset and reboot, therefore this patch is created.
The implementation is taken almost verbatim from Linux commit2364a64d0673f("regulator: pca9450: Make warm reset onWDOG_Bassertion")Signed-off-by Marek Vasut <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, 82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================