Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

power: rk808: rename to rk8xx

Browse source 
Since this driver can be used for rk8xx series pmic,
let's rename rk808 to rk8xx, to make it clear.

Configs parts are done by sed -i "s/RK808/RK8XX/g" `grep RK808 -lr ./`

Signed-off-by: Jacob Chen <jacob-chen@iotwrt.com>
This commit is contained in:
Jacob Chen 2017-05-02 14:54:52 +08:00 committed by Simon Glass
parent eff4ca7285
commit 453c5a927c
19 changed files with 97 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
View file

@ -24,7 +24,7 @@
#include <asm/arch/sdram.h> #include <asm/arch/sdram.h>
#include <linux/err.h> #include <linux/err.h>
#include <power/regulator.h> #include <power/regulator.h>
#include <power/rk808_pmic.h> #include <power/rk8xx_pmic.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -981,11 +981,11 @@ static int veyron_init(struct dram_info *priv)
return ret; return ret;
/* Slowly raise to max CPU voltage to prevent overshoot */ /* Slowly raise to max CPU voltage to prevent overshoot */
ret = rk808_spl_configure_buck(pmic, 1, 1200000); ret = rk8xx_spl_configure_buck(pmic, 1, 1200000);
if (ret) if (ret)
return ret; return ret;
udelay(175);/* Must wait for voltage to stabilize, 2mV/us */ udelay(175);/* Must wait for voltage to stabilize, 2mV/us */
ret = rk808_spl_configure_buck(pmic, 1, 1400000); ret = rk8xx_spl_configure_buck(pmic, 1, 1400000);
if (ret) if (ret)
return ret; return ret;
udelay(100);/* Must wait for voltage to stabilize, 2mV/us */ udelay(100);/* Must wait for voltage to stabilize, 2mV/us */

4
configs/chromebit_mickey_defconfig
View file

@ -54,10 +54,10 @@ CONFIG_SPL_PINCTRL=y
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_SPL_DM_REGULATOR=y CONFIG_SPL_DM_REGULATOR=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/chromebook_jerry_defconfig
View file

@ -55,9 +55,9 @@ CONFIG_SPL_PINCTRL=y
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/chromebook_minnie_defconfig
View file

@ -55,9 +55,9 @@ CONFIG_SPL_PINCTRL=y
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
# CONFIG_SPL_PMIC_CHILDREN is not set # CONFIG_SPL_PMIC_CHILDREN is not set
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/evb-rk3399_defconfig
View file

@ -42,10 +42,10 @@ CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
CONFIG_PINCTRL_ROCKCHIP_RK3399=y CONFIG_PINCTRL_ROCKCHIP_RK3399=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_PWM=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/fennec-rk3288_defconfig
View file

@ -49,9 +49,9 @@ CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/firefly-rk3399_defconfig
View file

@ -41,10 +41,10 @@ CONFIG_PINCTRL=y
CONFIG_SPL_PINCTRL=y CONFIG_SPL_PINCTRL=y
CONFIG_ROCKCHIP_RK3399_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_PWM=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/popmetal-rk3288_defconfig
View file

@ -49,9 +49,9 @@ CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

4
configs/sandbox_defconfig
View file

@ -127,7 +127,7 @@ CONFIG_PMIC_ACT8846=y
CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_PMIC_PFUZE100=y
CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_PMIC_MAX77686=y
CONFIG_PMIC_PM8916=y CONFIG_PMIC_PM8916=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_PMIC_S2MPS11=y CONFIG_PMIC_S2MPS11=y
CONFIG_DM_PMIC_SANDBOX=y CONFIG_DM_PMIC_SANDBOX=y
CONFIG_PMIC_S5M8767=y CONFIG_PMIC_S5M8767=y
@ -137,7 +137,7 @@ CONFIG_REGULATOR_ACT8846=y
CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_DM_REGULATOR_MAX77686=y CONFIG_DM_REGULATOR_MAX77686=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_S5M8767=y
CONFIG_DM_REGULATOR_SANDBOX=y CONFIG_DM_REGULATOR_SANDBOX=y
CONFIG_REGULATOR_TPS65090=y CONFIG_REGULATOR_TPS65090=y

