power: rk808: rename to rk8xx

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>

diff --git a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
index 8549b28243a9952c20afecc2d61852e3745d1772..2feda612054b9cc4582f5bce41c098e5f2e3738f 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/sdram_rk3288.c
@@ -24,7 +24,7 @@
 #include <asm/arch/sdram.h>
 #include <linux/err.h>
 #include <power/regulator.h>
-#include <power/rk808_pmic.h>
+#include <power/rk8xx_pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -981,11 +981,11 @@ static int veyron_init(struct dram_info *priv)
                return ret;
 
        /* 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)
                return ret;
        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)
                return ret;
        udelay(100);/* Must wait for voltage to stabilize, 2mV/us */

diff --git a/configs/chromebit_mickey_defconfig b/configs/chromebit_mickey_defconfig
index 09a24776e8d533f511a232225bfc2a7e6de74c95..649ebf7568bcb3801ee6d660d8e4854abe9d290a 100644 (file)
--- a/configs/chromebit_mickey_defconfig
+++ b/configs/chromebit_mickey_defconfig
@@ -54,10 +54,10 @@ CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_SPL_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig
index e254f408de500c7d0370cfdcd7a54a425887963c..6fc0dcc023f2c389c886f9b364fdfa648ca00bc5 100644 (file)
--- a/configs/chromebook_jerry_defconfig
+++ b/configs/chromebook_jerry_defconfig
@@ -55,9 +55,9 @@ CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/chromebook_minnie_defconfig b/configs/chromebook_minnie_defconfig
index 22e56b6d8573db12ac92d374c546320a26f99df2..ef333c001136ff7dae65da0e10b5e39153bd5e7a 100644 (file)
--- a/configs/chromebook_minnie_defconfig
+++ b/configs/chromebook_minnie_defconfig
@@ -55,9 +55,9 @@ CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
 # CONFIG_SPL_PMIC_CHILDREN is not set
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
index 76401260311fb7b1ff2f3114d87786d953c2e3ea..fff816926a352d9ba19acc7fd992d40e0abdae9b 100644 (file)
--- a/configs/evb-rk3399_defconfig
+++ b/configs/evb-rk3399_defconfig
@@ -42,10 +42,10 @@ CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_PINCTRL_ROCKCHIP_RK3399=y
 CONFIG_DM_PMIC=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/fennec-rk3288_defconfig b/configs/fennec-rk3288_defconfig
index befba1882f6827ab057050ffd20cfccf3499fe1f..6a32a3a727bad07a6f26ae83a1f271e6e5e9f7b0 100644 (file)
--- a/configs/fennec-rk3288_defconfig
+++ b/configs/fennec-rk3288_defconfig
@@ -49,9 +49,9 @@ CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
index fcd33aea08b89ea13233cef82d5ed9cdcd5d8021..f30f131f34cf0c3faeaf6f40bf3e46d51238db39 100644 (file)
--- a/configs/firefly-rk3399_defconfig
+++ b/configs/firefly-rk3399_defconfig
@@ -41,10 +41,10 @@ CONFIG_PINCTRL=y
 CONFIG_SPL_PINCTRL=y
 CONFIG_ROCKCHIP_RK3399_PINCTRL=y
 CONFIG_DM_PMIC=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
index 748cda4f9c7ae1b1014f2cb0f5deec9bff42ac16..c9ad0c022d388e38984f0e9264f4f53c2ef0442f 100644 (file)
--- a/configs/popmetal-rk3288_defconfig
+++ b/configs/popmetal-rk3288_defconfig
@@ -49,9 +49,9 @@ CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 95630fc764a93055b21c4cd80363d217a5a40ecd..541705766487ccf6a2038957251bf04aca3716bb 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -127,7 +127,7 @@ CONFIG_PMIC_ACT8846=y
 CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_PM8916=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_PMIC_SANDBOX=y
 CONFIG_PMIC_S5M8767=y
@@ -137,7 +137,7 @@ CONFIG_REGULATOR_ACT8846=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_DM_REGULATOR_SANDBOX=y
 CONFIG_REGULATOR_TPS65090=y

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 26183afdd28c7af3f986df224c3a89f078a5e4ca..b30e16508f4444257bff5814ee999fea20d290c6 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -131,7 +131,7 @@ CONFIG_PMIC_ACT8846=y
 CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_PM8916=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_PMIC_SANDBOX=y
 CONFIG_PMIC_S5M8767=y
