| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-id: <1299224747-11081-1-git-send-email-myungjoo.ham@samsung.com>
Date: Fri, 04 Mar 2011 16:45:47 +0900
From: MyungJoo Ham <myungjoo.ham@...sung.com>
To: linux-kernel@...r.kernel.org
Cc: Samuel Ortiz <sameo@...ux.intel.com>, kyungmin.park@...sung.com,
myungjoo.ham@...il.com
Subject: [PATCH 1/2] MAX8997/8966 MFD: Add IRQ control feature
This patch enables IRQ handling for MAX8997/8966 chips.
Signed-off-by: MyungJoo Ham <myungjoo.ham@...sung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@...sung.com>
---
drivers/mfd/Makefile | 2 +-
drivers/mfd/max8997-irq.c | 441 +++++++++++++++++++++++++++++++++++
include/linux/mfd/max8997-private.h | 12 +
include/linux/mfd/max8997.h | 7 +-
4 files changed, 459 insertions(+), 3 deletions(-)
create mode 100644 drivers/mfd/max8997-irq.c
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index f6662e3..4cff10c 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -60,7 +60,7 @@ obj-$(CONFIG_UCB1400_CORE) += ucb1400_core.o
obj-$(CONFIG_PMIC_DA903X) += da903x.o
max8925-objs := max8925-core.o max8925-i2c.o
obj-$(CONFIG_MFD_MAX8925) += max8925.o
-obj-$(CONFIG_MFD_MAX8997) += max8997.o
+obj-$(CONFIG_MFD_MAX8997) += max8997.o max8997-irq.o
obj-$(CONFIG_MFD_MAX8998) += max8998.o max8998-irq.o
pcf50633-objs := pcf50633-core.o pcf50633-irq.o
diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c
new file mode 100644
index 0000000..7eda6f3
--- /dev/null
+++ b/drivers/mfd/max8997-irq.c
@@ -0,0 +1,441 @@
+/*
+ * max8997-irq.c - Interrupt controller support for MAX8997
+ *
+ * Copyright (C) 2011 Samsung Electronics Co.Ltd
+ * MyungJoo Ham <myungjoo.ham@...sung.com>
+ *
+ * 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
+ *
+ * This driver is based on max8998-irq.c
+ */
+
+#include <linux/err.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/max8997.h>
+#include <linux/mfd/max8997-private.h>
+
+static u8 max8997_mask_reg[] = {
+ [PMIC_INT1] = MAX8997_REG_INT1MSK,
+ [PMIC_INT2] = MAX8997_REG_INT2MSK,
+ [PMIC_INT3] = MAX8997_REG_INT3MSK,
+ [PMIC_INT4] = MAX8997_REG_INT4MSK,
+ [FUEL_GAUGE] = MAX8997_REG_INVALID,
+ [MUIC_INT1] = MAX8997_MUIC_REG_INTMASK1,
+ [MUIC_INT2] = MAX8997_MUIC_REG_INTMASK2,
+ [MUIC_INT3] = MAX8997_MUIC_REG_INTMASK3,
+ [GPIO_LOW] = MAX8997_REG_INVALID,
+ [GPIO_HI] = MAX8997_REG_INVALID,
+ [FLASH_STATUS] = MAX8997_REG_INVALID,
+};
+
+static struct i2c_client *get_i2c(struct max8997_dev *max8997,
+ enum max8997_irq_source src)
+{
+ switch (src) {
+ case PMIC_INT1 ... PMIC_INT4:
+ return max8997->i2c;
+ case FUEL_GAUGE:
+ return NULL;
+ case MUIC_INT1 ... MUIC_INT3:
+ return max8997->muic;
+ case GPIO_LOW ... GPIO_HI:
+ return max8997->i2c;
+ case FLASH_STATUS:
+ return max8997->i2c;
+ default:
+ return ERR_PTR(-EINVAL);
+ }
+
+ return ERR_PTR(-EINVAL);
+}
+
+struct max8997_irq_data {
+ int mask;
+ enum max8997_irq_source group;
+};
+
+static struct max8997_irq_data max8997_irqs[] = {
+ [MAX8997_PMICIRQ_PWRONR] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 0,
+ },
+ [MAX8997_PMICIRQ_PWRONF] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 1,
+ },
+ [MAX8997_PMICIRQ_PWRON1SEC] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 3,
+ },
+ [MAX8997_PMICIRQ_JIGONR] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 4,
+ },
+ [MAX8997_PMICIRQ_JIGONF] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 5,
+ },
+ [MAX8997_PMICIRQ_LOWBAT2] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 6,
+ },
+ [MAX8997_PMICIRQ_LOWBAT1] = {
+ .group = PMIC_INT1,
+ .mask = 1 << 7,
+ },
+
+ [MAX8997_PMICIRQ_JIGR] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 0,
+ },
+ [MAX8997_PMICIRQ_JIGF] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 1,
+ },
+ [MAX8997_PMICIRQ_MR] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 2,
+ },
+ [MAX8997_PMICIRQ_DVS1OK] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 3,
+ },
+ [MAX8997_PMICIRQ_DVS2OK] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 4,
+ },
+ [MAX8997_PMICIRQ_DVS3OK] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 5,
+ },
+ [MAX8997_PMICIRQ_DVS4OK] = {
+ .group = PMIC_INT2,
+ .mask = 1 << 6,
+ },
+
+ [MAX8997_PMICIRQ_CHGINS] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 0,
+ },
+ [MAX8997_PMICIRQ_CHGRM] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 1,
+ },
+ [MAX8997_PMICIRQ_DCINOVP] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 2,
+ },
+ [MAX8997_PMICIRQ_TOPOFFR] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 3,
+ },
+ [MAX8997_PMICIRQ_CHGRSTF] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 5,
+ },
+ [MAX8997_PMICIRQ_MBCHGTMEXPD] = {
+ .group = PMIC_INT3,
+ .mask = 1 << 7,
+ },
+
+ [MAX8997_PMICIRQ_RTC60S] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 0,
+ },
+ [MAX8997_PMICIRQ_RTCA1] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 1,
+ },
+ [MAX8997_PMICIRQ_RTCA2] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 2,
+ },
+ [MAX8997_PMICIRQ_SMPL_INT] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 3,
+ },
+ [MAX8997_PMICIRQ_RTC1S] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 4,
+ },
+ [MAX8997_PMICIRQ_WTSR] = {
+ .group = PMIC_INT4,
+ .mask = 1 << 5,
+ },
+
+ [MAX8997_MUICIRQ_ADCError] = {
+ .group = MUIC_INT1,
+ .mask = 1 << 2,
+ },
+ [MAX8997_MUICIRQ_ADCLow] = {
+ .group = MUIC_INT1,
+ .mask = 1 << 1,
+ },
+ [MAX8997_MUICIRQ_ADC] = {
+ .group = MUIC_INT1,
+ .mask = 1 << 0,
+ },
+
+ [MAX8997_MUICIRQ_VBVolt] = {
+ .group = MUIC_INT2,
+ .mask = 1 << 4,
+ },
+ [MAX8997_MUICIRQ_DBChg] = {
+ .group = MUIC_INT2,
+ .mask = 1 << 3,
+ },
+ [MAX8997_MUICIRQ_DCDTmr] = {
+ .group = MUIC_INT2,
+ .mask = 1 << 2,
+ },
+ [MAX8997_MUICIRQ_ChgDetRun] = {
+ .group = MUIC_INT2,
+ .mask = 1 << 1,
+ },
+ [MAX8997_MUICIRQ_ChgTyp] = {
+ .group = MUIC_INT2,
+ .mask = 1 << 0,
+ },
+
+ [MAX8997_MUICIRQ_OVP] = {
+ .group = MUIC_INT3,
+ .mask = 1 << 2,
+ },
+};
+
+static inline struct max8997_irq_data *
+irq_to_max8997_irq(struct max8997_dev *max8997, int irq)
+{
+ return &max8997_irqs[irq - max8997->irq_base];
+}
+
+static void max8997_irq_lock(unsigned int irq)
+{
+ struct max8997_dev *max8997 = get_irq_chip_data(irq);
+
+ mutex_lock(&max8997->irqlock);
+}
+
+static void max8997_irq_sync_unlock(unsigned int irq)
+{
+ struct max8997_dev *max8997 = get_irq_chip_data(irq);
+ int i;
+
+ for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) {
+ u8 mask_reg = max8997_mask_reg[i];
+ struct i2c_client *i2c = get_i2c(max8997, i);
+
+ if (mask_reg == MAX8997_REG_INVALID ||
+ IS_ERR_OR_NULL(i2c))
+ continue;
+ max8997->irq_masks_cache[i] = max8997->irq_masks_cur[i];
+
+ max8997_write_reg(i2c, max8997_mask_reg[i],
+ max8997->irq_masks_cur[i]);
+ }
+
+ mutex_unlock(&max8997->irqlock);
+}
+
+static void max8997_irq_mask(unsigned int irq)
+{
+ struct max8997_dev *max8997 = get_irq_chip_data(irq);
+ struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, irq);
+
+ max8997->irq_masks_cur[irq_data->group] |= irq_data->mask;
+}
+
+static void max8997_irq_unmask(unsigned int irq)
+{
+ struct max8997_dev *max8997 = get_irq_chip_data(irq);
+ struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997, irq);
+
+ max8997->irq_masks_cur[irq_data->group] &= ~irq_data->mask;
+}
+
+static struct irq_chip max8997_irq_chip = {
+ .name = "max8997",
+ .bus_lock = max8997_irq_lock,
+ .bus_sync_unlock = max8997_irq_sync_unlock,
+ .mask = max8997_irq_mask,
+ .unmask = max8997_irq_unmask,
+};
+
+static irqreturn_t max8997_irq_thread(int irq, void *data)
+{
+ struct max8997_dev *max8997 = data;
+ u8 irq_reg[MAX8997_IRQ_GROUP_NR];
+ u8 irq_src;
+ int ret;
+ int i;
+
+ ret = max8997_read_reg(max8997->i2c, MAX8997_REG_INTSRC, &irq_src);
+ if (ret < 0) {
+ dev_err(max8997->dev, "Failed to read interrupt source: %d\n",
+ ret);
+ return IRQ_NONE;
+ }
+
+ for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++)
+ irq_reg[i] = 0;
+
+ if (irq_src & (1 << 1)) {
+ /* PMIC INT1 ~ INT4 */
+ max8997_bulk_read(max8997->i2c, MAX8997_REG_INT1, 4,
+ &irq_reg[PMIC_INT1]);
+ }
+ if (irq_src & (1 << 2)) {
+ /* FUEL GAUGE Interrupt */
+ /* Ignored */
+ irq_reg[FUEL_GAUGE] = 0;
+ }
+ if (irq_src & (1 << 3)) {
+ /* MUIC INT1 ~ INT3 */
+ max8997_bulk_read(max8997->muic, MAX8997_MUIC_REG_INT1, 3,
+ &irq_reg[MUIC_INT1]);
+ }
+ if (irq_src & (1 << 4)) {
+ /* GPIO Interrupt */
+ u8 gpio_info[12];
+ int gpio;
+
+ irq_reg[GPIO_LOW] = 0;
+ irq_reg[GPIO_HI] = 0;
+
+ max8997_bulk_read(max8997->i2c, MAX8997_REG_GPIOCNTL1, 12,
+ gpio_info);
+ for (gpio = 0; gpio < 8; gpio++) {
+ u8 val = gpio_info[gpio] & 0x34;
+ if (((val & 0x30) == 0x30) ||
+ (val == 0x10) ||
+ (val == 0x24))
+ irq_reg[GPIO_LOW] |= (1 << gpio);
+ }
+ for (gpio = 8; gpio < 12; gpio++) {
+ u8 val = gpio_info[gpio] & 0x34;
+ if (((val & 0x30) == 0x30) ||
+ (val == 0x10) ||
+ (val == 0x24))
+ irq_reg[GPIO_HI] |= (1 << (gpio - 8));
+ }
+ }
+ if (irq_src & (1 << 5)) {
+ /* Flash Status Interrupt */
+ ret = max8997_read_reg(max8997->i2c, MAX8997_REG_FLASHSTATUS,
+ &irq_reg[FLASH_STATUS]);
+ }
+
+ /* Apply masking */
+ for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++)
+ irq_reg[i] &= ~max8997->irq_masks_cur[i];
+
+ /* Report */
+ for (i = 0; i < MAX8997_IRQ_NR; i++) {
+ if (irq_reg[max8997_irqs[i].group] & max8997_irqs[i].mask)
+ handle_nested_irq(max8997->irq_base + i);
+ }
+
+ return IRQ_HANDLED;
+}
+
+int max8997_irq_resume(struct max8997_dev *max8997)
+{
+ if (max8997->irq && max8997->irq_base)
+ max8997_irq_thread(max8997->irq_base, max8997);
+ return 0;
+}
+
+int max8997_irq_init(struct max8997_dev *max8997)
+{
+ int i;
+ int cur_irq;
+ int ret;
+
+ if (!max8997->irq) {
+ dev_warn(max8997->dev, "No interrupt specified.\n");
+ max8997->irq_base = 0;
+ return 0;
+ }
+
+ if (!max8997->irq_base) {
+ dev_err(max8997->dev, "No interrupt base specified.\n");
+ return 0;
+ }
+
+ mutex_init(&max8997->irqlock);
+
+ /* Mask individual interrupt sources */
+ for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) {
+ struct i2c_client *i2c;
+
+ max8997->irq_masks_cur[i] = 0xff;
+ max8997->irq_masks_cache[i] = 0xff;
+ i2c = get_i2c(max8997, i);
+
+ if (IS_ERR_OR_NULL(i2c))
+ continue;
+ if (max8997_mask_reg[i] == MAX8997_REG_INVALID)
+ continue;
+
+ max8997_write_reg(i2c, max8997_mask_reg[i], 0xff);
+ }
+
+ /* Register with genirq */
+ for (i = 0; i < MAX8997_IRQ_NR; i++) {
+ cur_irq = i + max8997->irq_base;
+ set_irq_chip_data(cur_irq, max8997);
+ set_irq_chip_and_handler(cur_irq, &max8997_irq_chip,
+ handle_edge_irq);
+ set_irq_nested_thread(cur_irq, 1);
+#ifdef CONFIG_ARM
+ set_irq_flags(cur_irq, IRQF_VALID);
+#else
+ set_irq_noprobe(cur_irq);
+#endif
+ }
+
+ ret = request_threaded_irq(max8997->irq, NULL, max8997_irq_thread,
+ IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+ "max8997-irq", max8997);
+
+ if (ret) {
+ dev_err(max8997->dev, "Failed to request IRQ %d: %d\n",
+ max8997->irq, ret);
+ return ret;
+ }
+
+ if (!max8997->ono)
+ return 0;
+
+ ret = request_threaded_irq(max8997->ono, NULL, max8997_irq_thread,
+ IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING |
+ IRQF_ONESHOT, "max8997-ono", max8997);
+
+ if (ret)
+ dev_err(max8997->dev, "Failed to request ono-IRQ %d: %d\n",
+ max8997->ono, ret);
+
+ return 0;
+}
+
+void max8997_irq_exit(struct max8997_dev *max8997)
+{
+ if (max8997->ono)
+ free_irq(max8997->ono, max8997);
+
+ if (max8997->irq)
+ free_irq(max8997->irq, max8997);
+}
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index 93a9477..8c0528c 100644
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -24,6 +24,8 @@
#include <linux/i2c.h>
+#define MAX8997_REG_INVALID (0xff)
+
enum max8997_pmic_reg {
MAX8997_REG_PMIC_ID0 = 0x00,
MAX8997_REG_PMIC_ID1 = 0x01,
@@ -324,7 +326,13 @@ struct max8997_dev {
int type;
struct platform_device *battery; /* battery control (not fuel gauge) */
+ int irq;
+ int ono;
+ int irq_base;
bool wakeup;
+ struct mutex irqlock;
+ int irq_masks_cur[MAX8997_IRQ_GROUP_NR];
+ int irq_masks_cache[MAX8997_IRQ_GROUP_NR];
/* For hibernation */
u8 reg_dump[MAX8997_REG_PMIC_END + MAX8997_MUIC_REG_END +
@@ -336,6 +344,10 @@ enum max8997_types {
TYPE_MAX8966,
};
+extern int max8997_irq_init(struct max8997_dev *max8997);
+extern void max8997_irq_exit(struct max8997_dev *max8997);
+extern int max8997_irq_resume(struct max8997_dev *max8997);
+
extern int max8997_read_reg(struct i2c_client *i2c, u8 reg, u8 *dest);
extern int max8997_bulk_read(struct i2c_client *i2c, u8 reg, int count,
u8 *buf);
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h
index cb671b3..60931d0 100644
--- a/include/linux/mfd/max8997.h
+++ b/include/linux/mfd/max8997.h
@@ -78,8 +78,11 @@ struct max8997_regulator_data {
};
struct max8997_platform_data {
- bool wakeup;
- /* IRQ: Not implemented */
+ /* IRQ */
+ int irq_base;
+ int ono;
+ int wakeup;
+
/* ---- PMIC ---- */
struct max8997_regulator_data *regulators;
int num_regulators;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists