From 1bf80d5c3f7ac14051d40bfb784451601d4a69f5 Mon Sep 17 00:00:00 2001
From: xxx <xxx@rock-chips.com>
Date: Wed, 31 Jul 2013 09:26:53 +0800
Subject: [PATCH] pm_test:clk_volt.c,fix info help

---
 arch/arm/plat-rk/rk_pm_tests/clk_volt.c | 52 +++++++++++++++++++------
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/arch/arm/plat-rk/rk_pm_tests/clk_volt.c b/arch/arm/plat-rk/rk_pm_tests/clk_volt.c
index ef4e7a4a10f8..62ab98f59e8f 100644
--- a/arch/arm/plat-rk/rk_pm_tests/clk_volt.c
+++ b/arch/arm/plat-rk/rk_pm_tests/clk_volt.c
@@ -27,32 +27,62 @@ ssize_t clk_volt_show(struct kobject *kobj, struct kobj_attribute *attr,
 		char *buf)
 {
 	char *str = buf;
-	str += sprintf(str, "[regulaotr_name]	[voltage(uV)]\n");
+	str += sprintf(str, "usage:\n");
+	str += sprintf(str, "get voltage:get [regulaotr_name]\n");
+	str += sprintf(str, "set voltage:set [regulaotr_name] [voltage(uV)]\n");
+	str += sprintf(str, "set suspend voltage:set [regulaotr_name] [voltage(uV)+1]\n");
 	if (str != buf)
 		*(str - 1) = '\n';
 	return (str - buf);
 
 }
 
+#define SET_SUSPEND_VOLT_FLAG	(1<<0)
+
 ssize_t clk_volt_store(struct kobject *kobj, struct kobj_attribute *attr,
 		const char *buf, size_t n)
 {
-	char regulator_name[20];
+	char cmd[20], regulator_name[20];
 	unsigned int volt;
 	int ret = 0;
+	int need_put_regulator=0;
 	struct regulator *regulator;
-	
-	sscanf(buf, "%s %u", regulator_name, &volt);
-	
+
+	sscanf(buf, "%s %s %u", cmd, regulator_name, &volt);
+
 	regulator = dvfs_get_regulator(regulator_name);
-	if (IS_ERR(regulator)) {
-		PM_ERR("%s get dvfs_regulator %s error\n", __func__, regulator_name);
-		return n;
-	}
+	if (IS_ERR_OR_NULL(regulator)) {
+		regulator = regulator_get(NULL, regulator_name);
+		if (IS_ERR(regulator)){
+			PM_ERR("%s get dvfs_regulator %s error\n", __func__, regulator_name);
+			return n;
+		}
+		need_put_regulator = 1;
+	}	
 
-	ret = regulator_set_voltage(regulator, volt, volt); 
-	PM_DBG("ret = %d\n", ret);
+	if (0 == strncmp(cmd, "set", strlen("set"))){
+		if (volt & SET_SUSPEND_VOLT_FLAG){
+			volt &= ~SET_SUSPEND_VOLT_FLAG;
+			ret = regulator_set_suspend_voltage(regulator, volt); 
+			if (!ret)
+				printk("set %s suspend volt to %uuV ok\n", regulator_name, volt);
+			else
+				printk("regulator_set_suspend_voltage err:%d\n", ret);
+		}else{
+			ret = regulator_set_voltage(regulator, volt, volt); 
+			if (!ret)
+				printk("set %s volt to %uuV ok\n", regulator_name, regulator_get_voltage(regulator));
+			else
+				printk("regulator_set_voltage err:%d\n", ret);
+		}
+		
+	}
+	if (0 == strncmp(cmd, "get", strlen("get"))){
+		printk("%s:%duV\n", regulator_name, regulator_get_voltage(regulator));
+	}
 
+	if (need_put_regulator)
+		regulator_put(regulator);
 
 //	if (0 == strncmp(cmd, "enable", strlen("enable"))) {
 	return n;
-- 
2.34.1