X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fpower%2Faxp209.c;h=4b25ef25780e9112c02e3818e1ecffc96b2060cb;hb=640f4e35deccbea377f543737594753ff5a44d95;hp=5161bc14729e2a6b83dd4f1caaac5fb13eab4543;hpb=3f2f1a00394eb7ce7176f9d0930e40e55ba2c79c;p=u-boot

diff --git a/drivers/power/axp209.c b/drivers/power/axp209.c
index 5161bc1472..4b25ef2578 100644
--- a/drivers/power/axp209.c
+++ b/drivers/power/axp209.c
@@ -6,19 +6,9 @@
  */
 
 #include <common.h>
-#include <i2c.h>
-#include <asm/arch/gpio.h>
-#include <axp209.h>
-
-static int axp209_write(enum axp209_reg reg, u8 val)
-{
-	return i2c_write(0x34, reg, 1, &val, 1);
-}
-
-static int axp209_read(enum axp209_reg reg, u8 *val)
-{
-	return i2c_read(0x34, reg, 1, val, 1);
-}
+#include <command.h>
+#include <asm/arch/pmic_bus.h>
+#include <axp_pmic.h>
 
 static u8 axp209_mvolt_to_cfg(int mvolt, int min, int max, int div)
 {
@@ -30,22 +20,30 @@ static u8 axp209_mvolt_to_cfg(int mvolt, int min, int max, int div)
 	return (mvolt - min) / div;
 }
 
-int axp209_set_dcdc2(int mvolt)
+int axp_set_dcdc2(unsigned int mvolt)
 {
 	int rc;
 	u8 cfg, current;
 
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+					AXP209_OUTPUT_CTRL_DCDC2);
+
+	rc = pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_DCDC2);
+	if (rc)
+		return rc;
+
 	cfg = axp209_mvolt_to_cfg(mvolt, 700, 2275, 25);
 
 	/* Do we really need to be this gentle? It has built-in voltage slope */
-	while ((rc = axp209_read(AXP209_DCDC2_VOLTAGE, &current)) == 0 &&
+	while ((rc = pmic_bus_read(AXP209_DCDC2_VOLTAGE, &current)) == 0 &&
 	       current != cfg) {
 		if (current < cfg)
 			current++;
 		else
 			current--;
 
-		rc = axp209_write(AXP209_DCDC2_VOLTAGE, current);
+		rc = pmic_bus_write(AXP209_DCDC2_VOLTAGE, current);
 		if (rc)
 			break;
 	}
@@ -53,68 +51,106 @@ int axp209_set_dcdc2(int mvolt)
 	return rc;
 }
 
-int axp209_set_dcdc3(int mvolt)
+int axp_set_dcdc3(unsigned int mvolt)
 {
 	u8 cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
+	int rc;
 
-	return axp209_write(AXP209_DCDC3_VOLTAGE, cfg);
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+					AXP209_OUTPUT_CTRL_DCDC3);
+
+	rc = pmic_bus_write(AXP209_DCDC3_VOLTAGE, cfg);
+	if (rc)
+		return rc;
+
+	return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_DCDC3);
 }
 
-int axp209_set_ldo2(int mvolt)
+int axp_set_aldo2(unsigned int mvolt)
 {
 	int rc;
 	u8 cfg, reg;
 
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+					AXP209_OUTPUT_CTRL_LDO2);
+
 	cfg = axp209_mvolt_to_cfg(mvolt, 1800, 3300, 100);
 
-	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+	rc = pmic_bus_read(AXP209_LDO24_VOLTAGE, &reg);
 	if (rc)
 		return rc;
 
 	/* LDO2 configuration is in upper 4 bits */
 	reg = (reg & 0x0f) | (cfg << 4);
-	return axp209_write(AXP209_LDO24_VOLTAGE, reg);
+	rc = pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+	if (rc)
+		return rc;
+
+	return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO2);
 }
 
-int axp209_set_ldo3(int mvolt)
+int axp_set_aldo3(unsigned int mvolt)
 {
 	u8 cfg;
+	int rc;
+
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+					AXP209_OUTPUT_CTRL_LDO3);
 
 	if (mvolt == -1)
 		cfg = 0x80;	/* determined by LDO3IN pin */
 	else
 		cfg = axp209_mvolt_to_cfg(mvolt, 700, 3500, 25);
 