4
configs/sandbox_noblk_defconfig
View file

@ -131,7 +131,7 @@ CONFIG_PMIC_ACT8846=y
CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_PMIC_PFUZE100=y
CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_PMIC_MAX77686=y
CONFIG_PMIC_PM8916=y CONFIG_PMIC_PM8916=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_PMIC_S2MPS11=y CONFIG_PMIC_S2MPS11=y
CONFIG_DM_PMIC_SANDBOX=y CONFIG_DM_PMIC_SANDBOX=y
CONFIG_PMIC_S5M8767=y CONFIG_PMIC_S5M8767=y
@ -141,7 +141,7 @@ CONFIG_REGULATOR_ACT8846=y
CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_DM_REGULATOR_MAX77686=y CONFIG_DM_REGULATOR_MAX77686=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_S5M8767=y
CONFIG_DM_REGULATOR_SANDBOX=y CONFIG_DM_REGULATOR_SANDBOX=y
CONFIG_REGULATOR_TPS65090=y CONFIG_REGULATOR_TPS65090=y

4
configs/sandbox_spl_defconfig
View file

@ -133,7 +133,7 @@ CONFIG_PMIC_ACT8846=y
CONFIG_DM_PMIC_PFUZE100=y CONFIG_DM_PMIC_PFUZE100=y
CONFIG_DM_PMIC_MAX77686=y CONFIG_DM_PMIC_MAX77686=y
CONFIG_PMIC_PM8916=y CONFIG_PMIC_PM8916=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_PMIC_S2MPS11=y CONFIG_PMIC_S2MPS11=y
CONFIG_DM_PMIC_SANDBOX=y CONFIG_DM_PMIC_SANDBOX=y
CONFIG_PMIC_S5M8767=y CONFIG_PMIC_S5M8767=y
@ -143,7 +143,7 @@ CONFIG_REGULATOR_ACT8846=y
CONFIG_DM_REGULATOR_PFUZE100=y CONFIG_DM_REGULATOR_PFUZE100=y
CONFIG_DM_REGULATOR_MAX77686=y CONFIG_DM_REGULATOR_MAX77686=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_REGULATOR_S5M8767=y CONFIG_REGULATOR_S5M8767=y
CONFIG_DM_REGULATOR_SANDBOX=y CONFIG_DM_REGULATOR_SANDBOX=y
CONFIG_REGULATOR_TPS65090=y CONFIG_REGULATOR_TPS65090=y

4
configs/tinker-rk3288_defconfig
View file

@ -52,9 +52,9 @@ CONFIG_SPL_PINCTRL=y
# CONFIG_SPL_PINCTRL_FULL is not set # CONFIG_SPL_PINCTRL_FULL is not set
CONFIG_PINCTRL_ROCKCHIP_RK3288=y CONFIG_PINCTRL_ROCKCHIP_RK3288=y
CONFIG_DM_PMIC=y CONFIG_DM_PMIC=y
CONFIG_PMIC_RK808=y CONFIG_PMIC_RK8XX=y
CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_FIXED=y
CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM=y CONFIG_RAM=y
CONFIG_SPL_RAM=y CONFIG_SPL_RAM=y

6
drivers/power/pmic/Kconfig
View file

@ -28,7 +28,7 @@ config SPL_PMIC_CHILDREN
This allows PMICs to support child devices (such as regulators) in This allows PMICs to support child devices (such as regulators) in
SPL. This adds quite a bit of code so if you are not using this SPL. This adds quite a bit of code so if you are not using this
feature you can turn it off. In this case you may need a 'back door' feature you can turn it off. In this case you may need a 'back door'
to call your regulator code (e.g. see rk808.c for direct functions to call your regulator code (e.g. see rk8xx.c for direct functions
for use in SPL). for use in SPL).
config PMIC_ACT8846 config PMIC_ACT8846
@ -100,8 +100,8 @@ config PMIC_PM8916
Driver binding info: doc/device-tree-bindings/pmic/pm8916.txt Driver binding info: doc/device-tree-bindings/pmic/pm8916.txt
config PMIC_RK808 config PMIC_RK8XX
bool "Enable support for Rockchip PMIC RK808" bool "Enable support for Rockchip PMIC RK8XX"
depends on DM_PMIC depends on DM_PMIC
---help--- ---help---
The Rockchip RK808 PMIC provides four buck DC-DC convertors, 8 LDOs, The Rockchip RK808 PMIC provides four buck DC-DC convertors, 8 LDOs,

