Support for MUIC (Micro USB Integrated Circuit) built into the MAX8997
power management device.

The MUIC device will work with redesigned PMIC framework.

Signed-off-by: Lukasz Majewski <l.majew...@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
Cc: Stefano Babic <sba...@denx.de>

---
Changes for v2:
- power_init_battery now available as a callback from MUIC struct pmic
  instance
Changes for v3:
- change code according to struct pmic redesign
Changes for v4:
- Move muic code to ./drivers/power/pmic directory
Changes for v5:
- None
Changes for v6:
- None
Changes for v7:
- Check pmic_alloc() return value (to prevent NULL pointer dereference)
---
 drivers/power/pmic/Makefile       |    1 +
 drivers/power/pmic/muic_max8997.c |   90 +++++++++++++++++++++++++++++++++++++
 include/power/max8997_muic.h      |   61 +++++++++++++++++++++++++
 3 files changed, 152 insertions(+), 0 deletions(-)
 create mode 100644 drivers/power/pmic/muic_max8997.c
 create mode 100644 include/power/max8997_muic.h

diff --git a/drivers/power/pmic/Makefile b/drivers/power/pmic/Makefile
index 8ccd6e9..9b71e55 100644
--- a/drivers/power/pmic/Makefile
+++ b/drivers/power/pmic/Makefile
@@ -27,6 +27,7 @@ LIB   := $(obj)libpmic.o
 
 COBJS-$(CONFIG_PMIC_MAX8998) += pmic_max8998.o
 COBJS-$(CONFIG_PMIC_MAX8997) += pmic_max8997.o
+COBJS-$(CONFIG_POWER_MUIC_MAX8997) += muic_max8997.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
diff --git a/drivers/power/pmic/muic_max8997.c 
b/drivers/power/pmic/muic_max8997.c
new file mode 100644
index 0000000..d5095c8
--- /dev/null
+++ b/drivers/power/pmic/muic_max8997.c
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (C) 2012 Samsung Electronics
+ *  Lukasz Majewski <l.majew...@samsung.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 <power/pmic.h>
+#include <power/power_chrg.h>
+#include <power/max8997_muic.h>
+#include <i2c.h>
+#include <errno.h>
+
+static int power_chrg_get_type(struct pmic *p)
+{
+       unsigned int val;
+       unsigned char charge_type, charger;
+
+       if (pmic_probe(p))
+               return CHARGER_NO;
+
+       pmic_reg_read(p, MAX8997_MUIC_STATUS2, &val);
+       charge_type = val & MAX8997_MUIC_CHG_MASK;
+
+       switch (charge_type) {
+       case MAX8997_MUIC_CHG_NO:
+               charger = CHARGER_NO;
+               break;
+       case MAX8997_MUIC_CHG_USB:
+       case MAX8997_MUIC_CHG_USB_D:
+               charger = CHARGER_USB;
+               break;
+       case MAX8997_MUIC_CHG_TA:
+       case MAX8997_MUIC_CHG_TA_1A:
+               charger = CHARGER_TA;
+               break;
+       case MAX8997_MUIC_CHG_TA_500:
+               charger = CHARGER_TA_500;
+               break;
+       default:
+               charger = CHARGER_UNKNOWN;
+               break;
+       }
+
+       return charger;
+}
+
+static struct power_chrg power_chrg_muic_ops = {
+       .chrg_type = power_chrg_get_type,
+};
+
+int power_muic_init(unsigned int bus)
+{
+       static const char name[] = "MAX8997_MUIC";
+       struct pmic *p = pmic_alloc();
+
+       if (!p) {
+               printf("%s: POWER allocation error!\n", __func__);
+               return -ENOMEM;
+       }
+
+       debug("Board Micro USB Interface Controller init\n");
+
+       p->name = name;
+       p->interface = PMIC_I2C;
+       p->number_of_regs = MUIC_NUM_OF_REGS;
+       p->hw.i2c.addr = MAX8997_MUIC_I2C_ADDR;
+       p->hw.i2c.tx_num = 1;
+       p->bus = bus;
+
+       p->chrg = &power_chrg_muic_ops;
+       return 0;
+}
diff --git a/include/power/max8997_muic.h b/include/power/max8997_muic.h
new file mode 100644
index 0000000..0149c12
--- /dev/null
+++ b/include/power/max8997_muic.h
@@ -0,0 +1,61 @@
+/*
+ *  Copyright (C) 2012 Samsung Electronics
+ *  Lukasz Majewski <l.majew...@samsung.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
+ */
+
+#ifndef __MAX8997_MUIC_H_
+#define __MAX8997_MUIC_H_
+
+#include <power/power_chrg.h>
+
+/* MAX8997_MUIC_STATUS2 */
+#define MAX8997_MUIC_CHG_NO    0x00
+#define MAX8997_MUIC_CHG_USB   0x01
+#define MAX8997_MUIC_CHG_USB_D 0x02
+#define MAX8997_MUIC_CHG_TA    0x03
+#define MAX8997_MUIC_CHG_TA_500 0x04
+#define MAX8997_MUIC_CHG_TA_1A 0x05
+#define MAX8997_MUIC_CHG_MASK  0x07
+
+/* MAX 8997 MUIC registers */
+enum {
+       MAX8997_MUIC_ID         = 0x00,
+       MAX8997_MUIC_INT1       = 0x01,
+       MAX8997_MUIC_INT2       = 0x02,
+       MAX8997_MUIC_INT3       = 0x03,
+       MAX8997_MUIC_STATUS1    = 0x04,
+       MAX8997_MUIC_STATUS2    = 0x05,
+       MAX8997_MUIC_STATUS3    = 0x06,
+       MAX8997_MUIC_INTMASK1   = 0x07,
+       MAX8997_MUIC_INTMASK2   = 0x08,
+       MAX8997_MUIC_INTMASK3   = 0x09,
+       MAX8997_MUIC_CDETCTRL   = 0x0A,
+       MAX8997_MUIC_CONTROL1   = 0x0C,
+       MAX8997_MUIC_CONTROL2   = 0x0D,
+       MAX8997_MUIC_CONTROL3   = 0x0E,
+
+       MUIC_NUM_OF_REGS = 0x0F,
+};
+
+#define MAX8997_MUIC_I2C_ADDR  (0x4A >> 1)
+
+int power_muic_init(unsigned int bus);
+#endif /* __MAX8997_MUIC_H_ */
-- 
1.7.2.3

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to