X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpower%2Faxp221.c;h=65802e4a713f9eec76dfc41d18a0db048160544b;hb=009902a871dcb1ad60e746280372f47d90f65353;hp=1fda19ac01d020c8b5e6c34134d3c665754b5ab1;hpb=50e0d5e60b0a4c2c9de5ba332be1c36a31d728d3;p=u-boot

diff --git a/drivers/power/axp221.c b/drivers/power/axp221.c
index 1fda19ac01..65802e4a71 100644
--- a/drivers/power/axp221.c
+++ b/drivers/power/axp221.c
@@ -12,50 +12,8 @@
 
 #include <common.h>
 #include <errno.h>
-#include <asm/arch/p2wi.h>
-#include <asm/arch/rsb.h>
-#include <axp221.h>
-
-/*
- * The axp221 uses the p2wi bus, the axp223 is identical (for all registers
- * used sofar) but uses the rsb bus. These functions abstract this.
- */
-static int pmic_bus_init(void)
-{
-#ifdef CONFIG_MACH_SUN6I
-	p2wi_init();
-	return p2wi_change_to_p2wi_mode(AXP221_CHIP_ADDR, AXP221_CTRL_ADDR,
-					AXP221_INIT_DATA);
-#else
-	int ret;
-
-	rsb_init();
-
-	ret = rsb_set_device_mode(AXP223_DEVICE_MODE_DATA);
-	if (ret)
-		return ret;
-
-	return rsb_set_device_address(AXP223_DEVICE_ADDR, AXP223_RUNTIME_ADDR);
-#endif
-}
-
-static int pmic_bus_read(const u8 addr, u8 *data)
-{
-#ifdef CONFIG_MACH_SUN6I
-	return p2wi_read(addr, data);
-#else
-	return rsb_read(AXP223_RUNTIME_ADDR, addr, data);
-#endif
-}
-
-static int pmic_bus_write(const u8 addr, u8 data)
-{
-#ifdef CONFIG_MACH_SUN6I
-	return p2wi_write(addr, data);
-#else
-	return rsb_write(AXP223_RUNTIME_ADDR, addr, data);
-#endif
-}
+#include <asm/arch/pmic_bus.h>
+#include <axp_pmic.h>
 
 static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
@@ -67,242 +25,249 @@ static u8 axp221_mvolt_to_cfg(int mvolt, int min, int max, int div)
 	return (mvolt - min) / div;
 }
 
-static int axp221_setbits(u8 reg, u8 bits)
-{
-	int ret;
-	u8 val;
-
-	ret = pmic_bus_read(reg, &val);
-	if (ret)
-		return ret;
-
-	val |= bits;
-	return pmic_bus_write(reg, val);
-}
-
-static int axp221_clrbits(u8 reg, u8 bits)
-{
-	int ret;
-	u8 val;
-
-	ret = pmic_bus_read(reg, &val);
-	if (ret)
-		return ret;
-
-	val &= ~bits;
-	return pmic_bus_write(reg, val);
-}
-
-int axp221_set_dcdc1(unsigned int mvolt)
+int axp_set_dcdc1(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 1600, 3400, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_DCDC1_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_DCDC1_EN);
 
 	ret = pmic_bus_write(AXP221_DCDC1_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	ret = axp221_setbits(AXP221_OUTPUT_CTRL2,
-			     AXP221_OUTPUT_CTRL2_DCDC1SW_EN);
+	ret = pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+			       AXP221_OUTPUT_CTRL2_DCDC1SW_EN);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_DCDC1_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_DCDC1_EN);
 }
 
-int axp221_set_dcdc2(unsigned int mvolt)
+int axp_set_dcdc2(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_DCDC2_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_DCDC2_EN);
 
 	ret = pmic_bus_write(AXP221_DCDC2_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_DCDC2_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_DCDC2_EN);
 }
 
-int axp221_set_dcdc3(unsigned int mvolt)
+int axp_set_dcdc3(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1860, 20);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_DCDC3_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_DCDC3_EN);
 
 	ret = pmic_bus_write(AXP221_DCDC3_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_DCDC3_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_DCDC3_EN);
 }
 
-int axp221_set_dcdc4(unsigned int mvolt)
+int axp_set_dcdc4(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 600, 1540, 20);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_DCDC4_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_DCDC4_EN);
 
 	ret = pmic_bus_write(AXP221_DCDC4_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_DCDC4_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_DCDC4_EN);
 }
 
-int axp221_set_dcdc5(unsigned int mvolt)
+int axp_set_dcdc5(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 1000, 2550, 50);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_DCDC5_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_DCDC5_EN);
 
 	ret = pmic_bus_write(AXP221_DCDC5_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_DCDC5_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_DCDC5_EN);
 }
 
