diff options
author | Samuel Holland <samuel@sholland.org> | 2020-12-13 22:43:15 -0600 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2020-12-13 22:58:21 -0600 |
commit | 4470298333d0e453d5ac2f9beb73b6a3787edcce (patch) | |
tree | 449c3e3bbaf3161b9cc3c2e34750442484563850 | |
parent | d6fdb52b9c9db0454fa49dbbb969ea4164de29c0 (diff) | |
download | trusted-firmware-a-4470298333d0e453d5ac2f9beb73b6a3787edcce.tar.gz |
allwinner: Return the PMIC to I2C mode after use
This gives the rich OS the flexibility to choose between I2C and RSB
communication. Since a runtime address can only be assigned once after
entering RSB mode, it also lets the rich OS choose any runtime address.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Change-Id: Id49c124c5e925985fc31c0ba38c7fb6c941aafa8
-rw-r--r-- | include/drivers/allwinner/axp.h | 4 | ||||
-rw-r--r-- | plat/allwinner/sun50i_a64/sunxi_power.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/drivers/allwinner/axp.h b/include/drivers/allwinner/axp.h index 9c0035f96b..222820b120 100644 --- a/include/drivers/allwinner/axp.h +++ b/include/drivers/allwinner/axp.h @@ -9,6 +9,10 @@ #include <stdint.h> +#define AXP20X_MODE_REG 0x3e +#define AXP20X_MODE_I2C 0x00 +#define AXP20X_MODE_RSB 0x7c + #define NA 0xff enum { diff --git a/plat/allwinner/sun50i_a64/sunxi_power.c b/plat/allwinner/sun50i_a64/sunxi_power.c index 8aa610cc3a..80a69c3404 100644 --- a/plat/allwinner/sun50i_a64/sunxi_power.c +++ b/plat/allwinner/sun50i_a64/sunxi_power.c @@ -97,11 +97,8 @@ static int rsb_init(void) if (ret) return ret; - /* - * Initiate an I2C transaction to write 0x7c into register 0x3e, - * switching the PMIC to RSB mode. - */ - ret = rsb_set_device_mode(0x7c3e00); + /* Initiate an I2C transaction to switch the PMIC to RSB mode. */ + ret = rsb_set_device_mode(AXP20X_MODE_RSB << 16 | AXP20X_MODE_REG << 8); if (ret) return ret; @@ -151,6 +148,11 @@ int sunxi_pmic_setup(uint16_t socid, const void *fdt) pmic = AXP803_RSB; axp_setup_regulators(fdt); + /* Switch the PMIC back to I2C mode. */ + ret = axp_write(AXP20X_MODE_REG, AXP20X_MODE_I2C); + if (ret) + return ret; + break; default: return -ENODEV; |