pmic: rk818: modify shutdown function and fix compile errors

1. Modify the rk818 shutdown function refering to rk808.
2. Fix some compile errors.

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 44eac5114383ee390c146950883f8fdba327b211..8fd1c29eccfa4e281b5cfefa8645b3b8c0e2a7bc 100755 (executable)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -362,7 +362,7 @@ config MFD_RK818
        bool "RK818 Power Management chip"
        depends on I2C=y 
        select MFD_CORE
-       select RTC_RK818
+       select RK818_RTC
        help
          if you say yes here you get support for the RK818 series of
          Power Management chips.

diff --git a/drivers/mfd/rk818.c b/drivers/mfd/rk818.c
index 13ebe3fec977ceaf2c543483e4adf886d59621f9..591ff2f9016e0857fe332b68542a09987db81b2d 100755 (executable)
--- a/drivers/mfd/rk818.c
+++ b/drivers/mfd/rk818.c
@@ -29,6 +29,7 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/regmap.h>
+#include <linux/syscore_ops.h>
 
 
 #if 0
@@ -471,7 +472,7 @@ static int rk818_dcdc_set_voltage(struct regulator_dev *dev,
        struct rk818 *rk818 = rdev_get_drvdata(dev);
        int buck = rdev_get_id(dev) - RK818_DCDC1;
        u16 val;
-       int ret = 0,old_voltage =0,vol_temp =0;
+       int ret = 0;
 
        if (buck ==2){
                return 0;
@@ -937,6 +938,7 @@ static struct rk818_attribute rk818_attrs[] = {
 };
 #endif
 
+#if 0
 extern void rk_send_wakeup_key(void);
 static irqreturn_t rk818_vbat_lo_irq(int irq, void *data)
 {
@@ -945,6 +947,7 @@ static irqreturn_t rk818_vbat_lo_irq(int irq, void *data)
        rk_send_wakeup_key();
         return IRQ_HANDLED;
 }
+#endif
 
 #ifdef CONFIG_OF
 static struct of_device_id rk818_of_match[] = {
@@ -1031,23 +1034,41 @@ static struct rk818_board *rk818_parse_dt(struct i2c_client *i2c)
 }
 #endif
 
-int rk818_device_shutdown(void)
+static void rk818_shutdown(void)
 {
        int ret;
-       int err = -1;
        struct rk818 *rk818 = g_rk818;
-       
-       printk("%s\n",__func__);
+
+       pr_info("%s\n", __func__);
        ret = rk818_set_bits(rk818, RK818_INT_STS_MSK_REG1,(0x3<<5),(0x3<<5)); //close rtc int when power off
        ret = rk818_clear_bits(rk818, RK818_RTC_INT_REG,(0x3<<2)); //close rtc int when power off
-       ret = rk818_reg_read(rk818,RK818_DEVCTRL_REG);
-       ret = rk818_set_bits(rk818, RK818_DEVCTRL_REG,(0x1<<0),(0x1<<0));
-//     ret = rk818_set_bits(rk818, RK818_DEVCTRL_REG,(0x1<<4),(0x1<<4));
-       if (ret < 0) {
-               printk("rk818 power off error!\n");
-               return err;
+       mutex_lock(&rk818->io_lock);
+       mdelay(100);
+}
+
+static struct syscore_ops rk818_syscore_ops = {
+       .shutdown = rk818_shutdown,
+};
+
+void rk818_device_shutdown(void)
+{
+       int ret, i;
+       u8 reg = 0;
+       struct rk818 *rk818 = g_rk818;
+
+       for (i = 0; i < 10; i++) {
+               pr_info("%s\n", __func__);
+               ret = rk818_i2c_read(rk818, RK818_DEVCTRL_REG, 1, &reg);
+               if (ret < 0)
+                       continue;
+               ret = rk818_i2c_write(rk818, RK818_DEVCTRL_REG, 1,
+                                    (reg | (0x1 << 0)));
+               if (ret < 0) {
+                       pr_err("rk818 power off error!\n");
+                       continue;
+               }
        }
-       return 0;       
+       while(1) wfi();
 }
 EXPORT_SYMBOL_GPL(rk818_device_shutdown);
 
@@ -1137,7 +1158,7 @@ static int  rk818_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *
        struct regulator_dev *rk818_rdev;
        struct regulator_init_data *reg_data;
        const char *rail_name = NULL;
-       int ret,vlow_irq,i=0;
+       int ret, i = 0;
        
        printk("%s,line=%d\n", __func__,__LINE__);
 
@@ -1264,6 +1285,8 @@ static int  rk818_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *
        }
        #endif
        
+       register_syscore_ops(&rk818_syscore_ops);
+
        return 0;
 
 err:
@@ -1277,6 +1300,7 @@ static int  rk818_i2c_remove(struct i2c_client *i2c)
        struct rk818 *rk818 = i2c_get_clientdata(i2c);
        int i;
 
+       unregister_syscore_ops(&rk818_syscore_ops);
        for (i = 0; i < rk818->num_regulators; i++)
                if (rk818->rdev[i])
                        regulator_unregister(rk818->rdev[i]);

diff --git a/drivers/rtc/rtc-rk818.c b/drivers/rtc/rtc-rk818.c
index c61047d0ab439449c9a4417419a78251eff44ceb..5ad4cb66787b1c13b4de9531771178d136a20b24 100755 (executable)
--- a/drivers/rtc/rtc-rk818.c
+++ b/drivers/rtc/rtc-rk818.c
@@ -77,7 +77,7 @@ static int rk818_rtc_readtime(struct device *dev, struct rtc_time *tm)
        struct rk818_rtc *rk818_rtc = dev_get_drvdata(dev);
        struct rk818 *rk818 = rk818_rtc->rk818;
        int ret;
-       int count = 0;
+       //int count = 0;
        unsigned char rtc_data[ALL_TIME_REGS + 1];
        u8 rtc_ctl;
 
@@ -379,6 +379,7 @@ static int rk818_rtc_update_irq_enable(struct device *dev,
  * bit 2: every hour
  * bit 3: every day
  */
+#if 0
 static int rk818_rtc_irq_set_freq(struct device *dev, int freq)
 {      
        struct rk818_rtc *rk818_rtc = dev_get_drvdata(dev);
@@ -404,6 +405,7 @@ static int rk818_rtc_irq_set_freq(struct device *dev, int freq)
        
        return ret;
 }
+#endif
 
 static irqreturn_t rk818_alm_irq(int irq, void *data)
 {

diff --git a/include/linux/mfd/rk818.h b/include/linux/mfd/rk818.h
index 02022044d2bceca97d5d4847b6758d23a9d68eb7..02aedd151d08006cccb28b62a75c33106c237289 100755 (executable)
--- a/include/linux/mfd/rk818.h
+++ b/include/linux/mfd/rk818.h
@@ -194,7 +194,7 @@ int rk818_bulk_read(struct rk818 *rk818, u8 reg,
                     int count, u8 *buf);
 int rk818_bulk_write(struct rk818 *rk818, u8 reg,
                     int count, u8 *buf);
-int rk818_device_shutdown(void);
+void rk818_device_shutdown(void);
 
 #endif