Signed-off-by: Elaine Zhang zhangqing@rock-chips.com --- drivers/power/pmic/rk8xx.c | 1 + drivers/power/regulator/rk8xx.c | 17 +++++++++++++++++ include/power/rk8xx_pmic.h | 1 + 3 files changed, 19 insertions(+)
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c index 1900de9d1cdb..00c8a2e091d8 100644 --- a/drivers/power/pmic/rk8xx.c +++ b/drivers/power/pmic/rk8xx.c @@ -94,6 +94,7 @@ static struct dm_pmic_ops rk8xx_ops = { };
static const struct udevice_id rk8xx_ids[] = { + { .compatible = "rockchip,rk805" }, { .compatible = "rockchip,rk808" }, { .compatible = "rockchip,rk816" }, { .compatible = "rockchip,rk818" }, diff --git a/drivers/power/regulator/rk8xx.c b/drivers/power/regulator/rk8xx.c index a62af0b467ef..2416477f5c06 100644 --- a/drivers/power/regulator/rk8xx.c +++ b/drivers/power/regulator/rk8xx.c @@ -39,7 +39,14 @@ /* * Ramp delay */ +#define RK805_RAMP_RATE_OFFSET 3 +#define RK805_RAMP_RATE_MASK (3 << RK805_RAMP_RATE_OFFSET) +#define RK805_RAMP_RATE_3MV_PER_US (0 << RK805_RAMP_RATE_OFFSET) +#define RK805_RAMP_RATE_6MV_PER_US (1 << RK805_RAMP_RATE_OFFSET) +#define RK805_RAMP_RATE_12_5MV_PER_US (2 << RK805_RAMP_RATE_OFFSET) +#define RK805_RAMP_RATE_25MV_PER_US (3 << RK805_RAMP_RATE_OFFSET) #define RK808_RAMP_RATE_OFFSET 3 + #define RK808_RAMP_RATE_MASK (3 << RK808_RAMP_RATE_OFFSET) #define RK808_RAMP_RATE_2MV_PER_US (0 << RK808_RAMP_RATE_OFFSET) #define RK808_RAMP_RATE_4MV_PER_US (1 << RK808_RAMP_RATE_OFFSET) @@ -132,6 +139,7 @@ static const struct rk8xx_reg_info *get_buck_reg(struct udevice *pmic, struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (priv->variant) { + case RK805_ID: case RK816_ID: switch (num) { case 0: @@ -186,6 +194,7 @@ static int _buck_set_enable(struct udevice *pmic, int buck, bool enable) struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (priv->variant) { + case RK805_ID: case RK816_ID: if (buck >= 4) { buck -= 4; @@ -247,6 +256,7 @@ static int _buck_get_enable(struct udevice *pmic, int buck) int ret = 0;
switch (priv->variant) { + case RK805_ID: case RK816_ID: if (buck >= 4) { mask = 1 << (buck - 4); @@ -278,6 +288,7 @@ static int _buck_set_suspend_enable(struct udevice *pmic, int buck, bool enable) struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (priv->variant) { + case RK805_ID: case RK816_ID: mask = 1 << buck; ret = pmic_clrsetbits(pmic, RK816_REG_DCDC_SLP_EN, mask, @@ -303,6 +314,7 @@ static int _buck_get_suspend_enable(struct udevice *pmic, int buck) uint mask;
switch (priv->variant) { + case RK805_ID: case RK816_ID: mask = 1 << buck; val = pmic_reg_read(pmic, RK816_REG_DCDC_SLP_EN); @@ -331,6 +343,7 @@ static const struct rk8xx_reg_info *get_ldo_reg(struct udevice *pmic, struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (priv->variant) { + case RK805_ID: case RK816_ID: return &rk816_ldo[num]; case RK818_ID: @@ -347,6 +360,7 @@ static int _ldo_get_enable(struct udevice *pmic, int ldo) int ret = 0;
switch (priv->variant) { + case RK805_ID: case RK816_ID: if (ldo >= 4) { mask = 1 << (ldo - 4); @@ -379,6 +393,7 @@ static int _ldo_set_enable(struct udevice *pmic, int ldo, bool enable) int ret = 0;
switch (priv->variant) { + case RK805_ID: case RK816_ID: if (ldo >= 4) { ldo -= 4; @@ -411,6 +426,7 @@ static int _ldo_set_suspend_enable(struct udevice *pmic, int ldo, bool enable) int ret = 0;
switch (priv->variant) { + case RK805_ID: case RK816_ID: mask = 1 << ldo; ret = pmic_clrsetbits(pmic, RK816_REG_LDO_SLP_EN, mask, @@ -434,6 +450,7 @@ static int _ldo_get_suspend_enable(struct udevice *pmic, int ldo) uint mask;
switch (priv->variant) { + case RK805_ID: case RK816_ID: mask = 1 << ldo; val = pmic_reg_read(pmic, RK816_REG_LDO_SLP_EN); diff --git a/include/power/rk8xx_pmic.h b/include/power/rk8xx_pmic.h index 44e8d687dfba..7784c2a5e473 100644 --- a/include/power/rk8xx_pmic.h +++ b/include/power/rk8xx_pmic.h @@ -179,6 +179,7 @@ enum { };
enum { + RK805_ID = 0x8050, RK808_ID = 0x0000, RK816_ID = 0x8160, RK818_ID = 0x8180,