-int axp221_set_dldo1(unsigned int mvolt)
+int axp_set_dldo1(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL2,
-				      AXP221_OUTPUT_CTRL2_DLDO1_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+					AXP221_OUTPUT_CTRL2_DLDO1_EN);
 
 	ret = pmic_bus_write(AXP221_DLDO1_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL2,
-			      AXP221_OUTPUT_CTRL2_DLDO1_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+				AXP221_OUTPUT_CTRL2_DLDO1_EN);
 }
 
-int axp221_set_dldo2(unsigned int mvolt)
+int axp_set_dldo2(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL2,
-				      AXP221_OUTPUT_CTRL2_DLDO2_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+					AXP221_OUTPUT_CTRL2_DLDO2_EN);
 
 	ret = pmic_bus_write(AXP221_DLDO2_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL2,
-			      AXP221_OUTPUT_CTRL2_DLDO2_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+				AXP221_OUTPUT_CTRL2_DLDO2_EN);
 }
 
-int axp221_set_dldo3(unsigned int mvolt)
+int axp_set_dldo3(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL2,
-				      AXP221_OUTPUT_CTRL2_DLDO3_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+					AXP221_OUTPUT_CTRL2_DLDO3_EN);
 
 	ret = pmic_bus_write(AXP221_DLDO3_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL2,
-			      AXP221_OUTPUT_CTRL2_DLDO3_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+				AXP221_OUTPUT_CTRL2_DLDO3_EN);
 }
 
-int axp221_set_dldo4(unsigned int mvolt)
+int axp_set_dldo4(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL2,
-				      AXP221_OUTPUT_CTRL2_DLDO4_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2,
+					AXP221_OUTPUT_CTRL2_DLDO4_EN);
 
 	ret = pmic_bus_write(AXP221_DLDO4_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL2,
-			      AXP221_OUTPUT_CTRL2_DLDO4_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL2,
+				AXP221_OUTPUT_CTRL2_DLDO4_EN);
 }
 
-int axp221_set_aldo1(unsigned int mvolt)
+int axp_set_aldo1(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_ALDO1_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_ALDO1_EN);
 
 	ret = pmic_bus_write(AXP221_ALDO1_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_ALDO1_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_ALDO1_EN);
 }
 
-int axp221_set_aldo2(unsigned int mvolt)
+int axp_set_aldo2(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL1,
-				      AXP221_OUTPUT_CTRL1_ALDO2_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL1,
+					AXP221_OUTPUT_CTRL1_ALDO2_EN);
 
 	ret = pmic_bus_write(AXP221_ALDO2_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL1,
-			      AXP221_OUTPUT_CTRL1_ALDO2_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL1,
+				AXP221_OUTPUT_CTRL1_ALDO2_EN);
 }
 
-int axp221_set_aldo3(unsigned int mvolt)
+int axp_set_aldo3(unsigned int mvolt)
 {
 	int ret;
 	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
 
 	if (mvolt == 0)
-		return axp221_clrbits(AXP221_OUTPUT_CTRL3,
-				      AXP221_OUTPUT_CTRL3_ALDO3_EN);
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL3,
+					AXP221_OUTPUT_CTRL3_ALDO3_EN);
 
 	ret = pmic_bus_write(AXP221_ALDO3_CTRL, cfg);
 	if (ret)
 		return ret;
 
-	return axp221_setbits(AXP221_OUTPUT_CTRL3,
-			      AXP221_OUTPUT_CTRL3_ALDO3_EN);
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL3,
+				AXP221_OUTPUT_CTRL3_ALDO3_EN);
 }
 
-int axp221_init(void)
+int axp_set_eldo(int eldo_num, unsigned int mvolt)
+{
+	int ret;
+	u8 cfg = axp221_mvolt_to_cfg(mvolt, 700, 3300, 100);
+	u8 addr, bits;
+
+	switch (eldo_num) {
+	case 3:
+		addr = AXP221_ELDO3_CTRL;
+		bits = AXP221_OUTPUT_CTRL2_ELDO3_EN;
+		break;
+	case 2:
+		addr = AXP221_ELDO2_CTRL;
+		bits = AXP221_OUTPUT_CTRL2_ELDO2_EN;
+		break;
+	case 1:
+		addr = AXP221_ELDO1_CTRL;
+		bits = AXP221_OUTPUT_CTRL2_ELDO1_EN;
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP221_OUTPUT_CTRL2, bits);
+
+	ret = pmic_bus_write(addr, cfg);
+	if (ret)
+		return ret;
+
+	return pmic_bus_setbits(AXP221_OUTPUT_CTRL2, bits);
+}
+
+int axp_init(void)
 {
 	u8 axp_chip_id;
 	int ret;
@@ -321,12 +286,12 @@ int axp221_init(void)
 	return 0;
 }
 
-int axp221_get_sid(unsigned int *sid)
+int axp_get_sid(unsigned int *sid)
 {
 	u8 *dest = (u8 *)sid;
 	int i, ret;
 
-	ret = axp221_init();
+	ret = pmic_bus_init();
 	if (ret)
 		return ret;