diff options
Diffstat (limited to 'target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch')
-rw-r--r-- | target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch b/target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch new file mode 100644 index 0000000000..f371266c78 --- /dev/null +++ b/target/linux/at91/patches-5.15/124-regulator-mcp16502-adapt-for-get-set-on-other-regist.patch @@ -0,0 +1,117 @@ +From 5295f4c122258a11fb6012b7e043248e681db5a2 Mon Sep 17 00:00:00 2001 +From: Claudiu Beznea <claudiu.beznea@microchip.com> +Date: Fri, 13 Nov 2020 17:21:08 +0200 +Subject: [PATCH 124/247] regulator: mcp16502: adapt for get/set on other + registers + +MCP16502 have multiple registers for each regulator (as described +in enum mcp16502_reg). Adapt the code to be able to get/set all these +registers. This is necessary for the following commits. + +Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> +Link: https://lore.kernel.org/r/1605280870-32432-5-git-send-email-claudiu.beznea@microchip.com +Signed-off-by: Mark Brown <broonie@kernel.org> +--- + drivers/regulator/mcp16502.c | 43 ++++++++++++++++++++++-------------- + 1 file changed, 27 insertions(+), 16 deletions(-) + +--- a/drivers/regulator/mcp16502.c ++++ b/drivers/regulator/mcp16502.c +@@ -54,13 +54,9 @@ + * This function is useful for iterating over all regulators and accessing their + * registers in a generic way or accessing a regulator device by its id. + */ +-#define MCP16502_BASE(i) (((i) + 1) << 4) ++#define MCP16502_REG_BASE(i, r) ((((i) + 1) << 4) + MCP16502_REG_##r) + #define MCP16502_STAT_BASE(i) ((i) + 5) + +-#define MCP16502_OFFSET_MODE_A 0 +-#define MCP16502_OFFSET_MODE_LPM 1 +-#define MCP16502_OFFSET_MODE_HIB 2 +- + #define MCP16502_OPMODE_ACTIVE REGULATOR_MODE_NORMAL + #define MCP16502_OPMODE_LPM REGULATOR_MODE_IDLE + #define MCP16502_OPMODE_HIB REGULATOR_MODE_STANDBY +@@ -75,6 +71,23 @@ + #define MCP16502_MIN_REG 0x0 + #define MCP16502_MAX_REG 0x65 + ++/** ++ * enum mcp16502_reg - MCP16502 regulators's registers ++ * @MCP16502_REG_A: active state register ++ * @MCP16502_REG_LPM: low power mode state register ++ * @MCP16502_REG_HIB: hibernate state register ++ * @MCP16502_REG_SEQ: startup sequence register ++ * @MCP16502_REG_CFG: configuration register ++ */ ++enum mcp16502_reg { ++ MCP16502_REG_A, ++ MCP16502_REG_LPM, ++ MCP16502_REG_HIB, ++ MCP16502_REG_HPM, ++ MCP16502_REG_SEQ, ++ MCP16502_REG_CFG, ++}; ++ + static unsigned int mcp16502_of_map_mode(unsigned int mode) + { + if (mode == REGULATOR_MODE_NORMAL || mode == REGULATOR_MODE_IDLE) +@@ -144,22 +157,20 @@ static void mcp16502_gpio_set_mode(struc + } + + /* +- * mcp16502_get_reg() - get the PMIC's configuration register for opmode ++ * mcp16502_get_reg() - get the PMIC's state configuration register for opmode + * + * @rdev: the regulator whose register we are searching + * @opmode: the PMIC's operating mode ACTIVE, Low-power, Hibernate + */ +-static int mcp16502_get_reg(struct regulator_dev *rdev, int opmode) ++static int mcp16502_get_state_reg(struct regulator_dev *rdev, int opmode) + { +- int reg = MCP16502_BASE(rdev_get_id(rdev)); +- + switch (opmode) { + case MCP16502_OPMODE_ACTIVE: +- return reg + MCP16502_OFFSET_MODE_A; ++ return MCP16502_REG_BASE(rdev_get_id(rdev), A); + case MCP16502_OPMODE_LPM: +- return reg + MCP16502_OFFSET_MODE_LPM; ++ return MCP16502_REG_BASE(rdev_get_id(rdev), LPM); + case MCP16502_OPMODE_HIB: +- return reg + MCP16502_OFFSET_MODE_HIB; ++ return MCP16502_REG_BASE(rdev_get_id(rdev), HIB); + default: + return -EINVAL; + } +@@ -179,7 +190,7 @@ static unsigned int mcp16502_get_mode(st + unsigned int val; + int ret, reg; + +- reg = mcp16502_get_reg(rdev, MCP16502_OPMODE_ACTIVE); ++ reg = mcp16502_get_state_reg(rdev, MCP16502_OPMODE_ACTIVE); + if (reg < 0) + return reg; + +@@ -210,7 +221,7 @@ static int _mcp16502_set_mode(struct reg + int val; + int reg; + +- reg = mcp16502_get_reg(rdev, op_mode); ++ reg = mcp16502_get_state_reg(rdev, op_mode); + if (reg < 0) + return reg; + +@@ -269,10 +280,10 @@ static int mcp16502_suspend_get_target_r + { + switch (pm_suspend_target_state) { + case PM_SUSPEND_STANDBY: +- return mcp16502_get_reg(rdev, MCP16502_OPMODE_LPM); ++ return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_LPM); + case PM_SUSPEND_ON: + case PM_SUSPEND_MEM: +- return mcp16502_get_reg(rdev, MCP16502_OPMODE_HIB); ++ return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_HIB); + default: + dev_err(&rdev->dev, "invalid suspend target: %d\n", + pm_suspend_target_state); |