@@ -141,7 +141,7 @@ CONFIG_REGULATOR_ACT8846=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_DM_REGULATOR_SANDBOX=y
 CONFIG_REGULATOR_TPS65090=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index 9324353016c3bc24ec05e49e838e035a23bc2b33..3061e5a9d9ae39c5be7678e4f3d79b8ae5d4eafb 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -133,7 +133,7 @@ CONFIG_PMIC_ACT8846=y
 CONFIG_DM_PMIC_PFUZE100=y
 CONFIG_DM_PMIC_MAX77686=y
 CONFIG_PMIC_PM8916=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_PMIC_SANDBOX=y
 CONFIG_PMIC_S5M8767=y
@@ -143,7 +143,7 @@ CONFIG_REGULATOR_ACT8846=y
 CONFIG_DM_REGULATOR_PFUZE100=y
 CONFIG_DM_REGULATOR_MAX77686=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_REGULATOR_S5M8767=y
 CONFIG_DM_REGULATOR_SANDBOX=y
 CONFIG_REGULATOR_TPS65090=y

diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 28a1fd8321ebf379bdc3cdf0efa86b0b4165b4ca..bac801e755d0a98b20191562dc04b34ad2d2c3e0 100644 (file)
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -52,9 +52,9 @@ CONFIG_SPL_PINCTRL=y
 # CONFIG_SPL_PINCTRL_FULL is not set
 CONFIG_PINCTRL_ROCKCHIP_RK3288=y
 CONFIG_DM_PMIC=y
-CONFIG_PMIC_RK808=y
+CONFIG_PMIC_RK8XX=y
 CONFIG_DM_REGULATOR_FIXED=y
-CONFIG_REGULATOR_RK808=y
+CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM=y
 CONFIG_SPL_RAM=y

diff --git a/drivers/power/pmic/Kconfig b/drivers/power/pmic/Kconfig
index 4891b1704e8ba45eda39981d377746e6d821fa59..3f50c121571d5077b80bf07cc382128df84744c5 100644 (file)
--- a/drivers/power/pmic/Kconfig
+++ b/drivers/power/pmic/Kconfig
@@ -28,7 +28,7 @@ config SPL_PMIC_CHILDREN
        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
        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).
 
 config PMIC_ACT8846
@@ -100,8 +100,8 @@ config PMIC_PM8916
 
        Driver binding info: doc/device-tree-bindings/pmic/pm8916.txt
 
-config PMIC_RK808
-       bool "Enable support for Rockchip PMIC RK808"
+config PMIC_RK8XX
+       bool "Enable support for Rockchip PMIC RK8XX"
        depends on DM_PMIC
        ---help---
        The Rockchip RK808 PMIC provides four buck DC-DC convertors, 8 LDOs,

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 5f1bef33cddc38142349a7a61a5677517b049f60..f409e3a0b36c3c368d01db316ca4b2b1a1e3b811 100644 (file)
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_PMIC_ACT8846) += act8846.o
 obj-$(CONFIG_PMIC_AS3722) += as3722.o
 obj-$(CONFIG_PMIC_MAX8997) += max8997.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_TPS65090) += tps65090.o
 obj-$(CONFIG_PMIC_S5M8767) += s5m8767.o

diff --git a/drivers/power/pmic/rk808.c b/drivers/power/pmic/rk8xx.c
similarity index 65%
rename from drivers/power/pmic/rk808.c
rename to drivers/power/pmic/rk8xx.c
index 582e456d7fdcf21d3afde96643b3c0799daa6efe..394e2ff9db38abd716d752e022a1b918e00b7781 100644 (file)
--- a/drivers/power/pmic/rk808.c
+++ b/drivers/power/pmic/rk8xx.c
@@ -10,24 +10,24 @@
 #include <errno.h>
 #include <fdtdec.h>
 #include <libfdt.h>
-#include <power/rk808_pmic.h>
+#include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 static const struct pmic_child_info pmic_children_info[] = {
-       { .prefix = "DCDC_REG", .driver = "rk808_buck"},
-       { .prefix = "LDO_REG", .driver = "rk808_ldo"},
-       { .prefix = "SWITCH_REG", .driver = "rk808_switch"},
+       { .prefix = "DCDC_REG", .driver = "rk8xx_buck"},
+       { .prefix = "LDO_REG", .driver = "rk8xx_ldo"},
+       { .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;
 }
 
-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 ret;
@@ -41,7 +41,7 @@ static int rk808_write(struct udevice *dev, uint reg, const uint8_t *buff,
        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;
 
@@ -55,7 +55,7 @@ static int rk808_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
 }
 
 #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;
        int regulators_node;
