From ad5586b9861ac499a885c415836937e9260af44d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=BC=A0=E6=99=B4?= Date: Tue, 2 Apr 2013 17:22:51 +0800 Subject: [PATCH] rk808:support pmu rk808 vbat low detect --- arch/arm/mach-rk30/board-pmu-rk808.c | 3 --- drivers/mfd/rk808.c | 11 ++++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-rk30/board-pmu-rk808.c b/arch/arm/mach-rk30/board-pmu-rk808.c index b24fd80a5b13..d2e05f055df2 100755 --- a/arch/arm/mach-rk30/board-pmu-rk808.c +++ b/arch/arm/mach-rk30/board-pmu-rk808.c @@ -11,9 +11,6 @@ static int rk808_pre_init(struct rk808 *rk808) { - struct regulator *dcdc; - struct regulator *ldo; - int i = 0; int ret,val; printk("%s,line=%d\n", __func__,__LINE__); /***********set buck 12.5mv/us ************/ diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index 09e8b909ab92..6f921142b642 100755 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -729,14 +729,14 @@ int rk808_clear_bits(struct rk808 *rk808, u8 reg, u8 mask) mutex_lock(&rk808->io_lock); err = rk808_i2c_read(rk808, reg, 1, &data); - if (err) { + if (err <0) { dev_err(rk808->dev, "read from reg %x failed\n", reg); goto out; } data &= ~mask; - err = rk808_i2c_write(rk808, reg, 1, &data); - if (err) + err = rk808_i2c_write(rk808, reg, 1, data); + if (err <0) dev_err(rk808->dev, "write to reg %x failed\n", reg); out: @@ -923,11 +923,12 @@ error: return err; } +extern void rk28_send_wakeup_key(void); static irqreturn_t rk808_vbat_lo_irq(int irq, void *data) { -// rk28_send_wakeup_key(); printk("rk808 vbat low %s:irq=%d\n",__func__,irq); rk808_set_bits(g_rk808,0x4c,(0x1 << 1),(0x1 <<1)); + rk28_send_wakeup_key(); return IRQ_HANDLED; } @@ -940,7 +941,7 @@ int rk808_device_shutdown(void) printk("%s\n",__func__); ret = rk808_reg_read(rk808,RK808_DEVCTRL_REG); - ret = rk808_set_bits(rk808, RK808_DEVCTRL_REG,(0x1<<0),(0x1<<0)); + ret = rk808_set_bits(rk808, RK808_DEVCTRL_REG,(0x1<<3),(0x1<<3)); // ret = rk808_set_bits(rk808, RK808_DEVCTRL_REG,(0x1<<4),(0x1<<4)); if (ret < 0) { printk("rk808 power off error!\n"); -- 2.34.1