2
drivers/power/pmic/Makefile
View file

@ -15,7 +15,7 @@ obj-$(CONFIG_PMIC_ACT8846) += act8846.o
obj-$(CONFIG_PMIC_AS3722) += as3722.o obj-$(CONFIG_PMIC_AS3722) += as3722.o
obj-$(CONFIG_PMIC_MAX8997) += max8997.o obj-$(CONFIG_PMIC_MAX8997) += max8997.o
obj-$(CONFIG_PMIC_PM8916) += pm8916.o obj-$(CONFIG_PMIC_PM8916) += pm8916.o
obj-$(CONFIG_PMIC_RK808) += rk808.o obj-$(CONFIG_PMIC_RK8XX) += rk8xx.o
obj-$(CONFIG_PMIC_RN5T567) += rn5t567.o obj-$(CONFIG_PMIC_RN5T567) += rn5t567.o
obj-$(CONFIG_PMIC_TPS65090) += tps65090.o obj-$(CONFIG_PMIC_TPS65090) += tps65090.o
obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o

46
drivers/power/pmic/rk808.c → drivers/power/pmic/rk8xx.c
View file

@ -10,24 +10,24 @@
#include <errno.h> #include <errno.h>
#include <fdtdec.h> #include <fdtdec.h>
#include <libfdt.h> #include <libfdt.h>
#include <power/rk808_pmic.h> #include <power/rk8xx_pmic.h>
#include <power/pmic.h> #include <power/pmic.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static const struct pmic_child_info pmic_children_info[] = { static const struct pmic_child_info pmic_children_info[] = {
{ .prefix = "DCDC_REG", .driver = "rk808_buck"}, { .prefix = "DCDC_REG", .driver = "rk8xx_buck"},
{ .prefix = "LDO_REG", .driver = "rk808_ldo"}, { .prefix = "LDO_REG", .driver = "rk8xx_ldo"},
{ .prefix = "SWITCH_REG", .driver = "rk808_switch"}, { .prefix = "SWITCH_REG", .driver = "rk8xx_switch"},
{ }, { },
}; };
static int rk808_reg_count(struct udevice *dev) static int rk8xx_reg_count(struct udevice *dev)
{ {
return RK808_NUM_OF_REGS; return RK808_NUM_OF_REGS;
} }
static int rk808_write(struct udevice *dev, uint reg, const uint8_t *buff, static int rk8xx_write(struct udevice *dev, uint reg, const uint8_t *buff,
int len) int len)
{ {
int ret; int ret;
@ -41,7 +41,7 @@ static int rk808_write(struct udevice *dev, uint reg, const uint8_t *buff,
return 0; return 0;
} }
static int rk808_read(struct udevice *dev, uint reg, uint8_t *buff, int len) static int rk8xx_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
{ {
int ret; int ret;
@ -55,7 +55,7 @@ static int rk808_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
} }
#if CONFIG_IS_ENABLED(PMIC_CHILDREN) #if CONFIG_IS_ENABLED(PMIC_CHILDREN)
static int rk808_bind(struct udevice *dev) static int rk8xx_bind(struct udevice *dev)
{ {
const void *blob = gd->fdt_blob; const void *blob = gd->fdt_blob;
int regulators_node; int regulators_node;
@ -80,39 +80,39 @@ static int rk808_bind(struct udevice *dev)
} }
#endif #endif
static int rk808_probe(struct udevice *dev) static int rk8xx_probe(struct udevice *dev)
{ {
struct rk808_priv *priv = dev_get_priv(dev); struct rk8xx_priv *priv = dev_get_priv(dev);
uint8_t msb, lsb; uint8_t msb, lsb;
/* read Chip variant */ /* read Chip variant */
rk808_read(dev, ID_MSB, &msb, 1); rk8xx_read(dev, ID_MSB, &msb, 1);
rk808_read(dev, ID_LSB, &lsb, 1); rk8xx_read(dev, ID_LSB, &lsb, 1);
priv->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK; priv->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;
return 0; return 0;
} }
static struct dm_pmic_ops rk808_ops = { static struct dm_pmic_ops rk8xx_ops = {
.reg_count = rk808_reg_count, .reg_count = rk8xx_reg_count,
.read = rk808_read, .read = rk8xx_read,
.write = rk808_write, .write = rk8xx_write,
}; };
static const struct udevice_id rk808_ids[] = { static const struct udevice_id rk8xx_ids[] = {
{ .compatible = "rockchip,rk808" }, { .compatible = "rockchip,rk808" },
{ .compatible = "rockchip,rk818" }, { .compatible = "rockchip,rk818" },
{ } { }
}; };
U_BOOT_DRIVER(pmic_rk808) = { U_BOOT_DRIVER(pmic_rk8xx) = {
.name = "rk808 pmic", .name = "rk8xx pmic",
.id = UCLASS_PMIC, .id = UCLASS_PMIC,
.of_match = rk808_ids, .of_match = rk8xx_ids,
#if CONFIG_IS_ENABLED(PMIC_CHILDREN) #if CONFIG_IS_ENABLED(PMIC_CHILDREN)
.bind = rk808_bind, .bind = rk8xx_bind,
#endif #endif
.probe = rk808_probe, .probe = rk8xx_probe,
.ops = &rk808_ops, .ops = &rk8xx_ops,
}; };

8
drivers/power/regulator/Kconfig
View file

@ -76,11 +76,11 @@ config DM_REGULATOR_GPIO
features for gpio regulators. The driver implements get/set for features for gpio regulators. The driver implements get/set for
voltage value. voltage value.
config REGULATOR_RK808 config REGULATOR_RK8XX
bool "Enable driver for RK808 regulators" bool "Enable driver for RK8XX regulators"
depends on DM_REGULATOR && PMIC_RK808 depends on DM_REGULATOR && PMIC_RK8XX
---help--- ---help---
Enable support for the regulator functions of the RK808 PMIC. The Enable support for the regulator functions of the RK8XX PMIC. The
driver implements get/set api for the various BUCKS and LDOs supported driver implements get/set api for the various BUCKS and LDOs supported
by the PMIC device. This driver is controlled by a device tree node by the PMIC device. This driver is controlled by a device tree node
which includes voltage limits. which includes voltage limits.

2
drivers/power/regulator/Makefile
View file

@ -12,7 +12,7 @@ obj-$(CONFIG_DM_REGULATOR_PFUZE100) += pfuze100.o
obj-$(CONFIG_REGULATOR_PWM) += pwm_regulator.o obj-$(CONFIG_REGULATOR_PWM) += pwm_regulator.o
obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o
obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o
obj-$(CONFIG_REGULATOR_RK808) += rk808.o obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o
obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o
obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o

70
drivers/power/regulator/rk808.c → drivers/power/regulator/rk8xx.c
View file

@ -12,7 +12,7 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
#include <power/rk808_pmic.h> #include <power/rk8xx_pmic.h>
#include <power/pmic.h> #include <power/pmic.h>
#include <power/regulator.h> #include <power/regulator.h>
@ -31,21 +31,21 @@
#define RK818_LDO3_ON_VSEL_MASK 0xf #define RK818_LDO3_ON_VSEL_MASK 0xf
#define RK818_BOOST_ON_VSEL_MASK 0xe0 #define RK818_BOOST_ON_VSEL_MASK 0xe0
struct rk808_reg_info { struct rk8xx_reg_info {
uint min_uv; uint min_uv;
uint step_uv; uint step_uv;
s8 vsel_reg; s8 vsel_reg;
u8 vsel_mask; u8 vsel_mask;
}; };
static const struct rk808_reg_info rk808_buck[] = { static const struct rk8xx_reg_info rk808_buck[] = {
{ 712500, 12500, REG_BUCK1_ON_VSEL, RK808_BUCK_VSEL_MASK, }, { 712500, 12500, REG_BUCK1_ON_VSEL, RK808_BUCK_VSEL_MASK, },
{ 712500, 12500, REG_BUCK2_ON_VSEL, RK808_BUCK_VSEL_MASK, }, { 712500, 12500, REG_BUCK2_ON_VSEL, RK808_BUCK_VSEL_MASK, },
{ 712500, 12500, -1, RK808_BUCK_VSEL_MASK, }, { 712500, 12500, -1, RK808_BUCK_VSEL_MASK, },
{ 1800000, 100000, REG_BUCK4_ON_VSEL, RK808_BUCK4_VSEL_MASK, }, { 1800000, 100000, REG_BUCK4_ON_VSEL, RK808_BUCK4_VSEL_MASK, },
}; };
static const struct rk808_reg_info rk808_ldo[] = { static const struct rk8xx_reg_info rk808_ldo[] = {
{ 1800000, 100000, REG_LDO1_ON_VSEL, RK808_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO1_ON_VSEL, RK808_LDO_VSEL_MASK, },
{ 1800000, 100000, REG_LDO2_ON_VSEL, RK808_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO2_ON_VSEL, RK808_LDO_VSEL_MASK, },
{ 800000, 100000, REG_LDO3_ON_VSEL, RK808_BUCK4_VSEL_MASK, }, { 800000, 100000, REG_LDO3_ON_VSEL, RK808_BUCK4_VSEL_MASK, },
@ -56,14 +56,14 @@ static const struct rk808_reg_info rk808_ldo[] = {
{ 1800000, 100000, REG_LDO8_ON_VSEL, RK808_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO8_ON_VSEL, RK808_LDO_VSEL_MASK, },
}; };
static const struct rk808_reg_info rk818_buck[] = { static const struct rk8xx_reg_info rk818_buck[] = {
{ 712500, 12500, REG_BUCK1_ON_VSEL, RK818_BUCK_VSEL_MASK, }, { 712500, 12500, REG_BUCK1_ON_VSEL, RK818_BUCK_VSEL_MASK, },
{ 712500, 12500, REG_BUCK2_ON_VSEL, RK818_BUCK_VSEL_MASK, }, { 712500, 12500, REG_BUCK2_ON_VSEL, RK818_BUCK_VSEL_MASK, },
{ 712500, 12500, -1, RK818_BUCK_VSEL_MASK, }, { 712500, 12500, -1, RK818_BUCK_VSEL_MASK, },
{ 1800000, 100000, REG_BUCK4_ON_VSEL, RK818_BUCK4_VSEL_MASK, }, { 1800000, 100000, REG_BUCK4_ON_VSEL, RK818_BUCK4_VSEL_MASK, },
}; };
static const struct rk808_reg_info rk818_ldo[] = { static const struct rk8xx_reg_info rk818_ldo[] = {
{ 1800000, 100000, REG_LDO1_ON_VSEL, RK818_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO1_ON_VSEL, RK818_LDO_VSEL_MASK, },
{ 1800000, 100000, REG_LDO2_ON_VSEL, RK818_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO2_ON_VSEL, RK818_LDO_VSEL_MASK, },
{ 800000, 100000, REG_LDO3_ON_VSEL, RK818_LDO3_ON_VSEL_MASK, }, { 800000, 100000, REG_LDO3_ON_VSEL, RK818_LDO3_ON_VSEL_MASK, },
@ -74,11 +74,11 @@ static const struct rk808_reg_info rk818_ldo[] = {
{ 1800000, 100000, REG_LDO8_ON_VSEL, RK818_LDO_VSEL_MASK, }, { 1800000, 100000, REG_LDO8_ON_VSEL, RK818_LDO_VSEL_MASK, },
}; };
static const struct rk808_reg_info *get_buck_reg(struct udevice *pmic, static const struct rk8xx_reg_info *get_buck_reg(struct udevice *pmic,
int num) int num)
{ {
struct rk808_priv *rk808 = dev_get_priv(pmic); struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (rk808->variant) { switch (priv->variant) {
case RK818_ID: case RK818_ID:
return &rk818_buck[num]; return &rk818_buck[num];
default: default:
@ -86,11 +86,11 @@ static const struct rk808_reg_info *get_buck_reg(struct udevice *pmic,
} }
} }
static const struct rk808_reg_info *get_ldo_reg(struct udevice *pmic, static const struct rk8xx_reg_info *get_ldo_reg(struct udevice *pmic,
int num) int num)
{ {
struct rk808_priv *rk808 = dev_get_priv(pmic); struct rk8xx_priv *priv = dev_get_priv(pmic);
switch (rk808->variant) { switch (priv->variant) {
case RK818_ID: case RK818_ID:
return &rk818_ldo[num - 1]; return &rk818_ldo[num - 1];
default: default:
@ -100,7 +100,7 @@ static const struct rk808_reg_info *get_ldo_reg(struct udevice *pmic,
static int _buck_set_value(struct udevice *pmic, int buck, int uvolt) static int _buck_set_value(struct udevice *pmic, int buck, int uvolt)
{ {
const struct rk808_reg_info *info = get_buck_reg(pmic, buck - 1); const struct rk8xx_reg_info *info = get_buck_reg(pmic, buck - 1);
int mask = info->vsel_mask; int mask = info->vsel_mask;
int val; int val;
@ -136,7 +136,7 @@ static int _buck_set_enable(struct udevice *pmic, int buck, bool enable)
static int buck_get_value(struct udevice *dev) static int buck_get_value(struct udevice *dev)
{ {
int buck = dev->driver_data - 1; int buck = dev->driver_data - 1;
const struct rk808_reg_info *info = get_buck_reg(dev->parent, buck); const struct rk8xx_reg_info *info = get_buck_reg(dev->parent, buck);
int mask = info->vsel_mask; int mask = info->vsel_mask;
int ret, val; int ret, val;
@ -182,7 +182,7 @@ static bool buck_get_enable(struct udevice *dev)
static int ldo_get_value(struct udevice *dev) static int ldo_get_value(struct udevice *dev)
{ {
int ldo = dev->driver_data - 1; int ldo = dev->driver_data - 1;
const struct rk808_reg_info *info = get_ldo_reg(dev->parent, ldo); const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo);
int mask = info->vsel_mask; int mask = info->vsel_mask;
int ret, val; int ret, val;
@ -199,7 +199,7 @@ static int ldo_get_value(struct udevice *dev)
static int ldo_set_value(struct udevice *dev, int uvolt) static int ldo_set_value(struct udevice *dev, int uvolt)
{ {
int ldo = dev->driver_data - 1; int ldo = dev->driver_data - 1;
const struct rk808_reg_info *info = get_ldo_reg(dev->parent, ldo); const struct rk8xx_reg_info *info = get_ldo_reg(dev->parent, ldo);
int mask = info->vsel_mask; int mask = info->vsel_mask;
int val; int val;
@ -264,7 +264,7 @@ static bool switch_get_enable(struct udevice *dev)
return ret & mask ? true : false; return ret & mask ? true : false;
} }
static int rk808_buck_probe(struct udevice *dev) static int rk8xx_buck_probe(struct udevice *dev)
{ {
struct dm_regulator_uclass_platdata *uc_pdata; struct dm_regulator_uclass_platdata *uc_pdata;
@ -276,7 +276,7 @@ static int rk808_buck_probe(struct udevice *dev)
return 0; return 0;
} }
static int rk808_ldo_probe(struct udevice *dev) static int rk8xx_ldo_probe(struct udevice *dev)
{ {
struct dm_regulator_uclass_platdata *uc_pdata; struct dm_regulator_uclass_platdata *uc_pdata;
@ -288,7 +288,7 @@ static int rk808_ldo_probe(struct udevice *dev)
return 0; return 0;
} }
static int rk808_switch_probe(struct udevice *dev) static int rk8xx_switch_probe(struct udevice *dev)
{ {
struct dm_regulator_uclass_platdata *uc_pdata; struct dm_regulator_uclass_platdata *uc_pdata;
@ -300,48 +300,48 @@ static int rk808_switch_probe(struct udevice *dev)
return 0; return 0;
} }
static const struct dm_regulator_ops rk808_buck_ops = { static const struct dm_regulator_ops rk8xx_buck_ops = {
.get_value = buck_get_value, .get_value = buck_get_value,
.set_value = buck_set_value, .set_value = buck_set_value,
.get_enable = buck_get_enable, .get_enable = buck_get_enable,
.set_enable = buck_set_enable, .set_enable = buck_set_enable,
}; };
static const struct dm_regulator_ops rk808_ldo_ops = { static const struct dm_regulator_ops rk8xx_ldo_ops = {
.get_value = ldo_get_value, .get_value = ldo_get_value,
.set_value = ldo_set_value, .set_value = ldo_set_value,
.get_enable = ldo_get_enable, .get_enable = ldo_get_enable,
.set_enable = ldo_set_enable, .set_enable = ldo_set_enable,
}; };
static const struct dm_regulator_ops rk808_switch_ops = { static const struct dm_regulator_ops rk8xx_switch_ops = {
.get_enable = switch_get_enable, .get_enable = switch_get_enable,
.set_enable = switch_set_enable, .set_enable = switch_set_enable,
}; };
U_BOOT_DRIVER(rk808_buck) = { U_BOOT_DRIVER(rk8xx_buck) = {
.name = "rk808_buck", .name = "rk8xx_buck",
.id = UCLASS_REGULATOR, .id = UCLASS_REGULATOR,
.ops = &rk808_buck_ops, .ops = &rk8xx_buck_ops,
.probe = rk808_buck_probe, .probe = rk8xx_buck_probe,
}; };
U_BOOT_DRIVER(rk808_ldo) = { U_BOOT_DRIVER(rk8xx_ldo) = {
.name = "rk808_ldo", .name = "rk8xx_ldo",
.id = UCLASS_REGULATOR, .id = UCLASS_REGULATOR,
.ops = &rk808_ldo_ops, .ops = &rk8xx_ldo_ops,
.probe = rk808_ldo_probe, .probe = rk8xx_ldo_probe,
}; };
U_BOOT_DRIVER(rk808_switch) = { U_BOOT_DRIVER(rk8xx_switch) = {
.name = "rk808_switch", .name = "rk8xx_switch",
.id = UCLASS_REGULATOR, .id = UCLASS_REGULATOR,
.ops = &rk808_switch_ops, .ops = &rk8xx_switch_ops,
.probe = rk808_switch_probe, .probe = rk8xx_switch_probe,
}; };
#endif #endif
int rk808_spl_configure_buck(struct udevice *pmic, int buck, int uvolt) int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt)
{ {
int ret; int ret;

10
include/power/rk808_pmic.h → include/power/rk8xx_pmic.h
View file

@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#ifndef _PMIC_RK808_H_ #ifndef _PMIC_RK8XX_H_
#define _PMIC_RK808_H_ #define _PMIC_RK8XX_H_
enum { enum {
REG_SECONDS = 0x00, REG_SECONDS = 0x00,
@ -178,16 +178,16 @@ enum {
#define RK8XX_ID_MSK 0xfff0 #define RK8XX_ID_MSK 0xfff0
struct rk808_reg_table { struct rk8xx_reg_table {
char *name; char *name;
u8 reg_ctl; u8 reg_ctl;
u8 reg_vol; u8 reg_vol;
}; };
struct rk808_priv { struct rk8xx_priv {
int variant; int variant;
}; };
int rk808_spl_configure_buck(struct udevice *pmic, int buck, int uvolt); int rk8xx_spl_configure_buck(struct udevice *pmic, int buck, int uvolt);
#endif #endif