@@ -80,39 +80,39 @@ static int rk808_bind(struct udevice *dev)
 }
 #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;
 
        /* read Chip variant */
-       rk808_read(dev, ID_MSB, &msb, 1);
-       rk808_read(dev, ID_LSB, &lsb, 1);
+       rk8xx_read(dev, ID_MSB, &msb, 1);
+       rk8xx_read(dev, ID_LSB, &lsb, 1);
 
        priv->variant = ((msb << 8) | lsb) & RK8XX_ID_MSK;
 
        return 0;
 }
 
-static struct dm_pmic_ops rk808_ops = {
-       .reg_count = rk808_reg_count,
-       .read = rk808_read,
-       .write = rk808_write,
+static struct dm_pmic_ops rk8xx_ops = {
+       .reg_count = rk8xx_reg_count,
+       .read = rk8xx_read,
+       .write = rk8xx_write,
 };
 
-static const struct udevice_id rk808_ids[] = {
+static const struct udevice_id rk8xx_ids[] = {
        { .compatible = "rockchip,rk808" },
        { .compatible = "rockchip,rk818" },
        { }
 };
 
-U_BOOT_DRIVER(pmic_rk808) = {
-       .name = "rk808 pmic",
+U_BOOT_DRIVER(pmic_rk8xx) = {
+       .name = "rk8xx pmic",
        .id = UCLASS_PMIC,
-       .of_match = rk808_ids,
+       .of_match = rk8xx_ids,
 #if CONFIG_IS_ENABLED(PMIC_CHILDREN)
-       .bind = rk808_bind,
+       .bind = rk8xx_bind,
 #endif
-       .probe = rk808_probe,
-       .ops = &rk808_ops,
+       .probe = rk8xx_probe,
+       .ops = &rk8xx_ops,
 };

diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig
index f870e8bcc9feae67aa0a0114d32478570da2de64..ef057e0e2fb318b619e55083c34a02d918596aef 100644 (file)
--- a/drivers/power/regulator/Kconfig
+++ b/drivers/power/regulator/Kconfig
@@ -76,11 +76,11 @@ config DM_REGULATOR_GPIO
        features for gpio regulators. The driver implements get/set for
        voltage value.
 
-config REGULATOR_RK808
-       bool "Enable driver for RK808 regulators"
-       depends on DM_REGULATOR && PMIC_RK808
+config REGULATOR_RK8XX
+       bool "Enable driver for RK8XX regulators"
+       depends on DM_REGULATOR && PMIC_RK8XX
        ---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
        by the PMIC device. This driver is controlled by a device tree node
        which includes voltage limits.

diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile
index 6002c88a6c17d80826fc5ce03ff26d69b4626cdf..3e01021b76abc274df623d73e1e1f72f1f4f2733 100644 (file)
--- a/drivers/power/regulator/Makefile
+++ b/drivers/power/regulator/Makefile
@@ -12,7 +12,7 @@ obj-$(CONFIG_DM_REGULATOR_PFUZE100) += pfuze100.o
 obj-$(CONFIG_REGULATOR_PWM) += pwm_regulator.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.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_DM_REGULATOR_SANDBOX) += sandbox.o
 obj-$(CONFIG_REGULATOR_TPS65090) += tps65090_regulator.o

diff --git a/drivers/power/regulator/rk808.c b/drivers/power/regulator/rk8xx.c
similarity index 82%
rename from drivers/power/regulator/rk808.c
rename to drivers/power/regulator/rk8xx.c
index 1ffe9dc3e4418c0522a6d8943950ee9257f25aec..e655c2d91f5e18eb7858b84842c030be2119d1fc 100644 (file)
--- a/drivers/power/regulator/rk808.c
+++ b/drivers/power/regulator/rk8xx.c
@@ -12,7 +12,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
-#include <power/rk808_pmic.h>
+#include <power/rk8xx_pmic.h>
 #include <power/pmic.h>
 #include <power/regulator.h>
 
@@ -31,21 +31,21 @@
 #define RK818_LDO3_ON_VSEL_MASK        0xf
 #define RK818_BOOST_ON_VSEL_MASK       0xe0
 
-struct rk808_reg_info {
+struct rk8xx_reg_info {
        uint min_uv;
        uint step_uv;
        s8 vsel_reg;
        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_BUCK2_ON_VSEL, RK808_BUCK_VSEL_MASK, },
        { 712500, 12500, -1, RK808_BUCK_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_LDO2_ON_VSEL, RK808_LDO_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, },
 };
 
-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_BUCK2_ON_VSEL, RK818_BUCK_VSEL_MASK, },
        { 712500, 12500, -1, RK818_BUCK_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_LDO2_ON_VSEL, RK818_LDO_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, },
 };
 
