ARMV7: Add support for the TWL6030 I2C power chip used in OMAP4 systems

This patch add the basic infrastructure for the TWL6030 driver and enables
support in the two existing OMAP4 boards, Panda and OMAP4430 SDP

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index dd0651466fd990b14e86731915fe92208def325b..db5317383790f393337ad999b3ef0a58e801db46 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -26,6 +26,7 @@ include $(TOPDIR)/config.mk
 LIB    := $(obj)libpower.a
 
 COBJS-$(CONFIG_TWL4030_POWER)  += twl4030.o
+COBJS-$(CONFIG_TWL6030_POWER)  += twl6030.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)

diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c
new file mode 100644 (file)
index 0000000..cf1da6b
--- /dev/null
+++ b/drivers/power/twl6030.c
@@ -0,0 +1,78 @@
+/*
+ * (C) Copyright 2010
+ * Texas Instruments, <www.ti.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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 Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+#include <config.h>
+#ifdef CONFIG_TWL6030_POWER
+
+#include <twl6030.h>
+
+/* Functions to read and write from TWL6030 */
+static inline int twl6030_i2c_write_u8(u8 chip_no, u8 val, u8 reg)
+{
+       return i2c_write(chip_no, reg, 1, &val, 1);
+}
+
+static inline int twl6030_i2c_read_u8(u8 chip_no, u8 *val, u8 reg)
+{
+       return i2c_read(chip_no, reg, 1, val, 1);
+}
+
+void twl6030_start_usb_charging(void)
+{
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CHARGERUSB_VICHRG_1500,
+                                                       CHARGERUSB_VICHRG);
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CHARGERUSB_CIN_LIMIT_NONE,
+                                                       CHARGERUSB_CINLIMIT);
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, MBAT_TEMP,
+                                                       CONTROLLER_INT_MASK);
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, MASK_MCHARGERUSB_THMREG,
+                                                       CHARGERUSB_INT_MASK);
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CHARGERUSB_VOREG_4P0,
+                                                       CHARGERUSB_VOREG);
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CHARGERUSB_CTRL2_VITERM_100,
+                                                       CHARGERUSB_CTRL2);
+       /* Enable USB charging */
+       twl6030_i2c_write_u8(TWL6030_CHIP_CHARGER, CONTROLLER_CTRL1_EN_CHARGER,
+                                                       CONTROLLER_CTRL1);
+       return;
+}
+
+void twl6030_init_battery_charging(void)
+{
+       twl6030_start_usb_charging();
+       return;
+}
+
+void twl6030_usb_device_settings()
+{
+       u8 data = 0;
+
+       /* Select APP Group and set state to ON */
+       twl6030_i2c_write_u8(TWL6030_CHIP_PM, 0x21, VUSB_CFG_STATE);
+
+       twl6030_i2c_read_u8(TWL6030_CHIP_PM, &data, MISC2);
+       data |= 0x10;
+
+       /* Select the input supply for VBUS regulator */
+       twl6030_i2c_write_u8(TWL6030_CHIP_PM, data, MISC2);
+}
+#endif

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 0fb1ad30d283f2ac71cd2e401277a7afe38bca56..4bec00bf0edafceed146d60dbeec12f6d63cbf8d 100644 (file)
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -103,6 +103,9 @@
 #define CONFIG_DRIVER_OMAP34XX_I2C     1
 #define CONFIG_I2C_MULTI_BUS           1
 
+/* TWL6030 */
+#define CONFIG_TWL6030_POWER           1
+
 /* MMC */
 #define CONFIG_MMC                     1
 #define CONFIG_OMAP3_MMC               1

diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h
index ef5272b494debaff2254da47062abee4c62874bd..c18e71a3c23fbac9a4cfbb150fb032c28f11d638 100644 (file)
--- a/include/configs/omap4_sdp4430.h
+++ b/include/configs/omap4_sdp4430.h
@@ -104,6 +104,9 @@
 #define CONFIG_DRIVER_OMAP34XX_I2C     1
 #define CONFIG_I2C_MULTI_BUS           1
 