-	return axp209_write(AXP209_LDO3_VOLTAGE, cfg);
+	rc = pmic_bus_write(AXP209_LDO3_VOLTAGE, cfg);
+	if (rc)
+		return rc;
+
+	return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO3);
 }
 
-int axp209_set_ldo4(int mvolt)
+int axp_set_aldo4(unsigned int mvolt)
 {
 	int rc;
-	static const int vindex[] = {
+	static const unsigned int vindex[] = {
 		1250, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000, 2500,
 		2700, 2800, 3000, 3100, 3200, 3300
 	};
 	u8 cfg, reg;
 
+	if (mvolt == 0)
+		return pmic_bus_clrbits(AXP209_OUTPUT_CTRL,
+					AXP209_OUTPUT_CTRL_LDO4);
+
 	/* Translate mvolt to register cfg value, requested <= selected */
 	for (cfg = 15; vindex[cfg] > mvolt && cfg > 0; cfg--);
 
-	rc = axp209_read(AXP209_LDO24_VOLTAGE, &reg);
+	rc = pmic_bus_read(AXP209_LDO24_VOLTAGE, &reg);
 	if (rc)
 		return rc;
 
 	/* LDO4 configuration is in lower 4 bits */
 	reg = (reg & 0xf0) | (cfg << 0);
-	return axp209_write(AXP209_LDO24_VOLTAGE, reg);
+	rc = pmic_bus_write(AXP209_LDO24_VOLTAGE, reg);
+	if (rc)
+		return rc;
+
+	return pmic_bus_setbits(AXP209_OUTPUT_CTRL, AXP209_OUTPUT_CTRL_LDO4);
 }
 
-int axp209_init(void)
+int axp_init(void)
 {
 	u8 ver;
 	int i, rc;
 
-	rc = axp209_read(AXP209_CHIP_VERSION, &ver);
+	rc = pmic_bus_init();
+	if (rc)
+		return rc;
+
+	rc = pmic_bus_read(AXP209_CHIP_VERSION, &ver);
 	if (rc)
 		return rc;
 
@@ -122,36 +158,41 @@ int axp209_init(void)
 	ver &= 0x0f;
 
 	if (ver != 0x1)
-		return -1;
+		return -EINVAL;
 
 	/* Mask all interrupts */
 	for (i = AXP209_IRQ_ENABLE1; i <= AXP209_IRQ_ENABLE5; i++) {
-		rc = axp209_write(i, 0);
+		rc = pmic_bus_write(i, 0);
 		if (rc)
 			return rc;
 	}
 
-	return 0;
-}
+	/*
+	 * Turn off LDOIO regulators / tri-state GPIO pins, when rebooting
+	 * from android these are sometimes on.
+	 */
+	rc = pmic_bus_write(AXP_GPIO0_CTRL, AXP_GPIO_CTRL_INPUT);
+	if (rc)
+		return rc;
 
-int axp209_poweron_by_dc(void)
-{
-	u8 v;
+	rc = pmic_bus_write(AXP_GPIO1_CTRL, AXP_GPIO_CTRL_INPUT);
+	if (rc)
+		return rc;
 
-	if (axp209_read(AXP209_POWER_STATUS, &v))
-		return 0;
+	rc = pmic_bus_write(AXP_GPIO2_CTRL, AXP_GPIO_CTRL_INPUT);
+	if (rc)
+		return rc;
 
-	return (v & AXP209_POWER_STATUS_ON_BY_DC);
+	return 0;
 }
 
-int axp209_power_button(void)
+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-	u8 v;
+	pmic_bus_write(AXP209_SHUTDOWN, AXP209_POWEROFF);
 
-	if (axp209_read(AXP209_IRQ_STATUS5, &v))
-		return 0;
+	/* infinite loop during shutdown */
+	while (1) {}
 
-	axp209_write(AXP209_IRQ_STATUS5, AXP209_IRQ5_PEK_DOWN);
-
-	return v & AXP209_IRQ5_PEK_DOWN;
+	/* not reached */
+	return 0;
 }