-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)
 {
-       struct rk808_priv *rk808 = dev_get_priv(pmic);
-       switch (rk808->variant) {
+       struct rk8xx_priv *priv = dev_get_priv(pmic);
+       switch (priv->variant) {
        case RK818_ID:
                return &rk818_buck[num];
        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)
 {
-       struct rk808_priv *rk808 = dev_get_priv(pmic);
-       switch (rk808->variant) {
+       struct rk8xx_priv *priv = dev_get_priv(pmic);
+       switch (priv->variant) {
        case RK818_ID:
                return &rk818_ldo[num - 1];
        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)
 {
-       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 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)
 {
        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 ret, val;
 
@@ -182,7 +182,7 @@ static bool buck_get_enable(struct udevice *dev)
 static int ldo_get_value(struct udevice *dev)
 {
        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 ret, val;
 
@@ -199,7 +199,7 @@ static int ldo_get_value(struct udevice *dev)
 static int ldo_set_value(struct udevice *dev, int uvolt)
 {
        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 val;
 
@@ -264,7 +264,7 @@ static bool switch_get_enable(struct udevice *dev)
        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;
 
@@ -276,7 +276,7 @@ static int rk808_buck_probe(struct udevice *dev)
        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;
 
@@ -288,7 +288,7 @@ static int rk808_ldo_probe(struct udevice *dev)
        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;
 
@@ -300,48 +300,48 @@ static int rk808_switch_probe(struct udevice *dev)
        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,
        .set_value  = buck_set_value,
        .get_enable = buck_get_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,
        .set_value  = ldo_set_value,
        .get_enable = ldo_get_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,
        .set_enable = switch_set_enable,
 };
 
-U_BOOT_DRIVER(rk808_buck) = {
-       .name = "rk808_buck",
+U_BOOT_DRIVER(rk8xx_buck) = {
+       .name = "rk8xx_buck",
        .id = UCLASS_REGULATOR,
-       .ops = &rk808_buck_ops,
-       .probe = rk808_buck_probe,
+       .ops = &rk8xx_buck_ops,
+       .probe = rk8xx_buck_probe,
 };
 
-U_BOOT_DRIVER(rk808_ldo) = {
-       .name = "rk808_ldo",
+U_BOOT_DRIVER(rk8xx_ldo) = {
+       .name = "rk8xx_ldo",
        .id = UCLASS_REGULATOR,
-       .ops = &rk808_ldo_ops,
-       .probe = rk808_ldo_probe,
+       .ops = &rk8xx_ldo_ops,
+       .probe = rk8xx_ldo_probe,
 };
 
-U_BOOT_DRIVER(rk808_switch) = {
-       .name = "rk808_switch",
+U_BOOT_DRIVER(rk8xx_switch) = {
+       .name = "rk8xx_switch",
        .id = UCLASS_REGULATOR,
-       .ops = &rk808_switch_ops,
-       .probe = rk808_switch_probe,
+       .ops = &rk8xx_switch_ops,
+       .probe = rk8xx_switch_probe,
 };
 #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;
 

diff --git a/include/power/rk808_pmic.h b/include/power/rk8xx_pmic.h
similarity index 95%
rename from include/power/rk808_pmic.h
rename to include/power/rk8xx_pmic.h
index c370c322206709a63728eaf54bd31c1c40bb080f..589f8c4e1a93e00be36695dc5b6a136535d87298 100644 (file)
--- a/include/power/rk808_pmic.h
+++ b/include/power/rk8xx_pmic.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#ifndef _PMIC_RK808_H_
-#define _PMIC_RK808_H_
+#ifndef _PMIC_RK8XX_H_
+#define _PMIC_RK8XX_H_
 
 enum {
        REG_SECONDS                     = 0x00,
@@ -178,16 +178,16 @@ enum {
 
 #define RK8XX_ID_MSK   0xfff0
 
-struct rk808_reg_table {
+struct rk8xx_reg_table {
        char *name;
        u8 reg_ctl;
        u8 reg_vol;
 };
 
-struct rk808_priv {
+struct rk8xx_priv {
        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