rk2928:rk2926:remove excess pmu file
author张晴 <zhangqing@rock-chips.com>
Thu, 25 Oct 2012 06:38:03 +0000 (14:38 +0800)
committer张晴 <zhangqing@rock-chips.com>
Thu, 25 Oct 2012 06:38:03 +0000 (14:38 +0800)
arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c [deleted file]
arch/arm/mach-rk2928/board-rk2928-phonepad-tps65910.c [deleted file]
arch/arm/mach-rk2928/board-rk2928-phonepad.c
arch/arm/mach-rk2928/board-rk2928-tb-tps65910.c [deleted file]

diff --git a/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-a720-tps65910.c
deleted file mode 100755 (executable)
index 00de4bd..0000000
+++ /dev/null
@@ -1,620 +0,0 @@
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl.h>
-#include <linux/mfd/tps65910.h>
-#include <mach/sram.h>
-#include <linux/platform_device.h>
-
-#include <mach/gpio.h>
-#include <mach/iomux.h>
-#include <mach/board.h>
-
-#define gpio_readl(offset)     readl_relaxed(RK2928_GPIO1_BASE + offset)
-#define gpio_writel(v, offset) do { writel_relaxed(v, RK2928_GPIO1_BASE + offset); dsb(); } while (0)
-
-#define GPIO1_A1_OUTPUT  (1<<1)
-#define GPIO1_A1_OUTPUT_HIGH  (1<<1)
-#define GPIO1_A1_OUTPUT_LOW  (~(1<<1))
-
-#ifdef CONFIG_MFD_TPS65910
-#define PMU_POWER_SLEEP RK2928_PIN1_PA1        
-extern int platform_device_register(struct platform_device *pdev);
-
-int tps65910_pre_init(struct tps65910 *tps65910){
-
-       int val = 0;
-       int i   = 0;
-       int err = -1;
-               
-       printk("%s,line=%d\n", __func__,__LINE__);      
-       gpio_request(PMU_POWER_SLEEP, "NULL");
-       gpio_direction_output(PMU_POWER_SLEEP, GPIO_LOW);
-
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_DEVCTRL2 reg\n");
-               return val;
-       }
-       /* Set sleep state active high and allow device turn-off after PWRON long press */
-       val |= (DEVCTRL2_SLEEPSIG_POL_MASK | DEVCTRL2_PWON_LP_OFF_MASK);
-
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL2 reg\n");
-               return err;
-       }
-        #if 1
-       /* set PSKIP=0 */
-        val = tps65910_reg_read(tps65910, TPS65910_DCDCCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-
-       val &= ~DEVCTRL_DEV_OFF_MASK;
-       val &= ~DEVCTRL_DEV_SLP_MASK;
-        err = tps65910_reg_write(tps65910, TPS65910_DCDCCTRL, val);
-        if (err) {
-                printk(KERN_ERR "Unable to write TPS65910_DCDCCTRL reg\n");
-                return err;
-        }
-       #endif
-       /* Set the maxinum load current */
-       /* VDD1 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD1);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD1 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       val |= (0x07<<2);       //TSTEP[2:0] = 111 : 2.5 mV/|¨¬s(sampling 3 Mhz/5)
-       err = tps65910_reg_write(tps65910, TPS65910_VDD1, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD1 reg\n");
-               return err;
-       }
-
-       /* VDD2 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD2 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       err = tps65910_reg_write(tps65910, TPS65910_VDD2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD2 reg\n");
-               return err;
-       }
-
-       /* VIO */
-       val = tps65910_reg_read(tps65910, TPS65910_VIO);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VIO reg\n");
-               return -EIO;
-       }
-
-       val |= (1<<6);  //when 01: 1.0 A
-       err = tps65910_reg_write(tps65910, TPS65910_VIO, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VIO reg\n");
-               return err;
-       }
-       #if 1
-       /* Mask ALL interrupts */
-       err = tps65910_reg_write(tps65910,TPS65910_INT_MSK, 0xFF);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK reg\n");
-               return err;
-       }
-       
-       err = tps65910_reg_write(tps65910, TPS65910_INT_MSK2, 0x03);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK2 reg\n");
-               return err;
-       }
-
-       /* Set RTC Power, disable Smart Reflex in DEVCTRL_REG */
-       #if 1
-       val = 0;
-       val |= (DEVCTRL_SR_CTL_I2C_SEL_MASK);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL reg\n");
-               return err;
-       }
-       printk(KERN_INFO "TPS65910 Set default voltage.\n");
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%04x\n",__FUNCTION__,val);
-       }
-       #endif
-
-       #if 1
-       //sleep control register
-       /*set func when in sleep mode */
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= (1 << 1);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /* open ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_LDO_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val &= 0;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_LDO_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-               
-       /*set dc mode when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_RES_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val  |= 0xff;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_RES_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /*close ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_SET_LDO_OFF);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= 0x9a;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_SET_LDO_OFF, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%4x\n",__FUNCTION__,val);
-       }
-       #endif
-       #endif
-       
-       printk("%s,line=%d\n", __func__,__LINE__);
-       return 0;
-
-}
-
-int tps65910_post_init(struct tps65910 *tps65910)
-{
-       struct regulator *dcdc;
-       struct regulator *ldo;
-       printk("%s,line=%d\n", __func__,__LINE__);
-
-       g_pmic_type = PMIC_TYPE_TPS65910;
-       printk("%s:g_pmic_type=%d\n",__func__,g_pmic_type);
-
-       #ifdef CONFIG_RK30_PWM_REGULATOR
-       platform_device_register(&pwm_regulator_device[0]);
-       #endif
-       
-       dcdc = regulator_get(NULL, "vio");      //vcc_io
-       regulator_set_voltage(dcdc, 3300000, 3300000);
-       regulator_enable(dcdc);
-       printk("%s set vio vcc_io=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-        /*
-       ldo = regulator_get(NULL, "vpll");      // vcc25
-       regulator_set_voltage(ldo, 2500000, 2500000);
-       regulator_enable(ldo);
-       printk("%s set vpll vcc25=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        */
-       ldo = regulator_get(NULL, "vdig2");     // vdd12
-       regulator_set_voltage(ldo, 1200000, 1200000);
-       regulator_enable(ldo);
-       printk("%s set vdig2 vdd12=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux33");     //vcc_tp
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux33 vcc_tp=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd_cpu");  //vdd_cpu
-       regulator_set_voltage(dcdc, 1200000, 1200000);
-       regulator_enable(dcdc);
-       printk("%s set vdd1 vdd_cpu=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd2");     //vcc_ddr 
-       regulator_set_voltage(dcdc, 1200000, 1200000);  // 1.5*4/5 = 1.2 and Vout=1.5v
-       regulator_enable(dcdc);
-       printk("%s set vdd2 vcc_ddr=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       ldo = regulator_get(NULL, "vdig1");     //vcc18_cif
-       regulator_set_voltage(ldo, 1500000, 1500000);
-       regulator_enable(ldo);
-       printk("%s set vdig1 vcc18_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vaux1"); //vcc28_cif
-       regulator_set_voltage(dcdc,2800000,2800000);
-       regulator_enable(dcdc); 
-       printk("%s set vaux1 vcc28_cif=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux2");     //vcca33
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux2 vcca33=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        /*
-       ldo = regulator_get(NULL, "vdac"); // vccio_wl
-       regulator_set_voltage(ldo,1800000,1800000);
-       regulator_enable(ldo); 
-       printk("%s set vdac vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        */
-       ldo = regulator_get(NULL, "vmmc");  //vccio_wl
-       regulator_set_voltage(ldo,3300000,3300000);
-       regulator_enable(ldo); 
-       printk("%s set vmmc vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_disable(ldo); 
-       regulator_put(ldo);
-       udelay(100);
-
-       printk("%s,line=%d END\n", __func__,__LINE__);
-       
-       return 0;
-}
-static struct regulator_consumer_supply tps65910_smps1_supply[] = {
-       {
-               .supply = "vdd1",
-       },
-       {
-               .supply = "vdd_cpu",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps2_supply[] = {
-       {
-               .supply = "vdd2",
-       },
-       
-};
-static struct regulator_consumer_supply tps65910_smps3_supply[] = {
-       {
-               .supply = "vdd3",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps4_supply[] = {
-       {
-               .supply = "vio",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo1_supply[] = {
-       {
-               .supply = "vdig1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo2_supply[] = {
-       {
-               .supply = "vdig2",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo3_supply[] = {
-       {
-               .supply = "vaux1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo4_supply[] = {
-       {
-               .supply = "vaux2",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo5_supply[] = {
-       {
-               .supply = "vaux33",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo6_supply[] = {
-       {
-               .supply = "vmmc",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo7_supply[] = {
-       {
-               .supply = "vdac",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo8_supply[] = {
-       {
-               .supply = "vpll",
-       },
-};
-
-static struct regulator_init_data tps65910_smps1 = {
-       .constraints = {
-               .name           = "VDD1",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps1_supply),
-       .consumer_supplies =  tps65910_smps1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps2 = {
-       .constraints = {
-               .name           = "VDD2",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps2_supply),
-       .consumer_supplies =  tps65910_smps2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps3 = {
-       .constraints = {
-               .name           = "VDD3",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1400000,
-               .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(tps65910_smps3_supply),
-       .consumer_supplies =  tps65910_smps3_supply,
-};
-
-static struct regulator_init_data tps65910_smps4 = {
-       .constraints = {
-               .name           = "VIO",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_smps4_supply),
-       .consumer_supplies =  tps65910_smps4_supply,
-};
-static struct regulator_init_data tps65910_ldo1 = {
-       .constraints = {
-               .name           = "VDIG1",
-               .min_uV                 = 1200000,
-               .max_uV                 = 2700000,
-               .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(tps65910_ldo1_supply),
-       .consumer_supplies =  tps65910_ldo1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo2 = {
-       .constraints = {
-               .name           = "VDIG2",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1800000,
-               .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(tps65910_ldo2_supply),
-       .consumer_supplies =  tps65910_ldo2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo3 = {
-       .constraints = {
-               .name           = "VAUX1",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo3_supply),
-       .consumer_supplies =  tps65910_ldo3_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo4 = {
-       .constraints = {
-               .name           = "VAUX2",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo4_supply),
-       .consumer_supplies =  tps65910_ldo4_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo5 = {
-       .constraints = {
-               .name           = "VAUX33",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo5_supply),
-       .consumer_supplies =  tps65910_ldo5_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo6 = {
-       .constraints = {
-               .name           = "VMMC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo6_supply),
-       .consumer_supplies =  tps65910_ldo6_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo7 = {
-       .constraints = {
-               .name           = "VDAC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 2850000,
-               .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(tps65910_ldo7_supply),
-       .consumer_supplies =  tps65910_ldo7_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo8 = {
-       .constraints = {
-               .name           = "VPLL",
-               .min_uV                 = 1000000,
-               .max_uV                 = 2500000,
-               .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(tps65910_ldo8_supply),
-       .consumer_supplies =  tps65910_ldo8_supply,
-};
-void __sramfunc board_pmu_tps65910_suspend(void)
-{      
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT_HIGH, GPIO_SWPORTA_DR);  //set pmu_sleep output high
-}
-void __sramfunc board_pmu_tps65910_resume(void)
-{
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret & GPIO1_A1_OUTPUT_LOW, GPIO_SWPORTA_DR);   //set pmu_sleep output low
-       sram_udelay(2000);
-}
-static struct tps65910_board tps65910_data = {
-       .irq    = (unsigned)TPS65910_HOST_IRQ,          
-       .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS,
-       .gpio_base = TPS65910_GPIO_EXPANDER_BASE,
-       
-       .pre_init = tps65910_pre_init,
-       .post_init = tps65910_post_init,
-
-       //TPS65910_NUM_REGS = 13
-       // Regulators
-       .tps65910_pmic_init_data[TPS65910_REG_VRTC] = NULL,             
-       .tps65910_pmic_init_data[TPS65910_REG_VIO] = &tps65910_smps4,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD1] = &tps65910_smps1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD2] = &tps65910_smps2,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD3] = &tps65910_smps3,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG1] = &tps65910_ldo1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG2] = &tps65910_ldo2,
-       .tps65910_pmic_init_data[TPS65910_REG_VPLL] = &tps65910_ldo8,
-       .tps65910_pmic_init_data[TPS65910_REG_VDAC] = &tps65910_ldo7,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX1] = &tps65910_ldo3,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX2] = &tps65910_ldo4,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX33] = &tps65910_ldo5,
-       .tps65910_pmic_init_data[TPS65910_REG_VMMC] = &tps65910_ldo6,
-
-};
-
-#endif
-
diff --git a/arch/arm/mach-rk2928/board-rk2928-phonepad-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-phonepad-tps65910.c
deleted file mode 100755 (executable)
index 6e9598f..0000000
+++ /dev/null
@@ -1,640 +0,0 @@
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl.h>
-#include <linux/mfd/tps65910.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_GPIO1_BASE + offset)
-#define gpio_writel(v, offset) do { writel_relaxed(v, RK2928_GPIO1_BASE + offset); dsb(); } while (0)
-
-#define GPIO_SWPORTA_DR  0x0000
-#define GPIO_SWPORTA_DDR 0x0004
-
-#define GPIO1_A1_OUTPUT  (1<<1)
-#define GPIO1_A1_OUTPUT_HIGH  (1<<1)
-#define GPIO1_A1_OUTPUT_LOW  (~(1<<1))
-
-#ifdef CONFIG_MFD_TPS65910
-#define PMU_POWER_SLEEP RK2928_PIN1_PA1        
-extern int platform_device_register(struct platform_device *pdev);
-
-int tps65910_pre_init(struct tps65910 *tps65910){
-
-       int val = 0;
-       int i   = 0;
-       int err = -1;
-               
-       printk("%s,line=%d\n", __func__,__LINE__);      
-       gpio_request(PMU_POWER_SLEEP, "NULL");
-       gpio_direction_output(PMU_POWER_SLEEP, GPIO_LOW);
-
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_DEVCTRL2 reg\n");
-               return val;
-       }
-       /* Set sleep state active high and allow device turn-off after PWRON long press */
-       val |= (DEVCTRL2_SLEEPSIG_POL_MASK | DEVCTRL2_PWON_LP_OFF_MASK);
-
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL2 reg\n");
-               return err;
-       }
-        #if 1
-       /* set PSKIP=0 */
-        val = tps65910_reg_read(tps65910, TPS65910_DCDCCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-
-       val &= ~DEVCTRL_DEV_OFF_MASK;
-       val &= ~DEVCTRL_DEV_SLP_MASK;
-        err = tps65910_reg_write(tps65910, TPS65910_DCDCCTRL, val);
-        if (err) {
-                printk(KERN_ERR "Unable to write TPS65910_DCDCCTRL reg\n");
-                return err;
-        }
-       #endif
-       /* Set the maxinum load current */
-       /* VDD1 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD1);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD1 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       val |= (0x07<<2);       //TSTEP[2:0] = 111 : 2.5 mV/|¨¬s(sampling 3 Mhz/5)
-       err = tps65910_reg_write(tps65910, TPS65910_VDD1, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD1 reg\n");
-               return err;
-       }
-
-       /* VDD2 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD2 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       err = tps65910_reg_write(tps65910, TPS65910_VDD2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD2 reg\n");
-               return err;
-       }
-
-       /* VIO */
-       val = tps65910_reg_read(tps65910, TPS65910_VIO);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VIO reg\n");
-               return -EIO;
-       }
-
-       val |= (1<<6);  //when 01: 1.0 A
-       err = tps65910_reg_write(tps65910, TPS65910_VIO, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VIO reg\n");
-               return err;
-       }
-       #if 1
-       /* Mask ALL interrupts */
-       err = tps65910_reg_write(tps65910,TPS65910_INT_MSK, 0xFF);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK reg\n");
-               return err;
-       }
-       
-       err = tps65910_reg_write(tps65910, TPS65910_INT_MSK2, 0x03);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK2 reg\n");
-               return err;
-       }
-
-       /* Set RTC Power, disable Smart Reflex in DEVCTRL_REG */
-       #if 1
-       val = 0;
-       val |= (DEVCTRL_SR_CTL_I2C_SEL_MASK);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL reg\n");
-               return err;
-       }
-       printk(KERN_INFO "TPS65910 Set default voltage.\n");
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%04x\n",__FUNCTION__,val);
-       }
-       #endif
-
-       #if 1
-       //sleep control register
-       /*set func when in sleep mode */
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= (1 << 1);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /* open ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_LDO_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val &= 0;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_LDO_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-               
-       /*set dc mode when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_RES_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val  |= 0xff;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_RES_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /*close ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_SET_LDO_OFF);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= 0x9B;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_SET_LDO_OFF, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%4x\n",__FUNCTION__,val);
-       }
-       #endif
-       #endif
-       
-       printk("%s,line=%d\n", __func__,__LINE__);
-       return 0;
-
-}
-void rk2928_usb_wifi_on(void)
-{
-       struct regulator *ldo;
-        ldo = regulator_get(NULL, "vmmc");  //vccio_wl
-       regulator_enable(ldo); 
-       printk("%s: vccio_wl enable\n", __func__);
-       regulator_put(ldo);
-       udelay(100);
-}
-EXPORT_SYMBOL(rk2928_usb_wifi_on);
-void rk2928_usb_wifi_off(void)
-{
-       struct regulator *ldo;
-        ldo = regulator_get(NULL, "vmmc");  //vccio_wl
-       printk("%s: vccio_wl disable\n", __func__);
-       regulator_disable(ldo); 
-       regulator_put(ldo);
-       udelay(100);
-}
-EXPORT_SYMBOL(rk2928_usb_wifi_off);
-
-
-int tps65910_post_init(struct tps65910 *tps65910)
-{
-       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
-       
-       dcdc = regulator_get(NULL, "vio");      //vcc_io
-       regulator_set_voltage(dcdc, 3300000, 3300000);
-       regulator_enable(dcdc);
-       printk("%s set vio vcc_io=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-        /*
-       ldo = regulator_get(NULL, "vpll");      // vcc25
-       regulator_set_voltage(ldo, 2500000, 2500000);
-       regulator_enable(ldo);
-       printk("%s set vpll vcc25=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        */
-       ldo = regulator_get(NULL, "vdig2");     // vdd12
-       regulator_set_voltage(ldo, 1200000, 1200000);
-       regulator_enable(ldo);
-       printk("%s set vdig2 vdd12=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux33");     //vcc_tp
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux33 vcc_tp=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd_cpu");  //vdd_cpu
-       regulator_set_voltage(dcdc, 1200000, 1200000);
-       regulator_enable(dcdc);
-       printk("%s set vdd1 vdd_cpu=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd2");     //vcc_ddr 
-       regulator_set_voltage(dcdc, 1200000, 1200000);  // 1.5*4/5 = 1.2 and Vout=1.5v
-       regulator_enable(dcdc);
-       printk("%s set vdd2 vcc_ddr=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       ldo = regulator_get(NULL, "vdig1");     //vcc18_cif
-       regulator_set_voltage(ldo, 1500000, 1500000);
-       regulator_enable(ldo);
-       printk("%s set vdig1 vcc18_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vaux1"); //vcc28_cif
-       regulator_set_voltage(dcdc,2800000,2800000);
-       regulator_enable(dcdc); 
-       printk("%s set vaux1 vcc28_cif=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux2");     //vcca33
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux2 vcca33=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        /*
-       ldo = regulator_get(NULL, "vdac"); // vccio_wl
-       regulator_set_voltage(ldo,1800000,1800000);
-       regulator_enable(ldo); 
-       printk("%s set vdac vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-        */
-       ldo = regulator_get(NULL, "vmmc");  //vccio_wl
-       regulator_set_voltage(ldo,3300000,3300000);
-       regulator_enable(ldo); 
-       printk("%s set vmmc vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_disable(ldo); 
-       regulator_put(ldo);
-       udelay(100);
-
-       printk("%s,line=%d END\n", __func__,__LINE__);
-       
-       return 0;
-}
-static struct regulator_consumer_supply tps65910_smps1_supply[] = {
-       {
-               .supply = "vdd1",
-       },
-       {
-               .supply = "vdd_cpu",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps2_supply[] = {
-       {
-               .supply = "vdd2",
-       },
-       
-};
-static struct regulator_consumer_supply tps65910_smps3_supply[] = {
-       {
-               .supply = "vdd3",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps4_supply[] = {
-       {
-               .supply = "vio",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo1_supply[] = {
-       {
-               .supply = "vdig1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo2_supply[] = {
-       {
-               .supply = "vdig2",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo3_supply[] = {
-       {
-               .supply = "vaux1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo4_supply[] = {
-       {
-               .supply = "vaux2",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo5_supply[] = {
-       {
-               .supply = "vaux33",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo6_supply[] = {
-       {
-               .supply = "vmmc",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo7_supply[] = {
-       {
-               .supply = "vdac",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo8_supply[] = {
-       {
-               .supply = "vpll",
-       },
-};
-
-static struct regulator_init_data tps65910_smps1 = {
-       .constraints = {
-               .name           = "VDD1",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps1_supply),
-       .consumer_supplies =  tps65910_smps1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps2 = {
-       .constraints = {
-               .name           = "VDD2",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps2_supply),
-       .consumer_supplies =  tps65910_smps2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps3 = {
-       .constraints = {
-               .name           = "VDD3",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1400000,
-               .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(tps65910_smps3_supply),
-       .consumer_supplies =  tps65910_smps3_supply,
-};
-
-static struct regulator_init_data tps65910_smps4 = {
-       .constraints = {
-               .name           = "VIO",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_smps4_supply),
-       .consumer_supplies =  tps65910_smps4_supply,
-};
-static struct regulator_init_data tps65910_ldo1 = {
-       .constraints = {
-               .name           = "VDIG1",
-               .min_uV                 = 1200000,
-               .max_uV                 = 2700000,
-               .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(tps65910_ldo1_supply),
-       .consumer_supplies =  tps65910_ldo1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo2 = {
-       .constraints = {
-               .name           = "VDIG2",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1800000,
-               .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(tps65910_ldo2_supply),
-       .consumer_supplies =  tps65910_ldo2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo3 = {
-       .constraints = {
-               .name           = "VAUX1",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo3_supply),
-       .consumer_supplies =  tps65910_ldo3_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo4 = {
-       .constraints = {
-               .name           = "VAUX2",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo4_supply),
-       .consumer_supplies =  tps65910_ldo4_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo5 = {
-       .constraints = {
-               .name           = "VAUX33",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo5_supply),
-       .consumer_supplies =  tps65910_ldo5_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo6 = {
-       .constraints = {
-               .name           = "VMMC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo6_supply),
-       .consumer_supplies =  tps65910_ldo6_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo7 = {
-       .constraints = {
-               .name           = "VDAC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 2850000,
-               .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(tps65910_ldo7_supply),
-       .consumer_supplies =  tps65910_ldo7_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo8 = {
-       .constraints = {
-               .name           = "VPLL",
-               .min_uV                 = 1000000,
-               .max_uV                 = 2500000,
-               .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(tps65910_ldo8_supply),
-       .consumer_supplies =  tps65910_ldo8_supply,
-};
-void __sramfunc board_pmu_suspend(void)
-{      
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT_HIGH, GPIO_SWPORTA_DR);  //set pmu_sleep output high
-}
-void __sramfunc board_pmu_resume(void)
-{
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO1_A1_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret & GPIO1_A1_OUTPUT_LOW, GPIO_SWPORTA_DR);   //set pmu_sleep output low
-       sram_udelay(2000);
-}
-static struct tps65910_board tps65910_data = {
-       .irq    = (unsigned)TPS65910_HOST_IRQ,          
-       .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS,
-       .gpio_base = TPS65910_GPIO_EXPANDER_BASE,
-       
-       .pre_init = tps65910_pre_init,
-       .post_init = tps65910_post_init,
-
-       //TPS65910_NUM_REGS = 13
-       // Regulators
-       .tps65910_pmic_init_data[TPS65910_REG_VRTC] = NULL,             
-       .tps65910_pmic_init_data[TPS65910_REG_VIO] = &tps65910_smps4,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD1] = &tps65910_smps1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD2] = &tps65910_smps2,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD3] = &tps65910_smps3,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG1] = &tps65910_ldo1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG2] = &tps65910_ldo2,
-       .tps65910_pmic_init_data[TPS65910_REG_VPLL] = &tps65910_ldo8,
-       .tps65910_pmic_init_data[TPS65910_REG_VDAC] = &tps65910_ldo7,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX1] = &tps65910_ldo3,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX2] = &tps65910_ldo4,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX33] = &tps65910_ldo5,
-       .tps65910_pmic_init_data[TPS65910_REG_VMMC] = &tps65910_ldo6,
-
-};
-
-#endif
-
index adb57ea35c0e17f355b86ce7edb94c318234348f..f54f719576f30f857b7056d9219c3698d30834ee 100755 (executable)
@@ -71,6 +71,8 @@
 #define RK30_FB0_MEM_SIZE 8*SZ_1M
 #endif
 
+int __sramdata g_pmic_type =  0;
+
 static struct spi_board_info board_spi_devices[] = {
 };
 
@@ -973,8 +975,6 @@ static  struct pmu_info  act8931_ldo_info[] = {
 #include "board-rk2928-sdk-act8931.c"
 #endif
 
-#endif
-
 static struct i2c_board_info __initdata i2c0_info[] = {
 #if defined (CONFIG_MFD_TPS65910)
        {
diff --git a/arch/arm/mach-rk2928/board-rk2928-tb-tps65910.c b/arch/arm/mach-rk2928/board-rk2928-tb-tps65910.c
deleted file mode 100755 (executable)
index 1a8773b..0000000
+++ /dev/null
@@ -1,620 +0,0 @@
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl.h>
-#include <linux/mfd/tps65910.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_MFD_TPS65910
-#define PMU_POWER_SLEEP RK2928_PIN3_PD2        
-extern int platform_device_register(struct platform_device *pdev);
-
-int tps65910_pre_init(struct tps65910 *tps65910){
-
-       int val = 0;
-       int i   = 0;
-       int err = -1;
-               
-       printk("%s,line=%d\n", __func__,__LINE__);      
-       gpio_request(PMU_POWER_SLEEP, "NULL");
-       gpio_direction_output(PMU_POWER_SLEEP, GPIO_LOW);
-
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_DEVCTRL2 reg\n");
-               return val;
-       }
-       /* Set sleep state active high and allow device turn-off after PWRON long press */
-       val |= (DEVCTRL2_SLEEPSIG_POL_MASK | DEVCTRL2_PWON_LP_OFF_MASK);
-
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL2 reg\n");
-               return err;
-       }
-        #if 1
-       /* set PSKIP=0 */
-        val = tps65910_reg_read(tps65910, TPS65910_DCDCCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-
-       val &= ~DEVCTRL_DEV_OFF_MASK;
-       val &= ~DEVCTRL_DEV_SLP_MASK;
-        err = tps65910_reg_write(tps65910, TPS65910_DCDCCTRL, val);
-        if (err) {
-                printk(KERN_ERR "Unable to write TPS65910_DCDCCTRL reg\n");
-                return err;
-        }
-       #endif
-       /* Set the maxinum load current */
-       /* VDD1 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD1);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD1 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       val |= (0x07<<2);       //TSTEP[2:0] = 111 : 2.5 mV/|¨¬s(sampling 3 Mhz/5)
-       err = tps65910_reg_write(tps65910, TPS65910_VDD1, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD1 reg\n");
-               return err;
-       }
-
-       /* VDD2 */
-       val = tps65910_reg_read(tps65910, TPS65910_VDD2);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VDD2 reg\n");
-               return val;
-       }
-
-       val |= (1<<5);          //when 1: 1.5 A
-       err = tps65910_reg_write(tps65910, TPS65910_VDD2, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VDD2 reg\n");
-               return err;
-       }
-
-       /* VIO */
-       val = tps65910_reg_read(tps65910, TPS65910_VIO);
-       if (val<0) {
-               printk(KERN_ERR "Unable to read TPS65910_VIO reg\n");
-               return -EIO;
-       }
-
-       val |= (1<<6);  //when 01: 1.0 A
-       err = tps65910_reg_write(tps65910, TPS65910_VIO, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_VIO reg\n");
-               return err;
-       }
-       #if 1
-       /* Mask ALL interrupts */
-       err = tps65910_reg_write(tps65910,TPS65910_INT_MSK, 0xFF);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK reg\n");
-               return err;
-       }
-       
-       err = tps65910_reg_write(tps65910, TPS65910_INT_MSK2, 0x03);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_INT_MSK2 reg\n");
-               return err;
-       }
-
-       /* Set RTC Power, disable Smart Reflex in DEVCTRL_REG */
-       #if 1
-       val = 0;
-       val |= (DEVCTRL_SR_CTL_I2C_SEL_MASK);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to write TPS65910_DEVCTRL reg\n");
-               return err;
-       }
-       printk(KERN_INFO "TPS65910 Set default voltage.\n");
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%04x\n",__FUNCTION__,val);
-       }
-       #endif
-
-       #if 1
-       //sleep control register
-       /*set func when in sleep mode */
-       val = tps65910_reg_read(tps65910, TPS65910_DEVCTRL);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= (1 << 1);
-       err = tps65910_reg_write(tps65910, TPS65910_DEVCTRL, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /* open ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_LDO_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val &= 0;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_LDO_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-               
-       /*set dc mode when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_KEEP_RES_ON);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val  |= 0xff;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_KEEP_RES_ON, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       /*close ldo when in sleep mode */
-        val = tps65910_reg_read(tps65910, TPS65910_SLEEP_SET_LDO_OFF);
-        if (val<0) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return val;
-        }
-       
-       val |= 0x9B;
-       err = tps65910_reg_write(tps65910, TPS65910_SLEEP_SET_LDO_OFF, val);
-       if (err) {
-               printk(KERN_ERR "Unable to read TPS65910 Reg at offset 0x%x= \
-                               \n", TPS65910_VDIG1);
-               return err;
-       }
-       
-       #endif
-       #if 0
-       //read sleep control register  for debug
-       for(i=0; i<6; i++)
-       {
-        err = tps65910_reg_read(tps65910, &val, TPS65910_DEVCTRL+i);
-        if (err) {
-                printk(KERN_ERR "Unable to read TPS65910_DCDCCTRL reg\n");
-                return -EIO;
-        }
-               else
-               printk("%s.......is  0x%4x\n",__FUNCTION__,val);
-       }
-       #endif
-       #endif
-       
-       printk("%s,line=%d\n", __func__,__LINE__);
-       return 0;
-
-}
-int tps65910_post_init(struct tps65910 *tps65910)
-{
-       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
-       
-       dcdc = regulator_get(NULL, "vio");      //vcc_io
-       regulator_set_voltage(dcdc, 3300000, 3300000);
-       regulator_enable(dcdc);
-       printk("%s set vio vcc_io=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vpll");      // vcc25
-       regulator_set_voltage(ldo, 2500000, 2500000);
-       regulator_enable(ldo);
-       printk("%s set vpll vcc25=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vdig2");     // vdd12
-       regulator_set_voltage(ldo, 1200000, 1200000);
-       regulator_enable(ldo);
-       printk("%s set vdig2 vdd12=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux33");     //vcc_tp
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux33 vcc_tp=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd_cpu");  //vdd_cpu
-       regulator_set_voltage(dcdc, 1200000, 1200000);
-       regulator_enable(dcdc);
-       printk("%s set vdd1 vdd_cpu=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vdd2");     //vcc_ddr 
-       regulator_set_voltage(dcdc, 1200000, 1200000);  // 1.5*4/5 = 1.2 and Vout=1.5v
-       regulator_enable(dcdc);
-       printk("%s set vdd2 vcc_ddr=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-       
-       ldo = regulator_get(NULL, "vdig1");     //vcc18_cif
-       regulator_set_voltage(ldo, 1800000, 1800000);
-       regulator_enable(ldo);
-       printk("%s set vdig1 vcc18_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-       
-       dcdc = regulator_get(NULL, "vaux1"); //vcc28_cif
-       regulator_set_voltage(dcdc,2800000,2800000);
-       regulator_enable(dcdc); 
-       printk("%s set vaux1 vcc28_cif=%dmV end\n", __func__, regulator_get_voltage(dcdc));
-       regulator_put(dcdc);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vaux2");     //vcca33
-       regulator_set_voltage(ldo, 3300000, 3300000);
-       regulator_enable(ldo);
-       printk("%s set vaux2 vcca33=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vdac"); // 
-       regulator_set_voltage(ldo,1800000,1800000);
-       regulator_enable(ldo); 
-       printk("%s set vdac =%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       ldo = regulator_get(NULL, "vmmc");  //vccio_wl
-       regulator_set_voltage(ldo,3300000,3300000);
-       regulator_enable(ldo); 
-       printk("%s set vmmc vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
-       regulator_put(ldo);
-       udelay(100);
-
-       printk("%s,line=%d END\n", __func__,__LINE__);
-       
-       return 0;
-}
-
-static struct regulator_consumer_supply tps65910_smps1_supply[] = {
-       {
-               .supply = "vdd1",
-       },
-       {
-               .supply = "vdd_cpu",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps2_supply[] = {
-       {
-               .supply = "vdd2",
-       },
-       
-};
-static struct regulator_consumer_supply tps65910_smps3_supply[] = {
-       {
-               .supply = "vdd3",
-       },
-};
-static struct regulator_consumer_supply tps65910_smps4_supply[] = {
-       {
-               .supply = "vio",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo1_supply[] = {
-       {
-               .supply = "vdig1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo2_supply[] = {
-       {
-               .supply = "vdig2",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo3_supply[] = {
-       {
-               .supply = "vaux1",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo4_supply[] = {
-       {
-               .supply = "vaux2",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo5_supply[] = {
-       {
-               .supply = "vaux33",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo6_supply[] = {
-       {
-               .supply = "vmmc",
-       },
-};
-static struct regulator_consumer_supply tps65910_ldo7_supply[] = {
-       {
-               .supply = "vdac",
-       },
-};
-
-static struct regulator_consumer_supply tps65910_ldo8_supply[] = {
-       {
-               .supply = "vpll",
-       },
-};
-
-static struct regulator_init_data tps65910_smps1 = {
-       .constraints = {
-               .name           = "VDD1",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps1_supply),
-       .consumer_supplies =  tps65910_smps1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps2 = {
-       .constraints = {
-               .name           = "VDD2",
-               .min_uV                 = 600000,
-               .max_uV                 = 1500000,
-               .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(tps65910_smps2_supply),
-       .consumer_supplies =  tps65910_smps2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_smps3 = {
-       .constraints = {
-               .name           = "VDD3",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1400000,
-               .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(tps65910_smps3_supply),
-       .consumer_supplies =  tps65910_smps3_supply,
-};
-
-static struct regulator_init_data tps65910_smps4 = {
-       .constraints = {
-               .name           = "VIO",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_smps4_supply),
-       .consumer_supplies =  tps65910_smps4_supply,
-};
-static struct regulator_init_data tps65910_ldo1 = {
-       .constraints = {
-               .name           = "VDIG1",
-               .min_uV                 = 1200000,
-               .max_uV                 = 2700000,
-               .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(tps65910_ldo1_supply),
-       .consumer_supplies =  tps65910_ldo1_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo2 = {
-       .constraints = {
-               .name           = "VDIG2",
-               .min_uV                 = 1000000,
-               .max_uV                 = 1800000,
-               .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(tps65910_ldo2_supply),
-       .consumer_supplies =  tps65910_ldo2_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo3 = {
-       .constraints = {
-               .name           = "VAUX1",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo3_supply),
-       .consumer_supplies =  tps65910_ldo3_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo4 = {
-       .constraints = {
-               .name           = "VAUX2",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo4_supply),
-       .consumer_supplies =  tps65910_ldo4_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo5 = {
-       .constraints = {
-               .name           = "VAUX33",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo5_supply),
-       .consumer_supplies =  tps65910_ldo5_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo6 = {
-       .constraints = {
-               .name           = "VMMC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 3300000,
-               .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(tps65910_ldo6_supply),
-       .consumer_supplies =  tps65910_ldo6_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo7 = {
-       .constraints = {
-               .name           = "VDAC",
-               .min_uV                 = 1800000,
-               .max_uV                 = 2850000,
-               .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(tps65910_ldo7_supply),
-       .consumer_supplies =  tps65910_ldo7_supply,
-};
-
-/* */
-static struct regulator_init_data tps65910_ldo8 = {
-       .constraints = {
-               .name           = "VPLL",
-               .min_uV                 = 1000000,
-               .max_uV                 = 2500000,
-               .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(tps65910_ldo8_supply),
-       .consumer_supplies =  tps65910_ldo8_supply,
-};
-
-void __sramfunc board_pmu_suspend(void)
-{      
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO3_D2_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret | GPIO3_D2_OUTPUT_HIGH, GPIO_SWPORTA_DR);  //set pmu_sleep output high
-}
-void __sramfunc board_pmu_resume(void)
-{
-       int ret;
-       ret = gpio_readl(GPIO_SWPORTA_DDR);
-       gpio_writel(ret | GPIO3_D2_OUTPUT, GPIO_SWPORTA_DDR);
-       ret = gpio_readl(GPIO_SWPORTA_DR);
-       gpio_writel(ret & GPIO3_D2_OUTPUT_LOW, GPIO_SWPORTA_DR);   //set pmu_sleep output low
-       sram_udelay(2000);
-}
-
-static struct tps65910_board tps65910_data = {
-       .irq    = (unsigned)TPS65910_HOST_IRQ,          
-       .irq_base = NR_GIC_IRQS + NR_GPIO_IRQS,
-       .gpio_base = TPS65910_GPIO_EXPANDER_BASE,
-       
-       .pre_init = tps65910_pre_init,
-       .post_init = tps65910_post_init,
-
-       //TPS65910_NUM_REGS = 13
-       // Regulators
-       .tps65910_pmic_init_data[TPS65910_REG_VRTC] = NULL,             
-       .tps65910_pmic_init_data[TPS65910_REG_VIO] = &tps65910_smps4,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD1] = &tps65910_smps1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD2] = &tps65910_smps2,
-       .tps65910_pmic_init_data[TPS65910_REG_VDD3] = &tps65910_smps3,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG1] = &tps65910_ldo1,
-       .tps65910_pmic_init_data[TPS65910_REG_VDIG2] = &tps65910_ldo2,
-       .tps65910_pmic_init_data[TPS65910_REG_VPLL] = &tps65910_ldo8,
-       .tps65910_pmic_init_data[TPS65910_REG_VDAC] = &tps65910_ldo7,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX1] = &tps65910_ldo3,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX2] = &tps65910_ldo4,
-       .tps65910_pmic_init_data[TPS65910_REG_VAUX33] = &tps65910_ldo5,
-       .tps65910_pmic_init_data[TPS65910_REG_VMMC] = &tps65910_ldo6,
-
-};
-
-#endif
-