+/* TWL6030 */
+#define CONFIG_TWL6030_POWER           1
+
 /* MMC */
 #define CONFIG_MMC                     1
 #define CONFIG_OMAP3_MMC               1

diff --git a/include/twl6030.h b/include/twl6030.h
new file mode 100644 (file)
index 0000000..54923ab
--- /dev/null
+++ b/include/twl6030.h
@@ -0,0 +1,91 @@
+/*
+ * (C) Copyright 2010
+ * Texas Instruments, <www.ti.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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 Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <common.h>
+#include <i2c.h>
+
+/* I2C chip addresses */
+#define TWL6030_CHIP_PM                0x48
+
+#define TWL6030_CHIP_USB       0x49
+#define TWL6030_CHIP_ADC       0x49
+#define TWL6030_CHIP_CHARGER   0x49
+#define TWL6030_CHIP_PWM       0x49
+
+/* Battery CHARGER REGISTERS */
+#define CONTROLLER_INT_MASK    0xE0
+#define CONTROLLER_CTRL1       0xE1
+#define CONTROLLER_WDG         0xE2
+#define CONTROLLER_STAT1       0xE3
+#define CHARGERUSB_INT_STATUS  0xE4
+#define CHARGERUSB_INT_MASK    0xE5
+#define CHARGERUSB_STATUS_INT1 0xE6
+#define CHARGERUSB_STATUS_INT2 0xE7
+#define CHARGERUSB_CTRL1       0xE8
+#define CHARGERUSB_CTRL2       0xE9
+#define CHARGERUSB_CTRL3       0xEA
+#define CHARGERUSB_STAT1       0xEB
+#define CHARGERUSB_VOREG       0xEC
+#define CHARGERUSB_VICHRG      0xED
+#define CHARGERUSB_CINLIMIT    0xEE
+#define CHARGERUSB_CTRLLIMIT1  0xEF
+
+/* CHARGERUSB_VICHRG */
+#define CHARGERUSB_VICHRG_500          0x4
+#define CHARGERUSB_VICHRG_1500         0xE
+/* CHARGERUSB_CINLIMIT */
+#define CHARGERUSB_CIN_LIMIT_100       0x1
+#define CHARGERUSB_CIN_LIMIT_300       0x5
+#define CHARGERUSB_CIN_LIMIT_500       0x9
+#define CHARGERUSB_CIN_LIMIT_NONE      0xF
+/* CONTROLLER_INT_MASK */
+#define MVAC_FAULT             (1 << 6)
+#define MAC_EOC                        (1 << 5)
+#define MBAT_REMOVED           (1 << 4)
+#define MFAULT_WDG             (1 << 3)
+#define MBAT_TEMP              (1 << 2)
+#define MVBUS_DET              (1 << 1)
+#define MVAC_DET               (1 << 0)
+/* CHARGERUSB_INT_MASK */
+#define MASK_MCURRENT_TERM             (1 << 3)
+#define MASK_MCHARGERUSB_STAT          (1 << 2)
+#define MASK_MCHARGERUSB_THMREG                (1 << 1)
+#define MASK_MCHARGERUSB_FAULT         (1 << 0)
+/* CHARGERUSB_VOREG */
+#define CHARGERUSB_VOREG_3P52          0x01
+#define CHARGERUSB_VOREG_4P0           0x19
+#define CHARGERUSB_VOREG_4P2           0x23
+#define CHARGERUSB_VOREG_4P76          0x3F
+/* CHARGERUSB_CTRL2 */
+#define CHARGERUSB_CTRL2_VITERM_50     (0 << 5)
+#define CHARGERUSB_CTRL2_VITERM_100    (1 << 5)
+#define CHARGERUSB_CTRL2_VITERM_150    (2 << 5)
+/* CONTROLLER_CTRL1 */
+#define CONTROLLER_CTRL1_EN_CHARGER    (1 << 4)
+#define CONTROLLER_CTRL1_SEL_CHARGER   (1 << 3)
+
+#define VUSB_CFG_STATE         0xA2
+#define MISC2                  0xE5
+
+void twl6030_init_battery_charging(void);
+void twl6030_usb_device_settings(void);