From: lw@rock-chips.com <lw@rock-chips.com>
Date: Fri, 27 Jul 2012 11:28:51 +0000 (+0800)
Subject: phonepad:modify arm voltage to 1.2V
X-Git-Tag: firefly_0821_release~8969
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=722b83e94d36905226620af2852403f029c11587;p=firefly-linux-kernel-4.4.55.git

phonepad:modify arm voltage to 1.2V
---

diff --git a/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c b/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c
index 8dab97f530e8..7fba896d5926 100755
--- a/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c
+++ b/arch/arm/mach-rk30/board-rk30-sdk-tps65910.c
@@ -255,26 +255,26 @@ int tps65910_post_init(struct tps65910 *tps65910)
 	ldo = regulator_get(NULL, "vdig2");	// vdd11
 	regulator_set_voltage(ldo, 1100000, 1100000);
 	regulator_enable(ldo);
-	printk("%s set vdig2 vdd11_hdmi=%dmV end\n", __func__, regulator_get_voltage(ldo));
+	printk("%s set vdig2 vdd11=%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 vcc33=%dmV end\n", __func__, regulator_get_voltage(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, 1100000, 1100000);
+	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, 1500000, 1500000);
+	
+	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);
@@ -283,14 +283,14 @@ int tps65910_post_init(struct tps65910 *tps65910)
 	ldo = regulator_get(NULL, "vdig1");	//vcc18_cif
 	regulator_set_voltage(ldo, 1800000, 1800000);
 	regulator_enable(ldo);
-	printk("%s set vdig1 vccio_wl=%dmV end\n", __func__, regulator_get_voltage(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"); //vcc25_hdmi
 	regulator_set_voltage(dcdc,2500000,2500000);
 	regulator_enable(dcdc); 
-	printk("%s set vaux1 vcc25=%dmV end\n", __func__, regulator_get_voltage(dcdc));
+	printk("%s set vaux1 vcc25_hdmi=%dmV end\n", __func__, regulator_get_voltage(dcdc));
 	regulator_put(dcdc);
 	udelay(100);
 
@@ -304,7 +304,7 @@ int tps65910_post_init(struct tps65910 *tps65910)
 	ldo = regulator_get(NULL, "vdac"); // vccio_wl
 	regulator_set_voltage(ldo,1800000,1800000);
 	regulator_enable(ldo); 
-	printk("%s set vdac vcc18_cif=%dmV end\n", __func__, regulator_get_voltage(ldo));
+	printk("%s set vdac vccio_wl=%dmV end\n", __func__, regulator_get_voltage(ldo));
 	regulator_put(ldo);
 	udelay(100);
 
diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
old mode 100644
new mode 100755
index a5a7b3cf2700..1f3d30a938ec
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -45,7 +45,6 @@ static int tps65910_i2c_read(struct tps65910 *tps65910, u8 reg,
 	struct i2c_msg xfer[2];
 	int ret;
 	
-	//printk("%s:reg=0x%x,value=%d\n",__func__,reg,*(char *)dest);
 
 	/* Write register */
 	xfer[0].addr = i2c->addr;
@@ -62,6 +61,7 @@ static int tps65910_i2c_read(struct tps65910 *tps65910, u8 reg,
 	xfer[1].scl_rate = 200*1000;
 
 	ret = i2c_transfer(i2c->adapter, xfer, 2);
+	//printk("%s:reg=0x%x,value=0x%x\n",__func__,reg,*(char *)dest);
 	if (ret == 2)
 		ret = 0;
 	else if (ret >= 0)
@@ -81,7 +81,7 @@ static int tps65910_i2c_write(struct tps65910 *tps65910, u8 reg,
 	if (bytes > TPS65910_MAX_REGISTER)
 		return -EINVAL;
 
-	//printk("%s:reg=0x%x,value=%d\n",__func__,reg,*(char *)&src);
+	//printk("%s:reg=0x%x,value=0x%x\n",__func__,reg,*(char *)&src);
 	
 	msg[0] = reg;
 	memcpy(&msg[1], src, bytes);