From 5838137546170631a70094fe3f8aee45754b8f78 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E5=BC=A0=E6=99=B4?= <zhangqing@rock-chips.com>
Date: Mon, 25 Mar 2013 17:44:44 +0800
Subject: [PATCH] rk808:support pmu rk808 sleep mode

---
 arch/arm/mach-rk30/board-pmu-rk808.c |  1 -
 drivers/mfd/rk808-irq.c              |  7 ++-----
 drivers/mfd/rk808.c                  | 14 +++++---------
 drivers/rtc/rtc-rk808.c              |  6 ++----
 include/linux/mfd/rk808.h            |  2 --
 5 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/arch/arm/mach-rk30/board-pmu-rk808.c b/arch/arm/mach-rk30/board-pmu-rk808.c
index 63ab3077ea30..b24fd80a5b13 100755
--- a/arch/arm/mach-rk30/board-pmu-rk808.c
+++ b/arch/arm/mach-rk30/board-pmu-rk808.c
@@ -520,7 +520,6 @@ void __sramfunc board_pmu_rk808_suspend(void)
 {	
 	#ifdef CONFIG_CLK_SWITCH_TO_32K
 	 sram_gpio_set_value(pmic_sleep, GPIO_HIGH);  
-	while(1);
 	#endif
 }
 void __sramfunc board_pmu_rk808_resume(void)
diff --git a/drivers/mfd/rk808-irq.c b/drivers/mfd/rk808-irq.c
index 416ad5de79c7..229a968f7e71 100755
--- a/drivers/mfd/rk808-irq.c
+++ b/drivers/mfd/rk808-irq.c
@@ -1,10 +1,7 @@
 /*
- * rk808-irq.c  --  TI TPS6591x
+ * rk808-irq.c 
  *
- * Copyright 2010 Texas Instruments Inc.
- *
- * Author: Graeme Gregory <gg@slimlogic.co.uk>
- * Author: Jorge Eduardo Candelaria <jedu@slimlogic.co.uk>
+ * Author: 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 as published by the
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 9d261131bbda..09e8b909ab92 100755
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -1,8 +1,6 @@
 /*
- * Regulator driver for Active-semi rk808 PMIC chip for rk29xx
+ * Regulator driver for rk808 PMIC chip for rk31xx
  *
- * Copyright (C) 2010, 2011 ROCKCHIP, Inc.
-
  * Based on rk808.c that is work by zhangqing<zhangqing@rock-chips.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -752,9 +750,8 @@ int rk808_bulk_read(struct rk808 *rk808, u8 reg,
 {
 	int ret;
                     
-//#if defined(CONFIG_MFD_RK610)    
-#if 0 
-	int i;             //Solve communication conflict when rk610 and 65910 on the same i2c 
+#if defined(CONFIG_MFD_RK610)    
+	int i;             //Solve communication conflict when rk610 and 808 on the same i2c 
 
 	mutex_lock(&rk808->io_lock);
 	for(i=0; i<count; i++){
@@ -785,9 +782,8 @@ int rk808_bulk_write(struct rk808 *rk808, u8 reg,
 {
 	int ret;
 	
-//#if defined(CONFIG_MFD_RK610)    
-#if 0
-	int i;       // //Solve communication conflict when rk610 and 65910 on the same i2c 
+#if defined(CONFIG_MFD_RK610)    
+	int i;       // //Solve communication conflict when rk610 and 808 on the same i2c 
 
 	mutex_lock(&rk808->io_lock);
 	for(i=0; i<count; i++){
diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c
index 9f494e335823..8f1b579e3ba3 100755
--- a/drivers/rtc/rtc-rk808.c
+++ b/drivers/rtc/rtc-rk808.c
@@ -1,9 +1,7 @@
 /*
- *	Real Time Clock driver for Wolfson Microelectronics rk808
+ *	Real Time Clock driver for  rk808
  *
- *	Copyright (C) 2009 Wolfson Microelectronics PLC.
- *
- *  Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
+ *  Author: 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 as published by the
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index aff110a6f527..374dc2c53e08 100755
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -1,6 +1,4 @@
 /* include/linux/regulator/rk808.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
-- 
2.34.1