rk2928:support pmic act8931
author张晴 <zhangqing@rock-chips.com>
Wed, 5 Sep 2012 07:11:18 +0000 (15:11 +0800)
committer张晴 <zhangqing@rock-chips.com>
Wed, 5 Sep 2012 07:11:18 +0000 (15:11 +0800)
arch/arm/mach-rk2928/board-rk2928-a720.c
arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c [new file with mode: 0755]
drivers/regulator/Kconfig
drivers/regulator/Makefile
drivers/regulator/act8931.c [new file with mode: 0755]
include/linux/regulator/act8931.h [new file with mode: 0755]

index 4ab211558542d0539dc72304d0b860e442a76171..4399b569b8484776b431ebcb49ae0ec760cd24b1 100755 (executable)
@@ -512,6 +512,10 @@ static struct platform_device *devices[] __initdata = {
 #define TPS65910_HOST_IRQ        RK2928_PIN1_PB2
 #include "board-rk2928-a720-tps65910.c"
 #endif
+#ifdef CONFIG_REGULATOR_ACT8931
+#include "board-rk2928-sdk-act8931.c"
+#endif
+
 static struct i2c_board_info __initdata i2c0_info[] = {
 #if defined (CONFIG_MFD_TPS65910)
        {
@@ -522,6 +526,15 @@ static struct i2c_board_info __initdata i2c0_info[] = {
        .platform_data = &tps65910_data,
        },
 #endif
+#if defined (CONFIG_REGULATOR_ACT8931)
+       {
+               .type                   = "act8931",
+               .addr           = 0x5b, 
+               .flags                  = 0,
+               .platform_data=&act8931_data,
+       },
+#endif
+
 };
 #endif
 #ifdef CONFIG_I2C1_RK30
diff --git a/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c b/arch/arm/mach-rk2928/board-rk2928-sdk-act8931.c
new file mode 100755 (executable)
index 0000000..9eec5f9
--- /dev/null
@@ -0,0 +1,297 @@
+#include <linux/regulator/machine.h>
+#include <linux/regulator/act8931.h>
+#include <mach/sram.h>
+#include <linux/platform_device.h>
+
+#include <mach/gpio.h>
+#include <mach/iomux.h>
+
+#define gpio_readl(offset)     readl_relaxed(RK2928_GPIO3_BASE + offset)
+#define gpio_writel(v, offset) do { writel_relaxed(v, RK2928_GPIO3_BASE + offset); dsb(); } while (0)
+
+#define GPIO_SWPORTA_DR  0x0000
+#define GPIO_SWPORTA_DDR 0x0004
+
+#define GPIO3_D2_OUTPUT  (1<<26)
+#define GPIO3_D2_OUTPUT_HIGH  (1<<26)
+#define GPIO3_D2_OUTPUT_LOW  (~(1<<26))
+
+#ifdef CONFIG_REGULATOR_ACT8931
+#define PMU_POWER_SLEEP RK2928_PIN3_PD2        
+extern int platform_device_register(struct platform_device *pdev);
+
+int act8931_pre_init(struct act8931 *act8931){
+
+       int val = 0;
+       int i   = 0;
+       int err = -1;
+               
+       printk("%s,line=%d\n", __func__,__LINE__);      
+       
+
+}
+int act8931_set_init(struct act8931 *act8931)
+{
+       struct regulator *dcdc;
+       struct regulator *ldo;
+       printk("%s,line=%d\n", __func__,__LINE__);
+
+       #ifdef CONFIG_RK30_PWM_REGULATOR
+       platform_device_register(&pwm_regulator_device[0]);
+       #endif
+       
+       ldo = regulator_get(NULL, "act_ldo1");  //vcc28_cif
+       regulator_set_voltage(ldo, 2800000, 2800000);
+       regulator_enable(ldo);
+       printk("%s set ldo1 vcc28_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
+       regulator_put(ldo);
+       udelay(100);
+
+       ldo = regulator_get(NULL, "act_ldo2");  // vcc18_cif
+       regulator_set_voltage(ldo, 1800000, 1800000);
+       regulator_enable(ldo);
+       printk("%s set ldo2 vcc18_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
+       regulator_put(ldo);
+       udelay(100);
+
+       ldo = regulator_get(NULL, "act_ldo3");  // vcca_30
+       regulator_set_voltage(ldo, 3000000, 3000000);
+       regulator_enable(ldo);
+       printk("%s set ldo3 vcca_30=%dmV end\n", __func__, regulator_get_voltage(ldo));
+       regulator_put(ldo);
+       udelay(100);
+
+       ldo = regulator_get(NULL, "act_ldo4");   //vcc_lcd
+       regulator_set_voltage(ldo, 3300000, 3300000);
+       regulator_enable(ldo);
+       printk("%s set ldo4 vcc_lcd=%dmV end\n", __func__, regulator_get_voltage(ldo));
+       regulator_put(ldo);
+       udelay(100);
+       
+       dcdc = regulator_get(NULL, "act_dcdc1");        //vcc_io
+       regulator_set_voltage(dcdc, 3000000, 3000000);
+       regulator_enable(dcdc);
+       printk("%s set dcdc1 vcc_io=%dmV end\n", __func__, regulator_get_voltage(dcdc));
+       regulator_put(dcdc);
+       udelay(100);
+       
+       dcdc = regulator_get(NULL, "act_dcdc2");        //vcc_ddr 
+       regulator_set_voltage(dcdc, 1500000, 1500000);  // 1.5*4/5 = 1.2 and Vout=1.5v
+       regulator_enable(dcdc);
+       printk("%s set dcdc2 vcc_ddr=%dmV end\n", __func__, regulator_get_voltage(dcdc));
+       regulator_put(dcdc);
+       udelay(100);
+       
+       dcdc = regulator_get(NULL, "vdd_cpu");  //vdd_arm
+       regulator_set_voltage(dcdc, 1200000, 1200000);
+       regulator_enable(dcdc);
+       printk("%s set dcdc3 vdd_arm=%dmV end\n", __func__, regulator_get_voltage(dcdc));
+       regulator_put(dcdc);
+       udelay(100);
+       
+
+       printk("%s,line=%d END\n", __func__,__LINE__);
+       
+       return 0;
+}
+
+static struct regulator_consumer_supply act8931_buck1_supply[] = {
+       {
+               .supply = "act_dcdc1",
+       },
+
+};
+static struct regulator_consumer_supply act8931_buck2_supply[] = {
+       {
+               .supply = "act_dcdc2",
+       },
+       
+};
+static struct regulator_consumer_supply act8931_buck3_supply[] = {
+       {
+               .supply = "act_dcdc3",
+       },
+       {
+               .supply = "vdd_cpu",
+       },
+};
+
+static struct regulator_consumer_supply act8931_ldo1_supply[] = {
+       {
+               .supply = "act_ldo1",
+       },
+};
+static struct regulator_consumer_supply act8931_ldo2_supply[] = {
+       {
+               .supply = "act_ldo2",
+       },
+};
+
+static struct regulator_consumer_supply act8931_ldo3_supply[] = {
+       {
+               .supply = "act_ldo3",
+       },
+};
+static struct regulator_consumer_supply act8931_ldo4_supply[] = {
+       {
+               .supply = "act_ldo4",
+       },
+};
+
+static struct regulator_init_data act8931_buck1 = {
+       .constraints = {
+               .name           = "ACT_DCDC1",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               .always_on = 1,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_buck1_supply),
+       .consumer_supplies =  act8931_buck1_supply,
+};
+
+/* */
+static struct regulator_init_data act8931_buck2 = {
+       .constraints = {
+               .name           = "ACT_DCDC2",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               .always_on = 1,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_buck2_supply),
+       .consumer_supplies =  act8931_buck2_supply,
+};
+
+/* */
+static struct regulator_init_data act8931_buck3 = {
+       .constraints = {
+               .name           = "ACT_DCDC3",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               .always_on = 1,
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_buck3_supply),
+       .consumer_supplies =  act8931_buck3_supply,
+};
+
+static struct regulator_init_data act8931_ldo1 = {
+       .constraints = {
+               .name           = "ACT_LDO1",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_ldo1_supply),
+       .consumer_supplies =  act8931_ldo1_supply,
+};
+
+/* */
+static struct regulator_init_data act8931_ldo2 = {
+       .constraints = {
+               .name           = "ACT_LDO2",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_ldo2_supply),
+       .consumer_supplies =  act8931_ldo2_supply,
+};
+
+/* */
+static struct regulator_init_data act8931_ldo3 = {
+       .constraints = {
+               .name           = "ACT_LDO3",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_ldo3_supply),
+       .consumer_supplies =  act8931_ldo3_supply,
+};
+
+/* */
+static struct regulator_init_data act8931_ldo4 = {
+       .constraints = {
+               .name           = "ACT_LDO1",
+               .min_uV                 = 600000,
+               .max_uV                 = 3900000,
+               .apply_uV               = 1,
+               
+               .valid_ops_mask = REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE,
+               .valid_modes_mask = REGULATOR_MODE_STANDBY | REGULATOR_MODE_NORMAL,
+
+       },
+       .num_consumer_supplies = ARRAY_SIZE(act8931_ldo4_supply),
+       .consumer_supplies =  act8931_ldo4_supply,
+};
+
+struct act8931_regulator_subdev act8931_regulator_subdev_id[] = {
+       {
+               .id=0,
+               .initdata=&act8931_ldo1,                
+        },
+
+       {
+               .id=1,
+               .initdata=&act8931_ldo2,                
+        },
+
+       {
+               .id=2,
+               .initdata=&act8931_ldo3,                
+        },
+
+       {
+               .id=3,
+               .initdata=&act8931_ldo4,                
+        },
+
+       {
+               .id=4,
+               .initdata=&act8931_buck1,               
+        },
+
+       {
+               .id=5,
+               .initdata=&act8931_buck2,               
+        },
+       {
+               .id=6,
+               .initdata=&act8931_buck3,               
+        },
+
+};
+
+struct act8931_platform_data act8931_data={
+       .set_init=act8931_set_init,
+       .num_regulators=7,
+       .regulators=act8931_regulator_subdev_id,
+       
+};
+
+
+#endif
+
index b425fd61c4b209bfad8c8c71de3cc045bc0677b4..ff84dfd8d9f5aa7a502319041d3d90b9a8ba89af 100755 (executable)
@@ -276,6 +276,12 @@ config REGULATOR_ACT8891
        help
          Support the voltage and current regulators of the ACT8891 series of PMIC devices.
 
+config REGULATOR_ACT8931
+       tristate "Active Semi ACT8931 PMIC regulators"
+       depends on I2C
+       help
+         Support the voltage and current regulators of the ACT8931 series of PMIC devices.
+
 config RK29_PWM_REGULATOR
        tristate "rk2918 pwm voltage regulator"
        help
index d4f86bae7bf97397d968feeee2552e420b615d2c..6478b5be0d8861a94820efc696d6ea0a78b31450 100755 (executable)
@@ -51,5 +51,6 @@ obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
 obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
 obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
 obj-$(CONFIG_REGULATOR_ACT8891) += act8891.o
+obj-$(CONFIG_REGULATOR_ACT8931) += act8931.o
 
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG
diff --git a/drivers/regulator/act8931.c b/drivers/regulator/act8931.c
new file mode 100755 (executable)
index 0000000..ae0b451
--- /dev/null
@@ -0,0 +1,637 @@
+/*
+ * Regulator driver for Active-semi act8931 PMIC chip for rk29xx
+ *
+ * Copyright (C) 2010, 2011 ROCKCHIP, Inc.
+
+ * Based on act8891.c that is work by zhangqing<zhangqing@rock-chips.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/bug.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/kernel.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/act8931.h>
+#include <mach/gpio.h>
+#include <linux/delay.h>
+#include <mach/iomux.h>
+#include <linux/slab.h>
+
+#if 0
+#define DBG(x...)      printk(KERN_INFO x)
+#else
+#define DBG(x...)
+#endif
+#if 1
+#define DBG_INFO(x...) printk(KERN_INFO x)
+#else
+#define DBG_INFO(x...)
+#endif
+#define PM_CONTROL
+
+struct act8931 {
+       struct device *dev;
+       struct mutex io_lock;
+       struct i2c_client *i2c;
+       int num_regulators;
+       struct regulator_dev **rdev;
+};
+
+static u8 act8931_reg_read(struct act8931 *act8931, u8 reg);
+static int act8931_set_bits(struct act8931 *act8931, u8 reg, u16 mask, u16 val);
+
+
+#define act8931_BUCK1_SET_VOL_BASE 0x20
+#define act8931_BUCK2_SET_VOL_BASE 0x30
+#define act8931_BUCK3_SET_VOL_BASE 0x40
+#define act8931_LDO1_SET_VOL_BASE 0x50
+#define act8931_LDO2_SET_VOL_BASE 0x54
+#define act8931_LDO3_SET_VOL_BASE 0x60
+#define act8931_LDO4_SET_VOL_BASE 0x64
+
+#define act8931_BUCK1_CONTR_BASE 0x22
+#define act8931_BUCK2_CONTR_BASE 0x32
+#define act8931_BUCK3_CONTR_BASE 0x42
+#define act8931_LDO1_CONTR_BASE 0x51
+#define act8931_LDO2_CONTR_BASE 0x55
+#define act8931_LDO3_CONTR_BASE 0x61
+#define act8931_LDO4_CONTR_BASE 0x65
+
+#define BUCK_VOL_MASK 0x3f
+#define LDO_VOL_MASK 0x3f
+
+#define VOL_MIN_IDX 0x00
+#define VOL_MAX_IDX 0x3f
+
+const static int buck_set_vol_base_addr[] = {
+       act8931_BUCK1_SET_VOL_BASE,
+       act8931_BUCK2_SET_VOL_BASE,
+       act8931_BUCK3_SET_VOL_BASE,
+};
+const static int buck_contr_base_addr[] = {
+       act8931_BUCK1_CONTR_BASE,
+       act8931_BUCK2_CONTR_BASE,
+       act8931_BUCK3_CONTR_BASE,
+};
+#define act8931_BUCK_SET_VOL_REG(x) (buck_set_vol_base_addr[x])
+#define act8931_BUCK_CONTR_REG(x) (buck_contr_base_addr[x])
+
+
+const static int ldo_set_vol_base_addr[] = {
+       act8931_LDO1_SET_VOL_BASE,
+       act8931_LDO2_SET_VOL_BASE,
+       act8931_LDO3_SET_VOL_BASE,
+       act8931_LDO4_SET_VOL_BASE, 
+};
+const static int ldo_contr_base_addr[] = {
+       act8931_LDO1_CONTR_BASE,
+       act8931_LDO2_CONTR_BASE,
+       act8931_LDO3_CONTR_BASE,
+       act8931_LDO4_CONTR_BASE,
+};
+#define act8931_LDO_SET_VOL_REG(x) (ldo_set_vol_base_addr[x])
+#define act8931_LDO_CONTR_REG(x) (ldo_contr_base_addr[x])
+
+const static int buck_voltage_map[] = {
+        600, 625, 650, 675, 700, 725, 750, 775,
+        800, 825, 850, 875, 900, 925, 950, 975,
+        1000, 1025, 1050, 1075, 1100, 1125, 1150,
+        1175, 1200, 1250, 1300, 1350, 1400, 1450,
+        1500, 1550, 1600, 1650, 1700, 1750, 1800, 
+        1850, 1900, 1950, 2000, 2050, 2100, 2150, 
+        2200, 2250, 2300, 2350, 2400, 2500, 2600, 
+        2700, 2800, 2850, 2900, 3000, 3100, 3200,
+        3300, 3400, 3500, 3600, 3700, 3800, 3900,
+};
+
+const static int ldo_voltage_map[] = {
+        600, 625, 650, 675, 700, 725, 750, 775,
+        800, 825, 850, 875, 900, 925, 950, 975,
+        1000, 1025, 1050, 1075, 1100, 1125, 1150,
+        1175, 1200, 1250, 1300, 1350, 1400, 1450,
+        1500, 1550, 1600, 1650, 1700, 1750, 1800, 
+        1850, 1900, 1950, 2000, 2050, 2100, 2150, 
+        2200, 2250, 2300, 2350, 2400, 2500, 2600, 
+        2700, 2800, 2850, 2900, 3000, 3100, 3200,
+        3300, 3400, 3500, 3600, 3700, 3800, 3900,
+};
+
+static int act8931_ldo_list_voltage(struct regulator_dev *dev, unsigned index)
+{
+       return 1000 * ldo_voltage_map[index];
+}
+static int act8931_ldo_is_enabled(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev) -ACT8931_LDO1;
+       u16 val;
+       u16 mask=0x80;
+       val = act8931_reg_read(act8931, act8931_LDO_CONTR_REG(ldo));     
+       if (val < 0)
+               return val;
+       val=val&~0x7f;
+       if (val & mask)
+               return 1;
+       else
+               return 0;       
+}
+static int act8931_ldo_enable(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo= rdev_get_id(dev) -ACT8931_LDO1;
+       u16 mask=0x80;  
+       int ret;
+       return act8931_set_bits(act8931, act8931_LDO_CONTR_REG(ldo), mask, 0x80);
+       
+}
+static int act8931_ldo_disable(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo= rdev_get_id(dev) -ACT8931_LDO1;
+       u16 mask=0x80;
+       int ret;
+       return act8931_set_bits(act8931, act8931_LDO_CONTR_REG(ldo), mask, 0);
+
+}
+static int act8931_ldo_get_voltage(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo= rdev_get_id(dev) -ACT8931_LDO1;
+       u16 reg = 0;
+       int val;
+       reg = act8931_reg_read(act8931,act8931_LDO_SET_VOL_REG(ldo));
+       reg &= LDO_VOL_MASK;
+       val = 1000 * ldo_voltage_map[reg];      
+       return val;
+}
+static int act8931_ldo_set_voltage(struct regulator_dev *dev,
+                                 int min_uV, int max_uV)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo= rdev_get_id(dev) -ACT8931_LDO1;
+       int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
+       const int *vol_map =ldo_voltage_map;
+       u16 val;
+       int ret = 0;
+       if (min_vol < vol_map[VOL_MIN_IDX] ||
+           min_vol > vol_map[VOL_MAX_IDX])
+               return -EINVAL;
+
+       for (val = VOL_MIN_IDX; val <= VOL_MAX_IDX;
+            val++){
+               if (vol_map[val] >= min_vol)
+                       break;  }
+               
+       if (vol_map[val] > max_vol)
+               return -EINVAL;
+
+       ret = act8931_set_bits(act8931, act8931_LDO_SET_VOL_REG(ldo),
+               LDO_VOL_MASK, val);
+       if (ret)
+               return ret;
+
+}
+static int act8931_ldo_get_mode(struct regulator_dev *dev, unsigned index)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev) -ACT8931_LDO1 ;
+       u16 mask = 0xcf;
+       u16 val;
+       val = act8931_reg_read(act8931, act8931_LDO_CONTR_REG(ldo));
+       val=val|mask;
+       if (val== mask)
+               return REGULATOR_MODE_NORMAL;
+       else
+               return REGULATOR_MODE_STANDBY;
+
+}
+static int act8931_ldo_set_mode(struct regulator_dev *dev, unsigned int mode)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int ldo = rdev_get_id(dev) -ACT8931_LDO1 ;
+       u16 mask = 0x20;
+       switch(mode)
+       {
+       case REGULATOR_MODE_NORMAL:
+               return act8931_set_bits(act8931, act8931_LDO_CONTR_REG(ldo), mask, 0);          
+       case REGULATOR_MODE_STANDBY:
+               return act8931_set_bits(act8931, act8931_LDO_CONTR_REG(ldo), mask, mask);
+       default:
+               printk("error:pmu_act8931 only lowpower and nomal mode\n");
+               return -EINVAL;
+       }
+
+
+}
+static struct regulator_ops act8931_ldo_ops = {
+       .set_voltage = act8931_ldo_set_voltage,
+       .get_voltage = act8931_ldo_get_voltage,
+       .list_voltage = act8931_ldo_list_voltage,
+       .is_enabled = act8931_ldo_is_enabled,
+       .enable = act8931_ldo_enable,
+       .disable = act8931_ldo_disable,
+       .get_mode = act8931_ldo_get_mode,
+       .set_mode = act8931_ldo_set_mode,
+       
+};
+
+static int act8931_dcdc_list_voltage(struct regulator_dev *dev, unsigned index)
+{
+       return 1000 * buck_voltage_map[index];
+}
+static int act8931_dcdc_is_enabled(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1;
+       u16 val;
+       u16 mask=0x80;  
+       val = act8931_reg_read(act8931, act8931_BUCK_CONTR_REG(buck));
+       if (val < 0)
+               return val;
+        val=val&~0x7f;
+       if (val & mask)
+               return 1;
+       else
+               return 0;       
+}
+static int act8931_dcdc_enable(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       u16 mask=0x80;  
+       return act8931_set_bits(act8931, act8931_BUCK_CONTR_REG(buck), mask, 0x80);
+
+}
+static int act8931_dcdc_disable(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       u16 mask=0x80;
+        return act8931_set_bits(act8931, act8931_BUCK_CONTR_REG(buck), mask, 0);
+}
+static int act8931_dcdc_get_voltage(struct regulator_dev *dev)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       u16 reg = 0;
+       int val;
+       reg = act8931_reg_read(act8931,act8931_BUCK_SET_VOL_REG(buck));
+       reg &= BUCK_VOL_MASK;
+        DBG("%d\n", reg);
+       val = 1000 * buck_voltage_map[reg];     
+        DBG("%d\n", val);
+       return val;
+}
+static int act8931_dcdc_set_voltage(struct regulator_dev *dev,
+                                 int min_uV, int max_uV)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
+       const int *vol_map = buck_voltage_map;
+       u16 val;
+       int ret = 0;
+
+        DBG("%s, min_uV = %d, max_uV = %d!\n", __func__, min_uV, max_uV);
+       if (min_vol < vol_map[VOL_MIN_IDX] ||
+           min_vol > vol_map[VOL_MAX_IDX])
+               return -EINVAL;
+
+       for (val = VOL_MIN_IDX; val <= VOL_MAX_IDX;
+            val++){
+               if (vol_map[val] >= min_vol)
+                       break;}
+
+       if (vol_map[val] > max_vol)
+               return -EINVAL;
+       ret = act8931_set_bits(act8931, act8931_BUCK_SET_VOL_REG(buck),
+               BUCK_VOL_MASK, val);
+       ret = act8931_set_bits(act8931, act8931_BUCK_SET_VOL_REG(buck) + 0x01,
+               BUCK_VOL_MASK, val);
+       //if (ret)
+               return ret;
+}
+static int act8931_dcdc_get_mode(struct regulator_dev *dev, unsigned index)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       u16 mask = 0xcf;
+       u16 val;
+       val = act8931_reg_read(act8931, act8931_BUCK_CONTR_REG(buck));
+       val=val|mask;
+       if (val== mask)
+               return REGULATOR_MODE_STANDBY;
+       else
+               return REGULATOR_MODE_NORMAL;
+
+}
+static int act8931_dcdc_set_mode(struct regulator_dev *dev, unsigned int mode)
+{
+       struct act8931 *act8931 = rdev_get_drvdata(dev);
+       int buck = rdev_get_id(dev) -ACT8931_DCDC1 ;
+       u16 mask = 0x20;
+       switch(mode)
+       {
+       case REGULATOR_MODE_STANDBY:
+               return act8931_set_bits(act8931, act8931_BUCK_CONTR_REG(buck), mask, 0);
+       case REGULATOR_MODE_NORMAL:
+               return act8931_set_bits(act8931, act8931_BUCK_CONTR_REG(buck), mask, mask);
+       default:
+               printk("error:pmu_act8931 only powersave and pwm mode\n");
+               return -EINVAL;
+       }
+
+
+}
+static struct regulator_ops act8931_dcdc_ops = { 
+       .set_voltage = act8931_dcdc_set_voltage,
+       .get_voltage = act8931_dcdc_get_voltage,
+       .list_voltage= act8931_dcdc_list_voltage,
+       .is_enabled = act8931_dcdc_is_enabled,
+       .enable = act8931_dcdc_enable,
+       .disable = act8931_dcdc_disable,
+       .get_mode = act8931_dcdc_get_mode,
+       .set_mode = act8931_dcdc_set_mode,
+};
+static struct regulator_desc regulators[] = {
+       {
+               .name = "ACT_LDO1",
+               .id =0,
+               .ops = &act8931_ldo_ops,
+               .n_voltages = ARRAY_SIZE(ldo_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       {
+               .name = "ACT_LDO2",
+               .id = 1,
+               .ops = &act8931_ldo_ops,
+               .n_voltages = ARRAY_SIZE(ldo_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       {
+               .name = "ACT_LDO3",
+               .id = 2,
+               .ops = &act8931_ldo_ops,
+               .n_voltages = ARRAY_SIZE(ldo_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       {
+               .name = "ACT_LDO4",
+               .id = 3,
+               .ops = &act8931_ldo_ops,
+               .n_voltages = ARRAY_SIZE(ldo_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+
+       {
+               .name = "ACT_DCDC1",
+               .id = 4,
+               .ops = &act8931_dcdc_ops,
+               .n_voltages = ARRAY_SIZE(buck_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       {
+               .name = "ACT_DCDC2",
+               .id = 5,
+               .ops = &act8931_dcdc_ops,
+               .n_voltages = ARRAY_SIZE(buck_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       {
+               .name = "ACT_DCDC3",
+               .id = 6,
+               .ops = &act8931_dcdc_ops,
+               .n_voltages = ARRAY_SIZE(buck_voltage_map),
+               .type = REGULATOR_VOLTAGE,
+               .owner = THIS_MODULE,
+       },
+       
+};
+
+/*
+ *
+ */
+static int act8931_i2c_read(struct i2c_client *i2c, char reg, int count,       u16 *dest)
+{
+      int ret;
+    struct i2c_adapter *adap;
+    struct i2c_msg msgs[2];
+
+    if(!i2c)
+               return ret;
+
+       if (count != 1)
+               return -EIO;  
+  
+    adap = i2c->adapter;               
+    
+    msgs[0].addr = i2c->addr;
+    msgs[0].buf = &reg;
+    msgs[0].flags = i2c->flags;
+    msgs[0].len = 1;
+    msgs[0].scl_rate = 200*1000;
+    
+    msgs[1].buf = dest;
+    msgs[1].addr = i2c->addr;
+    msgs[1].flags = i2c->flags | I2C_M_RD;
+    msgs[1].len = 1;
+    msgs[1].scl_rate = 200*1000;
+    ret = i2c_transfer(adap, msgs, 2);
+
+       DBG("***run in %s %d msgs[1].buf = %d\n",__FUNCTION__,__LINE__,*(msgs[1].buf));
+
+       return 0;   
+}
+
+static int act8931_i2c_write(struct i2c_client *i2c, char reg, int count, const u16 src)
+{
+       int ret=-1;
+       
+       struct i2c_adapter *adap;
+       struct i2c_msg msg;
+       char tx_buf[2];
+
+       if(!i2c)
+               return ret;
+       if (count != 1)
+               return -EIO;
+    
+       adap = i2c->adapter;            
+       tx_buf[0] = reg;
+       tx_buf[1] = src;
+       
+       msg.addr = i2c->addr;
+       msg.buf = &tx_buf[0];
+       msg.len = 1 +1;
+       msg.flags = i2c->flags;   
+       msg.scl_rate = 200*1000;        
+
+       ret = i2c_transfer(adap, &msg, 1);
+       return 0;       
+}
+
+static u8 act8931_reg_read(struct act8931 *act8931, u8 reg)
+{
+       u16 val = 0;
+
+       mutex_lock(&act8931->io_lock);
+
+       act8931_i2c_read(act8931->i2c, reg, 1, &val);
+
+       DBG("reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
+
+       mutex_unlock(&act8931->io_lock);
+
+       return val & 0xff;      
+}
+
+static int act8931_set_bits(struct act8931 *act8931, u8 reg, u16 mask, u16 val)
+{
+       u16 tmp;
+       int ret;
+
+       mutex_lock(&act8931->io_lock);
+
+       ret = act8931_i2c_read(act8931->i2c, reg, 1, &tmp);
+       DBG("1 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
+       tmp = (tmp & ~mask) | val;
+       if (ret == 0) {
+               ret = act8931_i2c_write(act8931->i2c, reg, 1, tmp);
+               DBG("reg write 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
+       }
+       act8931_i2c_read(act8931->i2c, reg, 1, &tmp);
+       DBG("2 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
+       mutex_unlock(&act8931->io_lock);
+
+       return ret;     
+}
+static int __devinit setup_regulators(struct act8931 *act8931, struct act8931_platform_data *pdata)
+{      
+       int i, err;
+
+       act8931->num_regulators = pdata->num_regulators;
+       act8931->rdev = kcalloc(pdata->num_regulators,
+                              sizeof(struct regulator_dev *), GFP_KERNEL);
+       if (!act8931->rdev) {
+               return -ENOMEM;
+       }
+       /* Instantiate the regulators */
+       for (i = 0; i < pdata->num_regulators; i++) {
+               int id = pdata->regulators[i].id;
+               act8931->rdev[i] = regulator_register(&regulators[id],
+                       act8931->dev, pdata->regulators[i].initdata, act8931);
+/*
+               if (IS_ERR(act8931->rdev[i])) {
+                       err = PTR_ERR(act8931->rdev[i]);
+                       dev_err(act8931->dev, "regulator init failed: %d\n",
+                               err);
+                       goto error;
+               }*/
+       }
+
+       return 0;
+error:
+       while (--i >= 0)
+               regulator_unregister(act8931->rdev[i]);
+       kfree(act8931->rdev);
+       act8931->rdev = NULL;
+       return err;
+}
+
+static int __devinit act8931_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
+{
+       struct act8931 *act8931;        
+       struct act8931_platform_data *pdata = i2c->dev.platform_data;
+       int ret;
+       act8931 = kzalloc(sizeof(struct act8931), GFP_KERNEL);
+       if (act8931 == NULL) {
+               ret = -ENOMEM;          
+               goto err;
+       }
+       act8931->i2c = i2c;
+       act8931->dev = &i2c->dev;
+       i2c_set_clientdata(i2c, act8931);
+       mutex_init(&act8931->io_lock);  
+       
+       if (pdata) {
+               ret = setup_regulators(act8931, pdata);
+               if (ret < 0)            
+                       goto err;
+       } else
+               dev_warn(act8931->dev, "No platform init data supplied\n");
+       
+       pdata->set_init(act8931);
+
+       return 0;
+
+err:
+       return ret;     
+
+}
+
+static int __devexit act8931_i2c_remove(struct i2c_client *i2c)
+{
+       struct act8931 *act8931 = i2c_get_clientdata(i2c);
+       int i;
+
+       for (i = 0; i < act8931->num_regulators; i++)
+               if (act8931->rdev[i])
+                       regulator_unregister(act8931->rdev[i]);
+       kfree(act8931->rdev);
+       i2c_set_clientdata(i2c, NULL);
+       kfree(act8931);
+
+       return 0;
+}
+
+static const struct i2c_device_id act8931_i2c_id[] = {
+       { "act8931", 0 },
+       { }
+};
+
+MODULE_DEVICE_TABLE(i2c, act8931_i2c_id);
+
+static struct i2c_driver act8931_i2c_driver = {
+       .driver = {
+               .name = "act8931",
+               .owner = THIS_MODULE,
+       },
+       .probe    = act8931_i2c_probe,
+       .remove   = __devexit_p(act8931_i2c_remove),
+       .id_table = act8931_i2c_id,
+};
+
+static int __init act8931_module_init(void)
+{
+       int ret;
+       ret = i2c_add_driver(&act8931_i2c_driver);
+       if (ret != 0)
+               pr_err("Failed to register I2C driver: %d\n", ret);
+       return ret;
+}
+//module_init(act8931_module_init);
+//subsys_initcall(act8931_module_init);
+//rootfs_initcall(act8931_module_init);
+subsys_initcall_sync(act8931_module_init);
+
+static void __exit act8931_module_exit(void)
+{
+       i2c_del_driver(&act8931_i2c_driver);
+}
+module_exit(act8931_module_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("xhc <xhc@rock-chips.com>");
+MODULE_DESCRIPTION("act8931 PMIC driver");
+
+
diff --git a/include/linux/regulator/act8931.h b/include/linux/regulator/act8931.h
new file mode 100755 (executable)
index 0000000..2c1a34a
--- /dev/null
@@ -0,0 +1,79 @@
+
+/* include/linux/regulator/act8931.h
+ *
+ * Copyright (C) 2011 ROCKCHIP, Inc.
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef __LINUX_REGULATOR_act8931_H
+#define __LINUX_REGULATOR_act8931_H
+
+#include <linux/regulator/machine.h>
+
+//#define ACT8931_START 30
+
+#define ACT8931_LDO1  0                     //(0+ACT8931_START)
+#define ACT8931_LDO2  1                    // (1+ACT8931_START)
+#define ACT8931_LDO3  2                  //(2+ACT8931_START)
+#define ACT8931_LDO4  3                //(3+ACT8931_START)
+
+
+#define ACT8931_DCDC1 4                //(4+ACT8931_START)
+#define ACT8931_DCDC2 5                //(5+ACT8931_START)
+#define ACT8931_DCDC3 6                //(6+ACT8931_START)
+
+
+#define act8931_NUM_REGULATORS 7
+struct act8931;
+
+/*
+ * Register definitions to all subdrivers
+ */
+static u8 act8931_reg_read(struct act8931 *act8931, u8 reg);
+static int act8931_set_bits(struct act8931 *act8931, u8 reg, u16 mask, u16 val);
+
+
+#define act8931_BUCK1_SET_VOL_BASE 0x20
+#define act8931_BUCK2_SET_VOL_BASE 0x30
+#define act8931_BUCK3_SET_VOL_BASE 0x40
+#define act8931_LDO1_SET_VOL_BASE 0x50
+#define act8931_LDO2_SET_VOL_BASE 0x54
+#define act8931_LDO3_SET_VOL_BASE 0x60
+#define act8931_LDO4_SET_VOL_BASE 0x64
+
+#define act8931_BUCK1_CONTR_BASE 0x22
+#define act8931_BUCK2_CONTR_BASE 0x32
+#define act8931_BUCK3_CONTR_BASE 0x42
+#define act8931_LDO1_CONTR_BASE 0x51
+#define act8931_LDO2_CONTR_BASE 0x55
+#define act8931_LDO3_CONTR_BASE 0x61
+#define act8931_LDO4_CONTR_BASE 0x65
+
+#define BUCK_VOL_MASK 0x3f
+#define LDO_VOL_MASK 0x3f
+
+#define VOL_MIN_IDX 0x00
+#define VOL_MAX_IDX 0x3f
+
+struct act8931_regulator_subdev {
+       int id;
+       struct regulator_init_data *initdata;
+};
+
+struct act8931_platform_data {
+       int num_regulators;
+       int (*set_init)(struct act8931 *act8931);
+       struct act8931_regulator_subdev *regulators;
+};
+
+
+#endif
+