* [PATCH 0/2] fix mpp and gpio for pm8921
@ 2011-04-27 6:18 Abhijeet Dharmapurikar
2011-04-27 6:18 ` [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver Abhijeet Dharmapurikar
2011-04-27 6:18 ` [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver Abhijeet Dharmapurikar
0 siblings, 2 replies; 5+ messages in thread
From: Abhijeet Dharmapurikar @ 2011-04-27 6:18 UTC (permalink / raw)
To: linux-arm-kernel
As discussed here
https://lkml.org/lkml/2011/4/26/326
removed the usage of mfd_get_data and moved back to using platform_data.
Grant please review and ack these.
Abhijeet Dharmapurikar (1):
gpio: pm8xxx-gpio: Add pm8xxx gpio driver
David Collins (1):
mfd: pm8xxx-mpp: Add pm8xxx MPP driver
drivers/gpio/Kconfig | 17 ++
drivers/gpio/Makefile | 2 +
drivers/gpio/pm8xxx-gpio.c | 455 +++++++++++++++++++++++++++++++++++++
drivers/gpio/pm8xxx-mpp.c | 325 ++++++++++++++++++++++++++
drivers/mfd/pm8921-core.c | 65 ++++++
include/linux/mfd/pm8xxx/gpio.h | 135 +++++++++++
include/linux/mfd/pm8xxx/mpp.h | 233 +++++++++++++++++++
include/linux/mfd/pm8xxx/pm8921.h | 18 ++
8 files changed, 1250 insertions(+), 0 deletions(-)
create mode 100644 drivers/gpio/pm8xxx-gpio.c
create mode 100644 drivers/gpio/pm8xxx-mpp.c
create mode 100644 include/linux/mfd/pm8xxx/gpio.h
create mode 100644 include/linux/mfd/pm8xxx/mpp.h
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver
2011-04-27 6:18 [PATCH 0/2] fix mpp and gpio for pm8921 Abhijeet Dharmapurikar
@ 2011-04-27 6:18 ` Abhijeet Dharmapurikar
2011-05-04 0:38 ` Grant Likely
2011-04-27 6:18 ` [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver Abhijeet Dharmapurikar
1 sibling, 1 reply; 5+ messages in thread
From: Abhijeet Dharmapurikar @ 2011-04-27 6:18 UTC (permalink / raw)
To: linux-arm-kernel
Add support for GPIO on Qualcomm PM8xxx PMIC chips.
Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
---
drivers/gpio/Kconfig | 9 +
drivers/gpio/Makefile | 1 +
drivers/gpio/pm8xxx-gpio.c | 455 +++++++++++++++++++++++++++++++++++++
drivers/mfd/pm8921-core.c | 35 +++
include/linux/mfd/pm8xxx/gpio.h | 135 +++++++++++
include/linux/mfd/pm8xxx/pm8921.h | 11 +
6 files changed, 646 insertions(+), 0 deletions(-)
create mode 100644 drivers/gpio/pm8xxx-gpio.c
create mode 100644 include/linux/mfd/pm8xxx/gpio.h
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d3b2953..2035f90 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -419,4 +419,13 @@ config AB8500_GPIO
depends on AB8500_CORE && BROKEN
help
Select this to enable the AB8500 IC GPIO driver
+
+config GPIO_PM8XXX
+ tristate "Qualcomm PM8xxx GPIO support"
+ depends on MFD_PM8XXX
+ default y if MFD_PM8XXX
+ help
+ This option enables support for on-chip GPIO found on Qualcomm PM8xxx
+ PMICs.
+
endif
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index becef59..337aa34 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -43,3 +43,4 @@ obj-$(CONFIG_GPIO_SX150X) += sx150x.o
obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
+obj-$(CONFIG_GPIO_PM8XXX) += pm8xxx-gpio.o
diff --git a/drivers/gpio/pm8xxx-gpio.c b/drivers/gpio/pm8xxx-gpio.c
new file mode 100644
index 0000000..eada9cd
--- /dev/null
+++ b/drivers/gpio/pm8xxx-gpio.c
@@ -0,0 +1,455 @@
+/*
+ * Qualcomm PMIC8XXX GPIO driver
+ *
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/mfd/pm8xxx/core.h>
+#include <linux/mfd/pm8xxx/gpio.h>
+#include <linux/debugfs.h>
+#include <linux/uaccess.h>
+#include <linux/fs.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+
+/* GPIO registers */
+#define SSBI_REG_ADDR_GPIO_BASE 0x150
+#define SSBI_REG_ADDR_GPIO(n) (SSBI_REG_ADDR_GPIO_BASE + n)
+
+/* GPIO */
+#define PM_GPIO_BANK_MASK 0x70
+#define PM_GPIO_BANK_SHIFT 4
+#define PM_GPIO_WRITE 0x80
+
+/* Bank 0 */
+#define PM_GPIO_VIN_MASK 0x0E
+#define PM_GPIO_VIN_SHIFT 1
+#define PM_GPIO_MODE_ENABLE 0x01
+
+/* Bank 1 */
+#define PM_GPIO_MODE_MASK 0x0C
+#define PM_GPIO_MODE_SHIFT 2
+#define PM_GPIO_OUT_BUFFER 0x02
+#define PM_GPIO_OUT_INVERT 0x01
+
+#define PM_GPIO_MODE_OFF 3
+#define PM_GPIO_MODE_OUTPUT 2
+#define PM_GPIO_MODE_INPUT 0
+#define PM_GPIO_MODE_BOTH 1
+
+/* Bank 2 */
+#define PM_GPIO_PULL_MASK 0x0E
+#define PM_GPIO_PULL_SHIFT 1
+
+/* Bank 3 */
+#define PM_GPIO_OUT_STRENGTH_MASK 0x0C
+#define PM_GPIO_OUT_STRENGTH_SHIFT 2
+#define PM_GPIO_PIN_ENABLE 0x00
+#define PM_GPIO_PIN_DISABLE 0x01
+
+/* Bank 4 */
+#define PM_GPIO_FUNC_MASK 0x0E
+#define PM_GPIO_FUNC_SHIFT 1
+
+/* Bank 5 */
+#define PM_GPIO_NON_INT_POL_INV 0x08
+#define PM_GPIO_BANKS 6
+
+struct pm_gpio_chip {
+ struct list_head link;
+ struct gpio_chip gpio_chip;
+ spinlock_t pm_lock;
+ u8 *bank1;
+ int irq_base;
+};
+
+static LIST_HEAD(pm_gpio_chips);
+static DEFINE_MUTEX(pm_gpio_chips_lock);
+
+static int pm_gpio_get(struct pm_gpio_chip *pm_gpio_chip, unsigned gpio)
+{
+ int mode;
+
+ if (gpio >= pm_gpio_chip->gpio_chip.ngpio || pm_gpio_chip == NULL)
+ return -EINVAL;
+
+ /* Get gpio value from config bank 1 if output gpio.
+ Get gpio value from IRQ RT status register for all other gpio modes.
+ */
+ mode = (pm_gpio_chip->bank1[gpio] & PM_GPIO_MODE_MASK) >>
+ PM_GPIO_MODE_SHIFT;
+ if (mode == PM_GPIO_MODE_OUTPUT)
+ return pm_gpio_chip->bank1[gpio] & PM_GPIO_OUT_INVERT;
+ else
+ return pm8xxx_read_irq_stat(pm_gpio_chip->gpio_chip.dev->parent,
+ pm_gpio_chip->irq_base + gpio);
+}
+
+static int pm_gpio_set(struct pm_gpio_chip *pm_gpio_chip,
+ unsigned gpio, int value)
+{
+ int rc;
+ u8 bank1;
+ unsigned long flags;
+
+ if (gpio >= pm_gpio_chip->gpio_chip.ngpio || pm_gpio_chip == NULL)
+ return -EINVAL;
+
+ spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
+ bank1 = PM_GPIO_WRITE
+ | (pm_gpio_chip->bank1[gpio] & ~PM_GPIO_OUT_INVERT);
+
+ if (value)
+ bank1 |= PM_GPIO_OUT_INVERT;
+
+ pm_gpio_chip->bank1[gpio] = bank1;
+ rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
+ SSBI_REG_ADDR_GPIO(gpio), bank1);
+ spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
+
+ if (rc)
+ pr_err("FAIL pm8xxx_writeb(): rc=%d. "
+ "(gpio=%d, value=%d)\n",
+ rc, gpio, value);
+
+ return rc;
+}
+
+static int dir_map[] = {
+ PM_GPIO_MODE_OFF,
+ PM_GPIO_MODE_OUTPUT,
+ PM_GPIO_MODE_INPUT,
+ PM_GPIO_MODE_BOTH,
+};
+
+static int pm_gpio_set_direction(struct pm_gpio_chip *pm_gpio_chip,
+ unsigned gpio, int direction)
+{
+ int rc;
+ u8 bank1;
+ unsigned long flags;
+
+ if (!direction || pm_gpio_chip == NULL)
+ return -EINVAL;
+
+ spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
+ bank1 = PM_GPIO_WRITE
+ | (pm_gpio_chip->bank1[gpio] & ~PM_GPIO_MODE_MASK);
+
+ bank1 |= ((dir_map[direction] << PM_GPIO_MODE_SHIFT)
+ & PM_GPIO_MODE_MASK);
+
+ pm_gpio_chip->bank1[gpio] = bank1;
+ rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
+ SSBI_REG_ADDR_GPIO(gpio), bank1);
+ spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
+
+ if (rc)
+ pr_err("Failed on pm8xxx_writeb(): rc=%d (GPIO config)\n",
+ rc);
+
+ return rc;
+}
+
+static int pm_gpio_init_bank1(struct pm_gpio_chip *pm_gpio_chip)
+{
+ int i, rc;
+ u8 bank;
+
+ for (i = 0; i < pm_gpio_chip->gpio_chip.ngpio; i++) {
+ bank = 1 << PM_GPIO_BANK_SHIFT;
+ rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
+ SSBI_REG_ADDR_GPIO(i),
+ bank);
+ if (rc) {
+ pr_err("error setting bank rc=%d\n", rc);
+ return rc;
+ }
+
+ rc = pm8xxx_readb(pm_gpio_chip->gpio_chip.dev->parent,
+ SSBI_REG_ADDR_GPIO(i),
+ &pm_gpio_chip->bank1[i]);
+ if (rc) {
+ pr_err("error reading bank 1 rc=%d\n", rc);
+ return rc;
+ }
+ }
+ return 0;
+}
+
+static int pm_gpio_to_irq(struct gpio_chip *gpio_chip, unsigned offset)
+{
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+
+ return pm_gpio_chip->irq_base + offset;
+}
+
+static int pm_gpio_read(struct gpio_chip *gpio_chip, unsigned offset)
+{
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+
+ return pm_gpio_get(pm_gpio_chip, offset);
+}
+
+static void pm_gpio_write(struct gpio_chip *gpio_chip,
+ unsigned offset, int val)
+{
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+
+ pm_gpio_set(pm_gpio_chip, offset, val);
+}
+
+static int pm_gpio_direction_input(struct gpio_chip *gpio_chip,
+ unsigned offset)
+{
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+
+ return pm_gpio_set_direction(pm_gpio_chip, offset, PM_GPIO_DIR_IN);
+}
+
+static int pm_gpio_direction_output(struct gpio_chip *gpio_chip,
+ unsigned offset,
+ int val)
+{
+ int ret;
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+
+ ret = pm_gpio_set_direction(pm_gpio_chip, offset, PM_GPIO_DIR_OUT);
+ if (!ret)
+ ret = pm_gpio_set(pm_gpio_chip, offset, val);
+
+ return ret;
+}
+
+static void pm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *gpio_chip)
+{
+ static const char * const cmode[] = { "in", "in/out", "out", "off" };
+ struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
+ u8 mode, state, bank;
+ const char *label;
+ int i, j;
+
+ for (i = 0; i < gpio_chip->ngpio; i++) {
+ label = gpiochip_is_requested(gpio_chip, i);
+ mode = (pm_gpio_chip->bank1[i] & PM_GPIO_MODE_MASK) >>
+ PM_GPIO_MODE_SHIFT;
+ state = pm_gpio_get(pm_gpio_chip, i);
+ seq_printf(s, "gpio-%-3d (%-12.12s) %-10.10s"
+ " %s",
+ gpio_chip->base + i,
+ label ? label : "--",
+ cmode[mode],
+ state ? "hi" : "lo");
+ for (j = 0; j < PM_GPIO_BANKS; j++) {
+ bank = j << PM_GPIO_BANK_SHIFT;
+ pm8xxx_writeb(gpio_chip->dev->parent,
+ SSBI_REG_ADDR_GPIO(i),
+ bank);
+ pm8xxx_readb(gpio_chip->dev->parent,
+ SSBI_REG_ADDR_GPIO(i),
+ &bank);
+ seq_printf(s, " 0x%02x", bank);
+ }
+ seq_printf(s, "\n");
+ }
+}
+
+static int __devinit pm_gpio_probe(struct platform_device *pdev)
+{
+ int ret;
+ const struct pm8xxx_gpio_platform_data *pdata = pdev->dev.platform_data;
+ struct pm_gpio_chip *pm_gpio_chip;
+
+ if (!pdata) {
+ pr_err("missing platform data\n");
+ return -EINVAL;
+ }
+
+ pm_gpio_chip = kzalloc(sizeof(struct pm_gpio_chip), GFP_KERNEL);
+ if (!pm_gpio_chip) {
+ pr_err("Cannot allocate pm_gpio_chip\n");
+ return -ENOMEM;
+ }
+
+ pm_gpio_chip->bank1 = kzalloc(sizeof(u8) * pdata->gpio_cdata.ngpios,
+ GFP_KERNEL);
+ if (!pm_gpio_chip->bank1) {
+ pr_err("Cannot allocate pm_gpio_chip->bank1\n");
+ return -ENOMEM;
+ }
+
+ spin_lock_init(&pm_gpio_chip->pm_lock);
+ pm_gpio_chip->gpio_chip.label = "pm-gpio";
+ pm_gpio_chip->gpio_chip.direction_input = pm_gpio_direction_input;
+ pm_gpio_chip->gpio_chip.direction_output = pm_gpio_direction_output;
+ pm_gpio_chip->gpio_chip.to_irq = pm_gpio_to_irq;
+ pm_gpio_chip->gpio_chip.get = pm_gpio_read;
+ pm_gpio_chip->gpio_chip.set = pm_gpio_write;
+ pm_gpio_chip->gpio_chip.dbg_show = pm_gpio_dbg_show;
+ pm_gpio_chip->gpio_chip.ngpio = pdata->gpio_cdata.ngpios;
+ pm_gpio_chip->gpio_chip.can_sleep = 1;
+ pm_gpio_chip->gpio_chip.dev = &pdev->dev;
+ pm_gpio_chip->gpio_chip.base = pdata->gpio_base;
+ pm_gpio_chip->irq_base = platform_get_irq(pdev, 0);
+ mutex_lock(&pm_gpio_chips_lock);
+ list_add(&pm_gpio_chip->link, &pm_gpio_chips);
+ mutex_unlock(&pm_gpio_chips_lock);
+ platform_set_drvdata(pdev, pm_gpio_chip);
+
+ ret = gpiochip_add(&pm_gpio_chip->gpio_chip);
+ if (ret) {
+ pr_err("gpiochip_add failed ret = %d\n", ret);
+ goto reset_drvdata;
+ }
+
+ ret = pm_gpio_init_bank1(pm_gpio_chip);
+ if (ret) {
+ pr_err("gpio init bank failed ret = %d\n", ret);
+ goto remove_chip;
+ }
+
+ return 0;
+
+remove_chip:
+ if (gpiochip_remove(&pm_gpio_chip->gpio_chip))
+ pr_err("failed to remove gpio chip\n");
+reset_drvdata:
+ platform_set_drvdata(pdev, NULL);
+ kfree(pm_gpio_chip);
+ return ret;
+}
+
+static int __devexit pm_gpio_remove(struct platform_device *pdev)
+{
+ struct pm_gpio_chip *pm_gpio_chip
+ = platform_get_drvdata(pdev);
+
+ mutex_lock(&pm_gpio_chips_lock);
+ list_del(&pm_gpio_chip->link);
+ mutex_unlock(&pm_gpio_chips_lock);
+ platform_set_drvdata(pdev, NULL);
+ if (gpiochip_remove(&pm_gpio_chip->gpio_chip))
+ pr_err("failed to remove gpio chip\n");
+ kfree(pm_gpio_chip->bank1);
+ kfree(pm_gpio_chip);
+ return 0;
+}
+
+int pm8xxx_gpio_config(int gpio, struct pm_gpio *param)
+{
+ int rc, pm_gpio = 0;
+ u8 bank[8];
+ unsigned long flags;
+ struct pm_gpio_chip *pm_gpio_chip;
+ struct gpio_chip *gpio_chip;
+
+ if (param == NULL)
+ return -EINVAL;
+
+ mutex_lock(&pm_gpio_chips_lock);
+ list_for_each_entry(pm_gpio_chip, &pm_gpio_chips, link) {
+ gpio_chip = &pm_gpio_chip->gpio_chip;
+ if (gpio >= gpio_chip->base
+ && gpio < gpio_chip->base + gpio_chip->ngpio) {
+ pm_gpio = gpio - gpio_chip->base;
+ break;
+ }
+ }
+ mutex_unlock(&pm_gpio_chips_lock);
+ if (!pm_gpio) {
+ pr_err("called on gpio %d not handled by any pmic\n", gpio);
+ return -EINVAL;
+ }
+
+ /* Select banks and configure the gpio */
+ bank[0] = PM_GPIO_WRITE |
+ ((param->vin_sel << PM_GPIO_VIN_SHIFT) &
+ PM_GPIO_VIN_MASK) |
+ PM_GPIO_MODE_ENABLE;
+ bank[1] = PM_GPIO_WRITE |
+ ((1 << PM_GPIO_BANK_SHIFT) &
+ PM_GPIO_BANK_MASK) |
+ ((dir_map[param->direction] <<
+ PM_GPIO_MODE_SHIFT) &
+ PM_GPIO_MODE_MASK) |
+ ((param->direction & PM_GPIO_DIR_OUT) ?
+ ((param->output_buffer & 1) ?
+ PM_GPIO_OUT_BUFFER : 0) : 0) |
+ ((param->direction & PM_GPIO_DIR_OUT) ?
+ param->output_value & 0x01 : 0);
+ bank[2] = PM_GPIO_WRITE |
+ ((2 << PM_GPIO_BANK_SHIFT) &
+ PM_GPIO_BANK_MASK) |
+ ((param->pull << PM_GPIO_PULL_SHIFT) &
+ PM_GPIO_PULL_MASK);
+ bank[3] = PM_GPIO_WRITE |
+ ((3 << PM_GPIO_BANK_SHIFT) &
+ PM_GPIO_BANK_MASK) |
+ ((param->out_strength <<
+ PM_GPIO_OUT_STRENGTH_SHIFT) &
+ PM_GPIO_OUT_STRENGTH_MASK) |
+ (param->disable_pin ?
+ PM_GPIO_PIN_DISABLE : PM_GPIO_PIN_ENABLE);
+ bank[4] = PM_GPIO_WRITE |
+ ((4 << PM_GPIO_BANK_SHIFT) &
+ PM_GPIO_BANK_MASK) |
+ ((param->function << PM_GPIO_FUNC_SHIFT) &
+ PM_GPIO_FUNC_MASK);
+ bank[5] = PM_GPIO_WRITE |
+ ((5 << PM_GPIO_BANK_SHIFT) & PM_GPIO_BANK_MASK) |
+ (param->inv_int_pol ? 0 : PM_GPIO_NON_INT_POL_INV);
+
+ spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
+ /* Remember bank1 for later use */
+ pm_gpio_chip->bank1[pm_gpio] = bank[1];
+ rc = pm8xxx_write_buf(pm_gpio_chip->gpio_chip.dev->parent,
+ SSBI_REG_ADDR_GPIO(pm_gpio), bank, 6);
+ spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
+
+ if (rc)
+ pr_err("Failed on pm8xxx_write_buf() rc=%d (GPIO config)\n",
+ rc);
+
+ return rc;
+}
+EXPORT_SYMBOL_GPL(pm8xxx_gpio_config);
+
+static struct platform_driver pm_gpio_driver = {
+ .probe = pm_gpio_probe,
+ .remove = __devexit_p(pm_gpio_remove),
+ .driver = {
+ .name = PM8XXX_GPIO_DEV_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init pm_gpio_init(void)
+{
+ return platform_driver_register(&pm_gpio_driver);
+}
+subsys_initcall(pm_gpio_init);
+
+static void __exit pm_gpio_exit(void)
+{
+ platform_driver_unregister(&pm_gpio_driver);
+}
+module_exit(pm_gpio_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PMIC GPIO driver");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("platform:" PM8XXX_GPIO_DEV_NAME);
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index e873b15..0f1691f 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -80,6 +80,22 @@ static struct pm8xxx_drvdata pm8921_drvdata = {
.pmic_read_irq_stat = pm8921_read_irq_stat,
};
+static const struct resource gpio_cell_resources[] __devinitconst = {
+ [0] = {
+ .start = PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, 0),
+ .end = PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, 0)
+ + PM8921_NR_GPIOS - 1,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct mfd_cell gpio_cell __devinitdata = {
+ .name = PM8XXX_GPIO_DEV_NAME,
+ .id = -1,
+ .resources = gpio_cell_resources,
+ .num_resources = ARRAY_SIZE(gpio_cell_resources),
+};
+
static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
*pdata,
struct pm8921 *pmic,
@@ -101,6 +117,25 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
}
pmic->irq_chip = irq_chip;
}
+
+ if (pdata->gpio_pdata) {
+ pdata->gpio_pdata->gpio_cdata.ngpios = PM8921_NR_GPIOS;
+ pdata->gpio_pdata->gpio_cdata.rev = rev;
+ gpio_cell.mfd_data = pdata->gpio_pdata;
+ ret = mfd_add_devices(pmic->dev, 0, &gpio_cell, 1,
+ NULL, irq_base);
+ if (ret) {
+ pr_err("Failed to add gpio subdevice ret=%d\n", ret);
+ goto bail;
+ }
+ }
+
+ return 0;
+bail:
+ if (pmic->irq_chip) {
+ pm8xxx_irq_exit(pmic->irq_chip);
+ pmic->irq_chip = NULL;
+ }
return ret;
}
diff --git a/include/linux/mfd/pm8xxx/gpio.h b/include/linux/mfd/pm8xxx/gpio.h
new file mode 100644
index 0000000..d78ff12
--- /dev/null
+++ b/include/linux/mfd/pm8xxx/gpio.h
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+/*
+ * Qualcomm PMIC8XXX gpio driver header file
+ *
+ */
+
+#ifndef __PM8XXX_GPIO_H
+#define __PM8XXX_GPIO_H
+
+#include <linux/errno.h>
+
+#define PM8XXX_GPIO_DEV_NAME "pm8xxx-gpio"
+
+struct pm8xxx_gpio_core_data {
+ u32 rev;
+ int ngpios;
+};
+
+struct pm8xxx_gpio_platform_data {
+ struct pm8xxx_gpio_core_data gpio_cdata;
+ int gpio_base;
+};
+
+/* GPIO parameters */
+/* direction */
+#define PM_GPIO_DIR_OUT 0x01
+#define PM_GPIO_DIR_IN 0x02
+#define PM_GPIO_DIR_BOTH (PM_GPIO_DIR_OUT | PM_GPIO_DIR_IN)
+
+/* output_buffer */
+#define PM_GPIO_OUT_BUF_OPEN_DRAIN 1
+#define PM_GPIO_OUT_BUF_CMOS 0
+
+/* pull */
+#define PM_GPIO_PULL_UP_30 0
+#define PM_GPIO_PULL_UP_1P5 1
+#define PM_GPIO_PULL_UP_31P5 2
+#define PM_GPIO_PULL_UP_1P5_30 3
+#define PM_GPIO_PULL_DN 4
+#define PM_GPIO_PULL_NO 5
+
+/* vin_sel: Voltage Input Select */
+#define PM_GPIO_VIN_VPH 0
+#define PM_GPIO_VIN_BB 1
+#define PM_GPIO_VIN_S4 2
+#define PM_GPIO_VIN_L15 3
+#define PM_GPIO_VIN_L4 4
+#define PM_GPIO_VIN_L3 5
+#define PM_GPIO_VIN_L17 6
+
+/* out_strength */
+#define PM_GPIO_STRENGTH_NO 0
+#define PM_GPIO_STRENGTH_HIGH 1
+#define PM_GPIO_STRENGTH_MED 2
+#define PM_GPIO_STRENGTH_LOW 3
+
+/* function */
+#define PM_GPIO_FUNC_NORMAL 0
+#define PM_GPIO_FUNC_PAIRED 1
+#define PM_GPIO_FUNC_1 2
+#define PM_GPIO_FUNC_2 3
+#define PM_GPIO_DTEST1 4
+#define PM_GPIO_DTEST2 5
+#define PM_GPIO_DTEST3 6
+#define PM_GPIO_DTEST4 7
+
+/**
+ * struct pm_gpio - structure to specify gpio configurtion values
+ * @direction: indicates whether the gpio should be input, output, or
+ * both. Should be of the type PM_GPIO_DIR_*
+ * @output_buffer: indicates gpio should be configured as CMOS or open
+ * drain. Should be of the type PM_GPIO_OUT_BUF_*
+ * @output_value: The gpio output value of the gpio line - 0 or 1
+ * @pull: Indicates whether a pull up or pull down should be
+ * applied. If a pullup is required the current strength
+ * needs to be specified. Current values of 30uA, 1.5uA,
+ * 31.5uA, 1.5uA with 30uA boost are supported. This value
+ * should be one of the PM_GPIO_PULL_*
+ * @vin_sel: specifies the voltage level when the output is set to 1.
+ * For an input gpio specifies the voltage level at which
+ * the input is interpreted as a logical 1.
+ * @out_strength: the amount of current supplied for an output gpio,
+ * should be of the type PM_GPIO_STRENGTH_*
+ * @function: choose alternate function for the gpio. Certain gpios
+ * can be paired (shorted) with each other. Some gpio pin
+ * can act as alternate functions. This parameter should
+ * be of type PM_GPIO_FUNC_*
+ * @inv_int_pol: Invert polarity before feeding the line to the interrupt
+ * module in pmic. This feature will almost be never used
+ * since the pm8xxx interrupt block can detect both edges
+ * and both levels.
+ * @disable_pin: Disable the gpio by configuring it as high impedence.
+ *
+ */
+struct pm_gpio {
+ int direction;
+ int output_buffer;
+ int output_value;
+ int pull;
+ int vin_sel;
+ int out_strength;
+ int function;
+ int inv_int_pol;
+ int disable_pin;
+};
+
+#if defined(CONFIG_GPIO_PM8XXX) || defined(CONFIG_GPIO_PM8XXX_MODULE)
+/**
+ * pm8xxx_gpio_config - configure a gpio controlled by a pm8xxx chip
+ * @gpio: gpio number to configure
+ * @param: configuration values
+ *
+ * RETURNS: an appropriate -ERRNO error value on error, or zero for success.
+ */
+int pm8xxx_gpio_config(int gpio, struct pm_gpio *param);
+#else
+static inline int pm8xxx_gpio_config(int gpio, struct pm_gpio *param)
+{
+ return -ENXIO;
+}
+#endif
+
+#endif
diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
index d5517fd..def8c31 100644
--- a/include/linux/mfd/pm8xxx/pm8921.h
+++ b/include/linux/mfd/pm8xxx/pm8921.h
@@ -20,12 +20,23 @@
#include <linux/device.h>
#include <linux/mfd/pm8xxx/irq.h>
+#include <linux/mfd/pm8xxx/gpio.h>
#define PM8921_NR_IRQS 256
+#define PM8921_NR_GPIOS 44
+
+#define PM8921_GPIO_BLOCK_START 24
+#define PM8921_IRQ_BLOCK_BIT(block, bit) ((block) * 8 + (bit))
+
+/* GPIOs [1,N] */
+#define PM8921_GPIO_IRQ(base, gpio) ((base) + \
+ PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, (gpio)-1))
+
struct pm8921_platform_data {
int irq_base;
struct pm8xxx_irq_platform_data *irq_pdata;
+ struct pm8xxx_gpio_platform_data *gpio_pdata;
};
#endif
--
1.7.1
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver
2011-04-27 6:18 [PATCH 0/2] fix mpp and gpio for pm8921 Abhijeet Dharmapurikar
2011-04-27 6:18 ` [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver Abhijeet Dharmapurikar
@ 2011-04-27 6:18 ` Abhijeet Dharmapurikar
2011-05-04 0:54 ` Grant Likely
1 sibling, 1 reply; 5+ messages in thread
From: Abhijeet Dharmapurikar @ 2011-04-27 6:18 UTC (permalink / raw)
To: linux-arm-kernel
From: David Collins <collinsd@codeaurora.org>
Add support for multi-purpose pins (MPPs) on Qualcomm PM8xxx
PMIC chips.
PM8xxx MPPs can be configured as digital or analog inputs or
outputs, current sinks, or buffers.
Note that mpp pins appear as gpio lines to the kernel. However they
are implemented separately from the pmic's gpio driver as
mpps have different configuration attributes and have different
register controls than the pmic's gpio controller. Basically they are
different set of pins.
Signed-off-by: David Collins <collinsd@codeaurora.org>
---
drivers/gpio/Kconfig | 8 +
drivers/gpio/Makefile | 1 +
drivers/gpio/pm8xxx-mpp.c | 325 +++++++++++++++++++++++++++++++++++++
drivers/mfd/pm8921-core.c | 30 ++++
include/linux/mfd/pm8xxx/mpp.h | 233 ++++++++++++++++++++++++++
include/linux/mfd/pm8xxx/pm8921.h | 9 +-
6 files changed, 605 insertions(+), 1 deletions(-)
create mode 100644 drivers/gpio/pm8xxx-mpp.c
create mode 100644 include/linux/mfd/pm8xxx/mpp.h
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 2035f90..e6efaca 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -428,4 +428,12 @@ config GPIO_PM8XXX
This option enables support for on-chip GPIO found on Qualcomm PM8xxx
PMICs.
+config GPIO_PM8XXX_MPP
+ tristate "Support for Qualcomm PM8xxx MPP features"
+ depends on MFD_PM8XXX
+ default y if MFD_PM8XXX
+ help
+ This is the multi-purpose pin (MPP) driver for Qualcomm PM 8xxx PMIC
+ chips.
+
endif
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 337aa34..50ee44d 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -44,3 +44,4 @@ obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
obj-$(CONFIG_GPIO_PM8XXX) += pm8xxx-gpio.o
+obj-$(CONFIG_GPIO_PM8XXX_MPP) += pm8xxx-mpp.o
diff --git a/drivers/gpio/pm8xxx-mpp.c b/drivers/gpio/pm8xxx-mpp.c
new file mode 100644
index 0000000..1607fbf
--- /dev/null
+++ b/drivers/gpio/pm8xxx-mpp.c
@@ -0,0 +1,325 @@
+/*
+ * Qualcomm PM8XXX Multi-Purpose Pin (MPP) driver
+ *
+ * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/spinlock.h>
+#include <linux/mfd/pm8xxx/core.h>
+#include <linux/mfd/pm8xxx/mpp.h>
+
+/* MPP Type */
+#define PM8XXX_MPP_TYPE_MASK 0xE0
+#define PM8XXX_MPP_TYPE_SHIFT 5
+
+/* MPP Config Level */
+#define PM8XXX_MPP_CONFIG_LVL_MASK 0x1C
+#define PM8XXX_MPP_CONFIG_LVL_SHIFT 2
+
+/* MPP Config Control */
+#define PM8XXX_MPP_CONFIG_CTRL_MASK 0x03
+#define PM8XXX_MPP_CONFIG_CTRL_SHIFT 0
+
+struct pm8xxx_mpp_chip {
+ struct list_head link;
+ struct gpio_chip gpio_chip;
+ spinlock_t pm_lock;
+ u8 *ctrl_reg;
+ int mpp_base;
+ int irq_base;
+ int nmpps;
+ u16 base_addr;
+};
+
+static LIST_HEAD(pm8xxx_mpp_chips);
+static DEFINE_MUTEX(pm8xxx_mpp_chips_lock);
+
+static int pm8xxx_mpp_write(struct pm8xxx_mpp_chip *mpp_chip, u16 offset,
+ u8 val, u8 mask)
+{
+ u8 reg;
+ int rc;
+ unsigned long flags;
+
+ spin_lock_irqsave(&mpp_chip->pm_lock, flags);
+
+ reg = (mpp_chip->ctrl_reg[offset] & ~mask) | (val & mask);
+ rc = pm8xxx_writeb(mpp_chip->gpio_chip.dev->parent,
+ mpp_chip->base_addr + offset, reg);
+ if (!rc)
+ mpp_chip->ctrl_reg[offset] = reg;
+
+ spin_unlock_irqrestore(&mpp_chip->pm_lock, flags);
+
+ return rc;
+}
+
+static int pm8xxx_mpp_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+
+ return mpp_chip->irq_base + offset;
+}
+
+static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+ int rc;
+
+ if ((mpp_chip->ctrl_reg[offset] & PM8XXX_MPP_TYPE_MASK) >>
+ PM8XXX_MPP_TYPE_SHIFT == PM8XXX_MPP_TYPE_D_OUTPUT)
+ rc = mpp_chip->ctrl_reg[offset] & PM8XXX_MPP_CONFIG_CTRL_MASK;
+ else
+ rc = pm8xxx_read_irq_stat(mpp_chip->gpio_chip.dev->parent,
+ mpp_chip->irq_base + offset);
+
+ return rc;
+}
+
+static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int val)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+ u8 reg = val ? PM8XXX_MPP_DOUT_CTRL_HIGH : PM8XXX_MPP_DOUT_CTRL_LOW;
+ int rc;
+
+ rc = pm8xxx_mpp_write(mpp_chip, offset, reg,
+ PM8XXX_MPP_CONFIG_CTRL_MASK);
+ if (rc)
+ pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
+}
+
+static int pm8xxx_mpp_dir_input(struct gpio_chip *chip, unsigned offset)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+ int rc = pm8xxx_mpp_write(mpp_chip, offset,
+ PM8XXX_MPP_TYPE_D_INPUT << PM8XXX_MPP_TYPE_SHIFT,
+ PM8XXX_MPP_TYPE_MASK);
+
+ if (rc)
+ pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
+ return rc;
+}
+
+static int pm8xxx_mpp_dir_output(struct gpio_chip *chip,
+ unsigned offset, int val)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+ u8 reg = (PM8XXX_MPP_TYPE_D_OUTPUT << PM8XXX_MPP_TYPE_SHIFT) |
+ (val & PM8XXX_MPP_CONFIG_CTRL_MASK);
+ u8 mask = PM8XXX_MPP_TYPE_MASK | PM8XXX_MPP_CONFIG_CTRL_MASK;
+ int rc = pm8xxx_mpp_write(mpp_chip, offset, reg, mask);
+
+ if (rc)
+ pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
+ return rc;
+}
+
+static void pm8xxx_mpp_dbg_show(struct seq_file *s, struct gpio_chip *chip)
+{
+ static const char * const ctype[] = { "d_in", "d_out", "bi_dir",
+ "a_in", "a_out", "sink",
+ "dtest_sink", "dtest_out"
+ };
+ struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
+ u8 type, state;
+ const char *label;
+ int i;
+
+ for (i = 0; i < mpp_chip->nmpps; i++) {
+ label = gpiochip_is_requested(chip, i);
+ type = (mpp_chip->ctrl_reg[i] & PM8XXX_MPP_TYPE_MASK) >>
+ PM8XXX_MPP_TYPE_SHIFT;
+ state = pm8xxx_mpp_get(chip, i);
+ seq_printf(s, "gpio-%-3d (%-12.12s) %-10.10s"
+ " %s 0x%02x\n",
+ chip->base + i,
+ label ? label : "--",
+ ctype[type],
+ state ? "hi" : "lo",
+ mpp_chip->ctrl_reg[i]);
+ }
+}
+
+int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
+ unsigned control)
+{
+ struct pm8xxx_mpp_chip *mpp_chip;
+ int rc, found = 0;
+ u8 config, mask;
+
+ mutex_lock(&pm8xxx_mpp_chips_lock);
+ list_for_each_entry(mpp_chip, &pm8xxx_mpp_chips, link) {
+ if (mpp >= mpp_chip->mpp_base
+ && mpp < mpp_chip->mpp_base + mpp_chip->nmpps) {
+ found = 1;
+ break;
+ }
+ }
+ mutex_unlock(&pm8xxx_mpp_chips_lock);
+ if (!found) {
+ pr_err("called on mpp %d not handled by any pmic\n", mpp);
+ return -EINVAL;
+ }
+
+ mask = PM8XXX_MPP_TYPE_MASK | PM8XXX_MPP_CONFIG_LVL_MASK |
+ PM8XXX_MPP_CONFIG_CTRL_MASK;
+ config = (type << PM8XXX_MPP_TYPE_SHIFT) & PM8XXX_MPP_TYPE_MASK;
+ config |= (level << PM8XXX_MPP_CONFIG_LVL_SHIFT) &
+ PM8XXX_MPP_CONFIG_LVL_MASK;
+ config |= control & PM8XXX_MPP_CONFIG_CTRL_MASK;
+
+ rc = pm8xxx_mpp_write(mpp_chip, mpp - mpp_chip->mpp_base, config, mask);
+
+ if (rc)
+ pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
+
+ return rc;
+}
+EXPORT_SYMBOL_GPL(pm8xxx_mpp_config);
+
+static int __devinit pm8xxx_mpp_reg_init(struct pm8xxx_mpp_chip *mpp_chip)
+{
+ int rc, i;
+
+ for (i = 0; i < mpp_chip->nmpps; i++) {
+ rc = pm8xxx_readb(mpp_chip->gpio_chip.dev->parent,
+ mpp_chip->base_addr + i,
+ &mpp_chip->ctrl_reg[i]);
+ if (rc) {
+ pr_err("failed to read register 0x%x rc=%d\n",
+ mpp_chip->base_addr + i, rc);
+ return rc;
+ }
+ }
+ return 0;
+}
+
+static int __devinit pm8xxx_mpp_probe(struct platform_device *pdev)
+{
+ int rc;
+ const struct pm8xxx_mpp_platform_data *pdata = pdev->dev.platform_data;
+ struct pm8xxx_mpp_chip *mpp_chip;
+
+ if (!pdata) {
+ pr_err("missing platform data\n");
+ return -EINVAL;
+ }
+
+ mpp_chip = kzalloc(sizeof(struct pm8xxx_mpp_chip), GFP_KERNEL);
+ if (!mpp_chip) {
+ pr_err("Cannot allocate %d bytes\n",
+ sizeof(struct pm8xxx_mpp_chip));
+ return -ENOMEM;
+ }
+
+ mpp_chip->ctrl_reg = kzalloc(pdata->core_data.nmpps, GFP_KERNEL);
+ if (!mpp_chip->ctrl_reg) {
+ pr_err("Cannot allocate %d bytes\n", pdata->core_data.nmpps);
+ rc = -ENOMEM;
+ goto free_mpp_chip;
+ }
+
+ spin_lock_init(&mpp_chip->pm_lock);
+
+ mpp_chip->gpio_chip.label = PM8XXX_MPP_DEV_NAME;
+ mpp_chip->gpio_chip.direction_input = pm8xxx_mpp_dir_input;
+ mpp_chip->gpio_chip.direction_output = pm8xxx_mpp_dir_output;
+ mpp_chip->gpio_chip.to_irq = pm8xxx_mpp_to_irq;
+ mpp_chip->gpio_chip.get = pm8xxx_mpp_get;
+ mpp_chip->gpio_chip.set = pm8xxx_mpp_set;
+ mpp_chip->gpio_chip.dbg_show = pm8xxx_mpp_dbg_show;
+ mpp_chip->gpio_chip.ngpio = pdata->core_data.nmpps;
+ mpp_chip->gpio_chip.can_sleep = 1;
+ mpp_chip->gpio_chip.dev = &pdev->dev;
+ mpp_chip->gpio_chip.base = pdata->mpp_base;
+ mpp_chip->irq_base = platform_get_irq(pdev, 0);
+ mpp_chip->mpp_base = pdata->mpp_base;
+ mpp_chip->base_addr = pdata->core_data.base_addr;
+ mpp_chip->nmpps = pdata->core_data.nmpps;
+
+ mutex_lock(&pm8xxx_mpp_chips_lock);
+ list_add(&mpp_chip->link, &pm8xxx_mpp_chips);
+ mutex_unlock(&pm8xxx_mpp_chips_lock);
+
+ platform_set_drvdata(pdev, mpp_chip);
+
+ rc = gpiochip_add(&mpp_chip->gpio_chip);
+ if (rc) {
+ pr_err("gpiochip_add failed, rc=%d\n", rc);
+ goto reset_drvdata;
+ }
+
+ rc = pm8xxx_mpp_reg_init(mpp_chip);
+ if (rc) {
+ pr_err("failed to read MPP ctrl registers, rc=%d\n", rc);
+ goto remove_chip;
+ }
+
+ return 0;
+
+remove_chip:
+ if (gpiochip_remove(&mpp_chip->gpio_chip))
+ pr_err("failed to remove gpio chip\n");
+reset_drvdata:
+ platform_set_drvdata(pdev, NULL);
+free_mpp_chip:
+ kfree(mpp_chip);
+ return rc;
+}
+
+static int __devexit pm8xxx_mpp_remove(struct platform_device *pdev)
+{
+ struct pm8xxx_mpp_chip *mpp_chip = platform_get_drvdata(pdev);
+
+ mutex_lock(&pm8xxx_mpp_chips_lock);
+ list_del(&mpp_chip->link);
+ mutex_unlock(&pm8xxx_mpp_chips_lock);
+ platform_set_drvdata(pdev, NULL);
+ if (gpiochip_remove(&mpp_chip->gpio_chip))
+ pr_err("failed to remove gpio chip\n");
+ kfree(mpp_chip->ctrl_reg);
+ kfree(mpp_chip);
+
+ return 0;
+}
+
+static struct platform_driver pm8xxx_mpp_driver = {
+ .probe = pm8xxx_mpp_probe,
+ .remove = __devexit_p(pm8xxx_mpp_remove),
+ .driver = {
+ .name = PM8XXX_MPP_DEV_NAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init pm8xxx_mpp_init(void)
+{
+ return platform_driver_register(&pm8xxx_mpp_driver);
+}
+subsys_initcall(pm8xxx_mpp_init);
+
+static void __exit pm8xxx_mpp_exit(void)
+{
+ platform_driver_unregister(&pm8xxx_mpp_driver);
+}
+module_exit(pm8xxx_mpp_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("PM8XXX MPP driver");
+MODULE_VERSION("1.0");
+MODULE_ALIAS("platform:" PM8XXX_MPP_DEV_NAME);
diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index 0f1691f..2fbd42d 100644
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -25,6 +25,8 @@
#define REG_HWREV 0x002 /* PMIC4 revision */
#define REG_HWREV_2 0x0E8 /* PMIC4 revision 2 */
+#define REG_MPP_BASE 0x050
+
struct pm8921 {
struct device *dev;
struct pm_irq_chip *irq_chip;
@@ -96,6 +98,22 @@ static struct mfd_cell gpio_cell __devinitdata = {
.num_resources = ARRAY_SIZE(gpio_cell_resources),
};
+static const struct resource mpp_cell_resources[] __devinitconst = {
+ {
+ .start = PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, 0),
+ .end = PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, 0)
+ + PM8921_NR_MPPS - 1,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct mfd_cell mpp_cell __devinitdata = {
+ .name = PM8XXX_MPP_DEV_NAME,
+ .id = -1,
+ .resources = mpp_cell_resources,
+ .num_resources = ARRAY_SIZE(mpp_cell_resources),
+};
+
static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
*pdata,
struct pm8921 *pmic,
@@ -130,6 +148,18 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
}
}
+ if (pdata->mpp_pdata) {
+ pdata->mpp_pdata->core_data.nmpps = PM8921_NR_MPPS;
+ pdata->mpp_pdata->core_data.base_addr = REG_MPP_BASE;
+ mpp_cell.mfd_data = pdata->mpp_pdata;
+ ret = mfd_add_devices(pmic->dev, 0, &mpp_cell, 1, NULL,
+ irq_base);
+ if (ret) {
+ pr_err("Failed to add mpp subdevice ret=%d\n", ret);
+ goto bail;
+ }
+ }
+
return 0;
bail:
if (pmic->irq_chip) {
diff --git a/include/linux/mfd/pm8xxx/mpp.h b/include/linux/mfd/pm8xxx/mpp.h
new file mode 100644
index 0000000..2d9884e
--- /dev/null
+++ b/include/linux/mfd/pm8xxx/mpp.h
@@ -0,0 +1,233 @@
+/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * 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.
+ */
+
+#ifndef __PM8XXX_MPP_H
+#define __PM8XXX_MPP_H
+
+#include <linux/errno.h>
+
+#define PM8XXX_MPP_DEV_NAME "pm8xxx-mpp"
+
+struct pm8xxx_mpp_core_data {
+ int base_addr;
+ int nmpps;
+};
+
+struct pm8xxx_mpp_platform_data {
+ struct pm8xxx_mpp_core_data core_data;
+ int mpp_base;
+};
+
+/* API */
+#if defined(CONFIG_GPIO_PM8XXX_MPP) || defined(CONFIG_GPIO_PM8XXX_MPP_MODULE)
+
+/**
+ * pm8xxx_mpp_config() - configure control options of a multi-purpose pin (MPP)
+ * @mpp: global GPIO number corresponding to the MPP
+ * @type: MPP type which determines the overall MPP function (i.e. digital
+ * in/out/bi, analog in/out, current sink, or test). It should be
+ * set to the value of one of PM8XXX_MPP_TYPE_D_*.
+ * @level: meaning depends upon MPP type specified
+ * @control: meaning depends upon MPP type specified
+ * Context: can sleep
+ *
+ * RETURNS: an appropriate -ERRNO error value on error, or zero for success.
+ *
+ * Usage of level argument:
+ * 1. type = PM8XXX_MPP_TYPE_D_INPUT, PM8XXX_MPP_TYPE_D_OUTPUT,
+ * PM8XXX_MPP_TYPE_D_BI_DIR, or PM8XXX_MPP_TYPE_DTEST_OUTPUT -
+ *
+ * level specifies that digital logic level to use for the MPP. It should
+ * be set to the value of one of PM8XXX_MPP_DIG_LEVEL_*. Actual regulator
+ * connections for these level choices are PMIC chip specific.
+ *
+ * 2. type = PM8XXX_MPP_TYPE_A_INPUT -
+ *
+ * level specifies where in the PMIC chip the analog input value should
+ * be routed to. It should be set to the value of one of
+ * PM8XXX_MPP_AIN_AMUX_*.
+ *
+ * 3. type = PM8XXX_MPP_TYPE_A_OUTPUT -
+ *
+ * level specifies the output analog voltage reference level. It should
+ * be set to the value of one of PM8XXX_MPP_AOUT_LVL_*.
+ *
+ * 4. type = PM8XXX_MPP_TYPE_SINK or PM8XXX_MPP_TYPE_DTEST_SINK -
+ *
+ * level specifies the output current level. It should be set to the value
+ * of one of PM8XXX_MPP_CS_OUT_*.
+ *
+ * Usage of control argument:
+ * 1. type = PM8XXX_MPP_TYPE_D_INPUT -
+ *
+ * control specifies how the digital input should be routed in the chip.
+ * It should be set to the value of one of PM8XXX_MPP_DIN_TO_*.
+ *
+ * 2. type = PM8XXX_MPP_TYPE_D_OUTPUT -
+ *
+ * control specifies the digital output value. It should be set to the
+ * value of one of PM8XXX_MPP_DOUT_CTRL_*.
+ *
+ * 3. type = PM8XXX_MPP_TYPE_D_BI_DIR -
+ *
+ * control specifies the pullup resistor value. It should be set to the
+ * value of one of PM8XXX_MPP_BI_PULLUP_*.
+ *
+ * 4. type = PM8XXX_MPP_TYPE_A_INPUT -
+ *
+ * control is unused; a value of 0 is sufficient.
+ *
+ * 5. type = PM8XXX_MPP_TYPE_A_OUTPUT -
+ *
+ * control specifies if analog output is enabled. It should be set to the
+ * value of one of PM8XXX_MPP_AOUT_CTRL_*.
+ *
+ * 6. type = PM8XXX_MPP_TYPE_SINK -
+ *
+ * control specifies if current sinking is enabled. It should be set to
+ * the value of one of PM8XXX_MPP_CS_CTRL_*.
+ *
+ * 7. type = PM8XXX_MPP_TYPE_DTEST_SINK -
+ *
+ * control specifies if current sinking is enabled. It should be set to
+ * the value of one of PM8XXX_MPP_DTEST_CS_CTRL_*.
+ *
+ * 8. type = PM8XXX_MPP_TYPE_DTEST_OUTPUT -
+ *
+ * control specifies which DTEST bus value to output. It should be set to
+ * the value of one of PM8XXX_MPP_DTEST_*.
+ */
+int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
+ unsigned control);
+
+#else
+
+static inline int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
+ unsigned control)
+{
+ return -ENXIO;
+}
+
+#endif
+
+/* MPP Type: type */
+#define PM8XXX_MPP_TYPE_D_INPUT 0
+#define PM8XXX_MPP_TYPE_D_OUTPUT 1
+#define PM8XXX_MPP_TYPE_D_BI_DIR 2
+#define PM8XXX_MPP_TYPE_A_INPUT 3
+#define PM8XXX_MPP_TYPE_A_OUTPUT 4
+#define PM8XXX_MPP_TYPE_SINK 5
+#define PM8XXX_MPP_TYPE_DTEST_SINK 6
+#define PM8XXX_MPP_TYPE_DTEST_OUTPUT 7
+
+/* Digital Input/Output: level */
+#define PM8XXX_MPP_DIG_LEVEL_VIO_0 0
+#define PM8XXX_MPP_DIG_LEVEL_VIO_1 1
+#define PM8XXX_MPP_DIG_LEVEL_VIO_2 2
+#define PM8XXX_MPP_DIG_LEVEL_VIO_3 3
+#define PM8XXX_MPP_DIG_LEVEL_VIO_4 4
+#define PM8XXX_MPP_DIG_LEVEL_VIO_5 5
+#define PM8XXX_MPP_DIG_LEVEL_VIO_6 6
+#define PM8XXX_MPP_DIG_LEVEL_VIO_7 7
+
+/* Digital Input/Output: level [PM8058] */
+#define PM8058_MPP_DIG_LEVEL_VPH 0
+#define PM8058_MPP_DIG_LEVEL_S3 1
+#define PM8058_MPP_DIG_LEVEL_L2 2
+#define PM8058_MPP_DIG_LEVEL_L3 3
+
+/* Digital Input/Output: level [PM8901] */
+#define PM8901_MPP_DIG_LEVEL_MSMIO 0
+#define PM8901_MPP_DIG_LEVEL_DIG 1
+#define PM8901_MPP_DIG_LEVEL_L5 2
+#define PM8901_MPP_DIG_LEVEL_S4 3
+#define PM8901_MPP_DIG_LEVEL_VPH 4
+
+/* Digital Input/Output: level [PM8921] */
+#define PM8921_MPP_DIG_LEVEL_S4 1
+#define PM8921_MPP_DIG_LEVEL_L15 3
+#define PM8921_MPP_DIG_LEVEL_L17 4
+#define PM8921_MPP_DIG_LEVEL_VPH 7
+
+/* Digital Input: control */
+#define PM8XXX_MPP_DIN_TO_INT 0
+#define PM8XXX_MPP_DIN_TO_DBUS1 1
+#define PM8XXX_MPP_DIN_TO_DBUS2 2
+#define PM8XXX_MPP_DIN_TO_DBUS3 3
+
+/* Digital Output: control */
+#define PM8XXX_MPP_DOUT_CTRL_LOW 0
+#define PM8XXX_MPP_DOUT_CTRL_HIGH 1
+#define PM8XXX_MPP_DOUT_CTRL_MPP 2
+#define PM8XXX_MPP_DOUT_CTRL_INV_MPP 3
+
+/* Bidirectional: control */
+#define PM8XXX_MPP_BI_PULLUP_1KOHM 0
+#define PM8XXX_MPP_BI_PULLUP_OPEN 1
+#define PM8XXX_MPP_BI_PULLUP_10KOHM 2
+#define PM8XXX_MPP_BI_PULLUP_30KOHM 3
+
+/* Analog Input: level */
+#define PM8XXX_MPP_AIN_AMUX_CH5 0
+#define PM8XXX_MPP_AIN_AMUX_CH6 1
+#define PM8XXX_MPP_AIN_AMUX_CH7 2
+#define PM8XXX_MPP_AIN_AMUX_CH8 3
+#define PM8XXX_MPP_AIN_AMUX_CH9 4
+#define PM8XXX_MPP_AIN_AMUX_ABUS1 5
+#define PM8XXX_MPP_AIN_AMUX_ABUS2 6
+#define PM8XXX_MPP_AIN_AMUX_ABUS3 7
+
+/* Analog Output: level */
+#define PM8XXX_MPP_AOUT_LVL_1V25 0
+#define PM8XXX_MPP_AOUT_LVL_1V25_2 1
+#define PM8XXX_MPP_AOUT_LVL_0V625 2
+#define PM8XXX_MPP_AOUT_LVL_0V3125 3
+#define PM8XXX_MPP_AOUT_LVL_MPP 4
+#define PM8XXX_MPP_AOUT_LVL_ABUS1 5
+#define PM8XXX_MPP_AOUT_LVL_ABUS2 6
+#define PM8XXX_MPP_AOUT_LVL_ABUS3 7
+
+/* Analog Output: control */
+#define PM8XXX_MPP_AOUT_CTRL_DISABLE 0
+#define PM8XXX_MPP_AOUT_CTRL_ENABLE 1
+#define PM8XXX_MPP_AOUT_CTRL_MPP_HIGH_EN 2
+#define PM8XXX_MPP_AOUT_CTRL_MPP_LOW_EN 3
+
+/* Current Sink: level */
+#define PM8XXX_MPP_CS_OUT_5MA 0
+#define PM8XXX_MPP_CS_OUT_10MA 1
+#define PM8XXX_MPP_CS_OUT_15MA 2
+#define PM8XXX_MPP_CS_OUT_20MA 3
+#define PM8XXX_MPP_CS_OUT_25MA 4
+#define PM8XXX_MPP_CS_OUT_30MA 5
+#define PM8XXX_MPP_CS_OUT_35MA 6
+#define PM8XXX_MPP_CS_OUT_40MA 7
+
+/* Current Sink: control */
+#define PM8XXX_MPP_CS_CTRL_DISABLE 0
+#define PM8XXX_MPP_CS_CTRL_ENABLE 1
+#define PM8XXX_MPP_CS_CTRL_MPP_HIGH_EN 2
+#define PM8XXX_MPP_CS_CTRL_MPP_LOW_EN 3
+
+/* DTEST Current Sink: control */
+#define PM8XXX_MPP_DTEST_CS_CTRL_EN1 0
+#define PM8XXX_MPP_DTEST_CS_CTRL_EN2 1
+#define PM8XXX_MPP_DTEST_CS_CTRL_EN3 2
+#define PM8XXX_MPP_DTEST_CS_CTRL_EN4 3
+
+/* DTEST Digital Output: control */
+#define PM8XXX_MPP_DTEST_DBUS1 0
+#define PM8XXX_MPP_DTEST_DBUS2 1
+#define PM8XXX_MPP_DTEST_DBUS3 2
+#define PM8XXX_MPP_DTEST_DBUS4 3
+
+#endif
diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
index def8c31..19cffb2 100644
--- a/include/linux/mfd/pm8xxx/pm8921.h
+++ b/include/linux/mfd/pm8xxx/pm8921.h
@@ -21,22 +21,29 @@
#include <linux/device.h>
#include <linux/mfd/pm8xxx/irq.h>
#include <linux/mfd/pm8xxx/gpio.h>
+#include <linux/mfd/pm8xxx/mpp.h>
#define PM8921_NR_IRQS 256
#define PM8921_NR_GPIOS 44
+#define PM8921_NR_MPPS 12
+
#define PM8921_GPIO_BLOCK_START 24
+#define PM8921_MPP_BLOCK_START 16
#define PM8921_IRQ_BLOCK_BIT(block, bit) ((block) * 8 + (bit))
-/* GPIOs [1,N] */
+/* GPIOs and MPPs [1,N] */
#define PM8921_GPIO_IRQ(base, gpio) ((base) + \
PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, (gpio)-1))
+#define PM8921_MPP_IRQ(base, mpp) ((base) + \
+ PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, (mpp)-1))
struct pm8921_platform_data {
int irq_base;
struct pm8xxx_irq_platform_data *irq_pdata;
struct pm8xxx_gpio_platform_data *gpio_pdata;
+ struct pm8xxx_mpp_platform_data *mpp_pdata;
};
#endif
--
1.7.1
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver
2011-04-27 6:18 ` [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver Abhijeet Dharmapurikar
@ 2011-05-04 0:38 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2011-05-04 0:38 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 26, 2011 at 11:18:46PM -0700, Abhijeet Dharmapurikar wrote:
> Add support for GPIO on Qualcomm PM8xxx PMIC chips.
>
> Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org>
<sigh>. This ends up being yet-another hand coded GPIO controller that
isn't at all much different from any of the other gpio controllers.
We really should be a lot better at handling this sort of thing. A
lot of access routines could be generalized, but unfortunately none of
that exists yet. Eventually I'm going to force the issue and start
saying 'no' to these kinds of drivers, but not today, and not until
there is some semblance of an alternative (not your fault, I know.
You're patch just happens to have my attention).
Some minor comments below. If they are fixed up, then Samuel can pick
it up with my:
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> drivers/gpio/Kconfig | 9 +
> drivers/gpio/Makefile | 1 +
> drivers/gpio/pm8xxx-gpio.c | 455 +++++++++++++++++++++++++++++++++++++
drivers/gpio/gpio-pm8xxx.c
I'm enforcing a 'gpio-*.c' naming convention now.
> drivers/mfd/pm8921-core.c | 35 +++
> include/linux/mfd/pm8xxx/gpio.h | 135 +++++++++++
> include/linux/mfd/pm8xxx/pm8921.h | 11 +
> 6 files changed, 646 insertions(+), 0 deletions(-)
> create mode 100644 drivers/gpio/pm8xxx-gpio.c
> create mode 100644 include/linux/mfd/pm8xxx/gpio.h
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index d3b2953..2035f90 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -419,4 +419,13 @@ config AB8500_GPIO
> depends on AB8500_CORE && BROKEN
> help
> Select this to enable the AB8500 IC GPIO driver
> +
> +config GPIO_PM8XXX
> + tristate "Qualcomm PM8xxx GPIO support"
> + depends on MFD_PM8XXX
> + default y if MFD_PM8XXX
> + help
> + This option enables support for on-chip GPIO found on Qualcomm PM8xxx
> + PMICs.
> +
Is this really a "MODULbus GPIO controller"? It's under the MODULbus
header in Kconfig.
> endif
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index becef59..337aa34 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -43,3 +43,4 @@ obj-$(CONFIG_GPIO_SX150X) += sx150x.o
> obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
> obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
> obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
> +obj-$(CONFIG_GPIO_PM8XXX) += pm8xxx-gpio.o
> diff --git a/drivers/gpio/pm8xxx-gpio.c b/drivers/gpio/pm8xxx-gpio.c
> new file mode 100644
> index 0000000..eada9cd
> --- /dev/null
> +++ b/drivers/gpio/pm8xxx-gpio.c
> @@ -0,0 +1,455 @@
> +/*
> + * Qualcomm PMIC8XXX GPIO driver
> + *
> + * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * 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.
> + */
> +
> +#define pr_fmt(fmt) "%s: " fmt, __func__
> +
> +#include <linux/platform_device.h>
> +#include <linux/gpio.h>
> +#include <linux/mfd/pm8xxx/core.h>
> +#include <linux/mfd/pm8xxx/gpio.h>
> +#include <linux/debugfs.h>
> +#include <linux/uaccess.h>
> +#include <linux/fs.h>
> +#include <linux/seq_file.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +
> +/* GPIO registers */
> +#define SSBI_REG_ADDR_GPIO_BASE 0x150
> +#define SSBI_REG_ADDR_GPIO(n) (SSBI_REG_ADDR_GPIO_BASE + n)
> +
> +/* GPIO */
> +#define PM_GPIO_BANK_MASK 0x70
> +#define PM_GPIO_BANK_SHIFT 4
> +#define PM_GPIO_WRITE 0x80
> +
> +/* Bank 0 */
> +#define PM_GPIO_VIN_MASK 0x0E
> +#define PM_GPIO_VIN_SHIFT 1
> +#define PM_GPIO_MODE_ENABLE 0x01
> +
> +/* Bank 1 */
> +#define PM_GPIO_MODE_MASK 0x0C
> +#define PM_GPIO_MODE_SHIFT 2
> +#define PM_GPIO_OUT_BUFFER 0x02
> +#define PM_GPIO_OUT_INVERT 0x01
> +
> +#define PM_GPIO_MODE_OFF 3
> +#define PM_GPIO_MODE_OUTPUT 2
> +#define PM_GPIO_MODE_INPUT 0
> +#define PM_GPIO_MODE_BOTH 1
> +
> +/* Bank 2 */
> +#define PM_GPIO_PULL_MASK 0x0E
> +#define PM_GPIO_PULL_SHIFT 1
> +
> +/* Bank 3 */
> +#define PM_GPIO_OUT_STRENGTH_MASK 0x0C
> +#define PM_GPIO_OUT_STRENGTH_SHIFT 2
> +#define PM_GPIO_PIN_ENABLE 0x00
> +#define PM_GPIO_PIN_DISABLE 0x01
> +
> +/* Bank 4 */
> +#define PM_GPIO_FUNC_MASK 0x0E
> +#define PM_GPIO_FUNC_SHIFT 1
> +
> +/* Bank 5 */
> +#define PM_GPIO_NON_INT_POL_INV 0x08
> +#define PM_GPIO_BANKS 6
> +
> +struct pm_gpio_chip {
> + struct list_head link;
> + struct gpio_chip gpio_chip;
> + spinlock_t pm_lock;
> + u8 *bank1;
> + int irq_base;
> +};
> +
> +static LIST_HEAD(pm_gpio_chips);
> +static DEFINE_MUTEX(pm_gpio_chips_lock);
> +
> +static int pm_gpio_get(struct pm_gpio_chip *pm_gpio_chip, unsigned gpio)
> +{
> + int mode;
> +
> + if (gpio >= pm_gpio_chip->gpio_chip.ngpio || pm_gpio_chip == NULL)
> + return -EINVAL;
> +
> + /* Get gpio value from config bank 1 if output gpio.
> + Get gpio value from IRQ RT status register for all other gpio modes.
> + */
> + mode = (pm_gpio_chip->bank1[gpio] & PM_GPIO_MODE_MASK) >>
> + PM_GPIO_MODE_SHIFT;
> + if (mode == PM_GPIO_MODE_OUTPUT)
> + return pm_gpio_chip->bank1[gpio] & PM_GPIO_OUT_INVERT;
> + else
> + return pm8xxx_read_irq_stat(pm_gpio_chip->gpio_chip.dev->parent,
> + pm_gpio_chip->irq_base + gpio);
> +}
> +
> +static int pm_gpio_set(struct pm_gpio_chip *pm_gpio_chip,
> + unsigned gpio, int value)
> +{
> + int rc;
> + u8 bank1;
> + unsigned long flags;
> +
> + if (gpio >= pm_gpio_chip->gpio_chip.ngpio || pm_gpio_chip == NULL)
> + return -EINVAL;
> +
> + spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
> + bank1 = PM_GPIO_WRITE
> + | (pm_gpio_chip->bank1[gpio] & ~PM_GPIO_OUT_INVERT);
> +
> + if (value)
> + bank1 |= PM_GPIO_OUT_INVERT;
> +
> + pm_gpio_chip->bank1[gpio] = bank1;
> + rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
> + SSBI_REG_ADDR_GPIO(gpio), bank1);
> + spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
> +
> + if (rc)
> + pr_err("FAIL pm8xxx_writeb(): rc=%d. "
> + "(gpio=%d, value=%d)\n",
> + rc, gpio, value);
> +
> + return rc;
> +}
> +
> +static int dir_map[] = {
> + PM_GPIO_MODE_OFF,
> + PM_GPIO_MODE_OUTPUT,
> + PM_GPIO_MODE_INPUT,
> + PM_GPIO_MODE_BOTH,
> +};
> +
> +static int pm_gpio_set_direction(struct pm_gpio_chip *pm_gpio_chip,
> + unsigned gpio, int direction)
> +{
> + int rc;
> + u8 bank1;
> + unsigned long flags;
> +
> + if (!direction || pm_gpio_chip == NULL)
> + return -EINVAL;
> +
> + spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
> + bank1 = PM_GPIO_WRITE
> + | (pm_gpio_chip->bank1[gpio] & ~PM_GPIO_MODE_MASK);
> +
> + bank1 |= ((dir_map[direction] << PM_GPIO_MODE_SHIFT)
> + & PM_GPIO_MODE_MASK);
> +
> + pm_gpio_chip->bank1[gpio] = bank1;
> + rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
> + SSBI_REG_ADDR_GPIO(gpio), bank1);
> + spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
> +
> + if (rc)
> + pr_err("Failed on pm8xxx_writeb(): rc=%d (GPIO config)\n",
> + rc);
> +
> + return rc;
> +}
> +
> +static int pm_gpio_init_bank1(struct pm_gpio_chip *pm_gpio_chip)
> +{
> + int i, rc;
> + u8 bank;
> +
> + for (i = 0; i < pm_gpio_chip->gpio_chip.ngpio; i++) {
> + bank = 1 << PM_GPIO_BANK_SHIFT;
> + rc = pm8xxx_writeb(pm_gpio_chip->gpio_chip.dev->parent,
> + SSBI_REG_ADDR_GPIO(i),
> + bank);
> + if (rc) {
> + pr_err("error setting bank rc=%d\n", rc);
> + return rc;
> + }
> +
> + rc = pm8xxx_readb(pm_gpio_chip->gpio_chip.dev->parent,
> + SSBI_REG_ADDR_GPIO(i),
> + &pm_gpio_chip->bank1[i]);
> + if (rc) {
> + pr_err("error reading bank 1 rc=%d\n", rc);
> + return rc;
> + }
> + }
> + return 0;
> +}
> +
> +static int pm_gpio_to_irq(struct gpio_chip *gpio_chip, unsigned offset)
> +{
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> +
> + return pm_gpio_chip->irq_base + offset;
> +}
> +
> +static int pm_gpio_read(struct gpio_chip *gpio_chip, unsigned offset)
> +{
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> +
> + return pm_gpio_get(pm_gpio_chip, offset);
> +}
> +
> +static void pm_gpio_write(struct gpio_chip *gpio_chip,
> + unsigned offset, int val)
> +{
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> +
> + pm_gpio_set(pm_gpio_chip, offset, val);
> +}
> +
> +static int pm_gpio_direction_input(struct gpio_chip *gpio_chip,
> + unsigned offset)
> +{
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> +
> + return pm_gpio_set_direction(pm_gpio_chip, offset, PM_GPIO_DIR_IN);
> +}
> +
> +static int pm_gpio_direction_output(struct gpio_chip *gpio_chip,
> + unsigned offset,
> + int val)
> +{
> + int ret;
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> +
> + ret = pm_gpio_set_direction(pm_gpio_chip, offset, PM_GPIO_DIR_OUT);
> + if (!ret)
> + ret = pm_gpio_set(pm_gpio_chip, offset, val);
> +
> + return ret;
> +}
> +
> +static void pm_gpio_dbg_show(struct seq_file *s, struct gpio_chip *gpio_chip)
> +{
> + static const char * const cmode[] = { "in", "in/out", "out", "off" };
> + struct pm_gpio_chip *pm_gpio_chip = dev_get_drvdata(gpio_chip->dev);
> + u8 mode, state, bank;
> + const char *label;
> + int i, j;
> +
> + for (i = 0; i < gpio_chip->ngpio; i++) {
> + label = gpiochip_is_requested(gpio_chip, i);
> + mode = (pm_gpio_chip->bank1[i] & PM_GPIO_MODE_MASK) >>
> + PM_GPIO_MODE_SHIFT;
> + state = pm_gpio_get(pm_gpio_chip, i);
> + seq_printf(s, "gpio-%-3d (%-12.12s) %-10.10s"
> + " %s",
> + gpio_chip->base + i,
> + label ? label : "--",
> + cmode[mode],
> + state ? "hi" : "lo");
> + for (j = 0; j < PM_GPIO_BANKS; j++) {
> + bank = j << PM_GPIO_BANK_SHIFT;
> + pm8xxx_writeb(gpio_chip->dev->parent,
> + SSBI_REG_ADDR_GPIO(i),
> + bank);
> + pm8xxx_readb(gpio_chip->dev->parent,
> + SSBI_REG_ADDR_GPIO(i),
> + &bank);
> + seq_printf(s, " 0x%02x", bank);
> + }
> + seq_printf(s, "\n");
> + }
> +}
> +
> +static int __devinit pm_gpio_probe(struct platform_device *pdev)
> +{
> + int ret;
> + const struct pm8xxx_gpio_platform_data *pdata = pdev->dev.platform_data;
> + struct pm_gpio_chip *pm_gpio_chip;
> +
> + if (!pdata) {
> + pr_err("missing platform data\n");
> + return -EINVAL;
> + }
> +
> + pm_gpio_chip = kzalloc(sizeof(struct pm_gpio_chip), GFP_KERNEL);
> + if (!pm_gpio_chip) {
> + pr_err("Cannot allocate pm_gpio_chip\n");
> + return -ENOMEM;
> + }
> +
> + pm_gpio_chip->bank1 = kzalloc(sizeof(u8) * pdata->gpio_cdata.ngpios,
> + GFP_KERNEL);
> + if (!pm_gpio_chip->bank1) {
> + pr_err("Cannot allocate pm_gpio_chip->bank1\n");
> + return -ENOMEM;
> + }
> +
> + spin_lock_init(&pm_gpio_chip->pm_lock);
> + pm_gpio_chip->gpio_chip.label = "pm-gpio";
> + pm_gpio_chip->gpio_chip.direction_input = pm_gpio_direction_input;
> + pm_gpio_chip->gpio_chip.direction_output = pm_gpio_direction_output;
> + pm_gpio_chip->gpio_chip.to_irq = pm_gpio_to_irq;
> + pm_gpio_chip->gpio_chip.get = pm_gpio_read;
> + pm_gpio_chip->gpio_chip.set = pm_gpio_write;
> + pm_gpio_chip->gpio_chip.dbg_show = pm_gpio_dbg_show;
> + pm_gpio_chip->gpio_chip.ngpio = pdata->gpio_cdata.ngpios;
> + pm_gpio_chip->gpio_chip.can_sleep = 1;
> + pm_gpio_chip->gpio_chip.dev = &pdev->dev;
> + pm_gpio_chip->gpio_chip.base = pdata->gpio_base;
> + pm_gpio_chip->irq_base = platform_get_irq(pdev, 0);
> + mutex_lock(&pm_gpio_chips_lock);
> + list_add(&pm_gpio_chip->link, &pm_gpio_chips);
> + mutex_unlock(&pm_gpio_chips_lock);
> + platform_set_drvdata(pdev, pm_gpio_chip);
> +
> + ret = gpiochip_add(&pm_gpio_chip->gpio_chip);
> + if (ret) {
> + pr_err("gpiochip_add failed ret = %d\n", ret);
> + goto reset_drvdata;
> + }
> +
> + ret = pm_gpio_init_bank1(pm_gpio_chip);
> + if (ret) {
> + pr_err("gpio init bank failed ret = %d\n", ret);
> + goto remove_chip;
> + }
> +
> + return 0;
> +
> +remove_chip:
> + if (gpiochip_remove(&pm_gpio_chip->gpio_chip))
> + pr_err("failed to remove gpio chip\n");
> +reset_drvdata:
> + platform_set_drvdata(pdev, NULL);
> + kfree(pm_gpio_chip);
> + return ret;
> +}
> +
> +static int __devexit pm_gpio_remove(struct platform_device *pdev)
> +{
> + struct pm_gpio_chip *pm_gpio_chip
> + = platform_get_drvdata(pdev);
> +
> + mutex_lock(&pm_gpio_chips_lock);
> + list_del(&pm_gpio_chip->link);
> + mutex_unlock(&pm_gpio_chips_lock);
> + platform_set_drvdata(pdev, NULL);
> + if (gpiochip_remove(&pm_gpio_chip->gpio_chip))
> + pr_err("failed to remove gpio chip\n");
> + kfree(pm_gpio_chip->bank1);
> + kfree(pm_gpio_chip);
> + return 0;
> +}
> +
> +int pm8xxx_gpio_config(int gpio, struct pm_gpio *param)
> +{
> + int rc, pm_gpio = 0;
> + u8 bank[8];
> + unsigned long flags;
> + struct pm_gpio_chip *pm_gpio_chip;
> + struct gpio_chip *gpio_chip;
> +
> + if (param == NULL)
> + return -EINVAL;
> +
> + mutex_lock(&pm_gpio_chips_lock);
> + list_for_each_entry(pm_gpio_chip, &pm_gpio_chips, link) {
> + gpio_chip = &pm_gpio_chip->gpio_chip;
> + if (gpio >= gpio_chip->base
> + && gpio < gpio_chip->base + gpio_chip->ngpio) {
> + pm_gpio = gpio - gpio_chip->base;
> + break;
> + }
> + }
> + mutex_unlock(&pm_gpio_chips_lock);
> + if (!pm_gpio) {
> + pr_err("called on gpio %d not handled by any pmic\n", gpio);
> + return -EINVAL;
> + }
> +
> + /* Select banks and configure the gpio */
> + bank[0] = PM_GPIO_WRITE |
> + ((param->vin_sel << PM_GPIO_VIN_SHIFT) &
> + PM_GPIO_VIN_MASK) |
> + PM_GPIO_MODE_ENABLE;
> + bank[1] = PM_GPIO_WRITE |
> + ((1 << PM_GPIO_BANK_SHIFT) &
> + PM_GPIO_BANK_MASK) |
> + ((dir_map[param->direction] <<
> + PM_GPIO_MODE_SHIFT) &
> + PM_GPIO_MODE_MASK) |
> + ((param->direction & PM_GPIO_DIR_OUT) ?
> + ((param->output_buffer & 1) ?
> + PM_GPIO_OUT_BUFFER : 0) : 0) |
> + ((param->direction & PM_GPIO_DIR_OUT) ?
> + param->output_value & 0x01 : 0);
> + bank[2] = PM_GPIO_WRITE |
> + ((2 << PM_GPIO_BANK_SHIFT) &
> + PM_GPIO_BANK_MASK) |
> + ((param->pull << PM_GPIO_PULL_SHIFT) &
> + PM_GPIO_PULL_MASK);
> + bank[3] = PM_GPIO_WRITE |
> + ((3 << PM_GPIO_BANK_SHIFT) &
> + PM_GPIO_BANK_MASK) |
> + ((param->out_strength <<
> + PM_GPIO_OUT_STRENGTH_SHIFT) &
> + PM_GPIO_OUT_STRENGTH_MASK) |
> + (param->disable_pin ?
> + PM_GPIO_PIN_DISABLE : PM_GPIO_PIN_ENABLE);
> + bank[4] = PM_GPIO_WRITE |
> + ((4 << PM_GPIO_BANK_SHIFT) &
> + PM_GPIO_BANK_MASK) |
> + ((param->function << PM_GPIO_FUNC_SHIFT) &
> + PM_GPIO_FUNC_MASK);
> + bank[5] = PM_GPIO_WRITE |
> + ((5 << PM_GPIO_BANK_SHIFT) & PM_GPIO_BANK_MASK) |
> + (param->inv_int_pol ? 0 : PM_GPIO_NON_INT_POL_INV);
> +
> + spin_lock_irqsave(&pm_gpio_chip->pm_lock, flags);
> + /* Remember bank1 for later use */
> + pm_gpio_chip->bank1[pm_gpio] = bank[1];
> + rc = pm8xxx_write_buf(pm_gpio_chip->gpio_chip.dev->parent,
> + SSBI_REG_ADDR_GPIO(pm_gpio), bank, 6);
> + spin_unlock_irqrestore(&pm_gpio_chip->pm_lock, flags);
> +
> + if (rc)
> + pr_err("Failed on pm8xxx_write_buf() rc=%d (GPIO config)\n",
> + rc);
> +
> + return rc;
> +}
> +EXPORT_SYMBOL_GPL(pm8xxx_gpio_config);
> +
> +static struct platform_driver pm_gpio_driver = {
> + .probe = pm_gpio_probe,
> + .remove = __devexit_p(pm_gpio_remove),
> + .driver = {
> + .name = PM8XXX_GPIO_DEV_NAME,
> + .owner = THIS_MODULE,
> + },
> +};
> +
> +static int __init pm_gpio_init(void)
> +{
> + return platform_driver_register(&pm_gpio_driver);
> +}
> +subsys_initcall(pm_gpio_init);
> +
> +static void __exit pm_gpio_exit(void)
> +{
> + platform_driver_unregister(&pm_gpio_driver);
> +}
> +module_exit(pm_gpio_exit);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("PMIC GPIO driver");
> +MODULE_VERSION("1.0");
> +MODULE_ALIAS("platform:" PM8XXX_GPIO_DEV_NAME);
> diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
> index e873b15..0f1691f 100644
> --- a/drivers/mfd/pm8921-core.c
> +++ b/drivers/mfd/pm8921-core.c
> @@ -80,6 +80,22 @@ static struct pm8xxx_drvdata pm8921_drvdata = {
> .pmic_read_irq_stat = pm8921_read_irq_stat,
> };
>
> +static const struct resource gpio_cell_resources[] __devinitconst = {
> + [0] = {
> + .start = PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, 0),
> + .end = PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, 0)
> + + PM8921_NR_GPIOS - 1,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> +static struct mfd_cell gpio_cell __devinitdata = {
> + .name = PM8XXX_GPIO_DEV_NAME,
> + .id = -1,
> + .resources = gpio_cell_resources,
> + .num_resources = ARRAY_SIZE(gpio_cell_resources),
> +};
> +
> static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
> *pdata,
> struct pm8921 *pmic,
> @@ -101,6 +117,25 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
> }
> pmic->irq_chip = irq_chip;
> }
> +
> + if (pdata->gpio_pdata) {
> + pdata->gpio_pdata->gpio_cdata.ngpios = PM8921_NR_GPIOS;
> + pdata->gpio_pdata->gpio_cdata.rev = rev;
> + gpio_cell.mfd_data = pdata->gpio_pdata;
> + ret = mfd_add_devices(pmic->dev, 0, &gpio_cell, 1,
> + NULL, irq_base);
> + if (ret) {
> + pr_err("Failed to add gpio subdevice ret=%d\n", ret);
> + goto bail;
> + }
> + }
> +
> + return 0;
> +bail:
> + if (pmic->irq_chip) {
> + pm8xxx_irq_exit(pmic->irq_chip);
> + pmic->irq_chip = NULL;
> + }
> return ret;
> }
>
> diff --git a/include/linux/mfd/pm8xxx/gpio.h b/include/linux/mfd/pm8xxx/gpio.h
> new file mode 100644
> index 0000000..d78ff12
> --- /dev/null
> +++ b/include/linux/mfd/pm8xxx/gpio.h
> @@ -0,0 +1,135 @@
> +/*
> + * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * 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.
> + */
> +
> +/*
> + * Qualcomm PMIC8XXX gpio driver header file
> + *
> + */
> +
> +#ifndef __PM8XXX_GPIO_H
> +#define __PM8XXX_GPIO_H
> +
> +#include <linux/errno.h>
> +
> +#define PM8XXX_GPIO_DEV_NAME "pm8xxx-gpio"
> +
> +struct pm8xxx_gpio_core_data {
> + u32 rev;
> + int ngpios;
> +};
> +
> +struct pm8xxx_gpio_platform_data {
> + struct pm8xxx_gpio_core_data gpio_cdata;
> + int gpio_base;
> +};
> +
> +/* GPIO parameters */
> +/* direction */
> +#define PM_GPIO_DIR_OUT 0x01
> +#define PM_GPIO_DIR_IN 0x02
> +#define PM_GPIO_DIR_BOTH (PM_GPIO_DIR_OUT | PM_GPIO_DIR_IN)
> +
> +/* output_buffer */
> +#define PM_GPIO_OUT_BUF_OPEN_DRAIN 1
> +#define PM_GPIO_OUT_BUF_CMOS 0
> +
> +/* pull */
> +#define PM_GPIO_PULL_UP_30 0
> +#define PM_GPIO_PULL_UP_1P5 1
> +#define PM_GPIO_PULL_UP_31P5 2
> +#define PM_GPIO_PULL_UP_1P5_30 3
> +#define PM_GPIO_PULL_DN 4
> +#define PM_GPIO_PULL_NO 5
> +
> +/* vin_sel: Voltage Input Select */
> +#define PM_GPIO_VIN_VPH 0
> +#define PM_GPIO_VIN_BB 1
> +#define PM_GPIO_VIN_S4 2
> +#define PM_GPIO_VIN_L15 3
> +#define PM_GPIO_VIN_L4 4
> +#define PM_GPIO_VIN_L3 5
> +#define PM_GPIO_VIN_L17 6
> +
> +/* out_strength */
> +#define PM_GPIO_STRENGTH_NO 0
> +#define PM_GPIO_STRENGTH_HIGH 1
> +#define PM_GPIO_STRENGTH_MED 2
> +#define PM_GPIO_STRENGTH_LOW 3
> +
> +/* function */
> +#define PM_GPIO_FUNC_NORMAL 0
> +#define PM_GPIO_FUNC_PAIRED 1
> +#define PM_GPIO_FUNC_1 2
> +#define PM_GPIO_FUNC_2 3
> +#define PM_GPIO_DTEST1 4
> +#define PM_GPIO_DTEST2 5
> +#define PM_GPIO_DTEST3 6
> +#define PM_GPIO_DTEST4 7
> +
> +/**
> + * struct pm_gpio - structure to specify gpio configurtion values
> + * @direction: indicates whether the gpio should be input, output, or
> + * both. Should be of the type PM_GPIO_DIR_*
> + * @output_buffer: indicates gpio should be configured as CMOS or open
> + * drain. Should be of the type PM_GPIO_OUT_BUF_*
> + * @output_value: The gpio output value of the gpio line - 0 or 1
> + * @pull: Indicates whether a pull up or pull down should be
> + * applied. If a pullup is required the current strength
> + * needs to be specified. Current values of 30uA, 1.5uA,
> + * 31.5uA, 1.5uA with 30uA boost are supported. This value
> + * should be one of the PM_GPIO_PULL_*
> + * @vin_sel: specifies the voltage level when the output is set to 1.
> + * For an input gpio specifies the voltage level at which
> + * the input is interpreted as a logical 1.
> + * @out_strength: the amount of current supplied for an output gpio,
> + * should be of the type PM_GPIO_STRENGTH_*
> + * @function: choose alternate function for the gpio. Certain gpios
> + * can be paired (shorted) with each other. Some gpio pin
> + * can act as alternate functions. This parameter should
> + * be of type PM_GPIO_FUNC_*
> + * @inv_int_pol: Invert polarity before feeding the line to the interrupt
> + * module in pmic. This feature will almost be never used
> + * since the pm8xxx interrupt block can detect both edges
> + * and both levels.
> + * @disable_pin: Disable the gpio by configuring it as high impedence.
> + *
> + */
> +struct pm_gpio {
> + int direction;
> + int output_buffer;
> + int output_value;
> + int pull;
> + int vin_sel;
> + int out_strength;
> + int function;
> + int inv_int_pol;
> + int disable_pin;
> +};
> +
> +#if defined(CONFIG_GPIO_PM8XXX) || defined(CONFIG_GPIO_PM8XXX_MODULE)
> +/**
> + * pm8xxx_gpio_config - configure a gpio controlled by a pm8xxx chip
> + * @gpio: gpio number to configure
> + * @param: configuration values
> + *
> + * RETURNS: an appropriate -ERRNO error value on error, or zero for success.
> + */
> +int pm8xxx_gpio_config(int gpio, struct pm_gpio *param);
> +#else
> +static inline int pm8xxx_gpio_config(int gpio, struct pm_gpio *param)
> +{
> + return -ENXIO;
> +}
> +#endif
> +
> +#endif
> diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
> index d5517fd..def8c31 100644
> --- a/include/linux/mfd/pm8xxx/pm8921.h
> +++ b/include/linux/mfd/pm8xxx/pm8921.h
> @@ -20,12 +20,23 @@
>
> #include <linux/device.h>
> #include <linux/mfd/pm8xxx/irq.h>
> +#include <linux/mfd/pm8xxx/gpio.h>
>
> #define PM8921_NR_IRQS 256
>
> +#define PM8921_NR_GPIOS 44
> +
> +#define PM8921_GPIO_BLOCK_START 24
> +#define PM8921_IRQ_BLOCK_BIT(block, bit) ((block) * 8 + (bit))
> +
> +/* GPIOs [1,N] */
> +#define PM8921_GPIO_IRQ(base, gpio) ((base) + \
> + PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, (gpio)-1))
> +
> struct pm8921_platform_data {
> int irq_base;
> struct pm8xxx_irq_platform_data *irq_pdata;
> + struct pm8xxx_gpio_platform_data *gpio_pdata;
> };
>
> #endif
> --
> 1.7.1
>
> Sent by an employee of the Qualcomm Innovation Center, Inc.
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver
2011-04-27 6:18 ` [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver Abhijeet Dharmapurikar
@ 2011-05-04 0:54 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2011-05-04 0:54 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Apr 26, 2011 at 11:18:47PM -0700, Abhijeet Dharmapurikar wrote:
> From: David Collins <collinsd@codeaurora.org>
>
> Add support for multi-purpose pins (MPPs) on Qualcomm PM8xxx
> PMIC chips.
>
> PM8xxx MPPs can be configured as digital or analog inputs or
> outputs, current sinks, or buffers.
>
> Note that mpp pins appear as gpio lines to the kernel. However they
> are implemented separately from the pmic's gpio driver as
> mpps have different configuration attributes and have different
> register controls than the pmic's gpio controller. Basically they are
> different set of pins.
Large chunks of this driver seem to be very similar to the pm8xxx gpio
driver. Can they not share code?
Also, is it really a good idea to have a separate platform device for
each of these banks? (an honest question; you know the hardware better)
The gpio api is quite happy to share a struct device without
additional child devices. In this particular case it doesn't look
like the extra level of platform device redirection buys you much as
opposed to calling the gpiochip_add() from the mfd device context.
>
> Signed-off-by: David Collins <collinsd@codeaurora.org>
> ---
> drivers/gpio/Kconfig | 8 +
> drivers/gpio/Makefile | 1 +
> drivers/gpio/pm8xxx-mpp.c | 325 +++++++++++++++++++++++++++++++++++++
drivers/gpio/gpio-pm8xxx-mpp.c.
> drivers/mfd/pm8921-core.c | 30 ++++
> include/linux/mfd/pm8xxx/mpp.h | 233 ++++++++++++++++++++++++++
> include/linux/mfd/pm8xxx/pm8921.h | 9 +-
> 6 files changed, 605 insertions(+), 1 deletions(-)
> create mode 100644 drivers/gpio/pm8xxx-mpp.c
> create mode 100644 include/linux/mfd/pm8xxx/mpp.h
>
> diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
> index 2035f90..e6efaca 100644
> --- a/drivers/gpio/Kconfig
> +++ b/drivers/gpio/Kconfig
> @@ -428,4 +428,12 @@ config GPIO_PM8XXX
> This option enables support for on-chip GPIO found on Qualcomm PM8xxx
> PMICs.
>
> +config GPIO_PM8XXX_MPP
> + tristate "Support for Qualcomm PM8xxx MPP features"
> + depends on MFD_PM8XXX
> + default y if MFD_PM8XXX
> + help
> + This is the multi-purpose pin (MPP) driver for Qualcomm PM 8xxx PMIC
> + chips.
> +
Same comment as on last patch; Is this really a MODULbus gpio expander?
g.
> endif
> diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
> index 337aa34..50ee44d 100644
> --- a/drivers/gpio/Makefile
> +++ b/drivers/gpio/Makefile
> @@ -44,3 +44,4 @@ obj-$(CONFIG_GPIO_VX855) += vx855_gpio.o
> obj-$(CONFIG_GPIO_ML_IOH) += ml_ioh_gpio.o
> obj-$(CONFIG_AB8500_GPIO) += ab8500-gpio.o
> obj-$(CONFIG_GPIO_PM8XXX) += pm8xxx-gpio.o
> +obj-$(CONFIG_GPIO_PM8XXX_MPP) += pm8xxx-mpp.o
> diff --git a/drivers/gpio/pm8xxx-mpp.c b/drivers/gpio/pm8xxx-mpp.c
> new file mode 100644
> index 0000000..1607fbf
> --- /dev/null
> +++ b/drivers/gpio/pm8xxx-mpp.c
> @@ -0,0 +1,325 @@
> +/*
> + * Qualcomm PM8XXX Multi-Purpose Pin (MPP) driver
> + *
> + * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * 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.
> + */
> +
> +#define pr_fmt(fmt) "%s: " fmt, __func__
> +
> +#include <linux/platform_device.h>
> +#include <linux/gpio.h>
> +#include <linux/seq_file.h>
> +#include <linux/slab.h>
> +#include <linux/spinlock.h>
> +#include <linux/mfd/pm8xxx/core.h>
> +#include <linux/mfd/pm8xxx/mpp.h>
> +
> +/* MPP Type */
> +#define PM8XXX_MPP_TYPE_MASK 0xE0
> +#define PM8XXX_MPP_TYPE_SHIFT 5
> +
> +/* MPP Config Level */
> +#define PM8XXX_MPP_CONFIG_LVL_MASK 0x1C
> +#define PM8XXX_MPP_CONFIG_LVL_SHIFT 2
> +
> +/* MPP Config Control */
> +#define PM8XXX_MPP_CONFIG_CTRL_MASK 0x03
> +#define PM8XXX_MPP_CONFIG_CTRL_SHIFT 0
> +
> +struct pm8xxx_mpp_chip {
> + struct list_head link;
> + struct gpio_chip gpio_chip;
> + spinlock_t pm_lock;
> + u8 *ctrl_reg;
> + int mpp_base;
> + int irq_base;
> + int nmpps;
> + u16 base_addr;
> +};
> +
> +static LIST_HEAD(pm8xxx_mpp_chips);
> +static DEFINE_MUTEX(pm8xxx_mpp_chips_lock);
> +
> +static int pm8xxx_mpp_write(struct pm8xxx_mpp_chip *mpp_chip, u16 offset,
> + u8 val, u8 mask)
> +{
> + u8 reg;
> + int rc;
> + unsigned long flags;
> +
> + spin_lock_irqsave(&mpp_chip->pm_lock, flags);
> +
> + reg = (mpp_chip->ctrl_reg[offset] & ~mask) | (val & mask);
> + rc = pm8xxx_writeb(mpp_chip->gpio_chip.dev->parent,
> + mpp_chip->base_addr + offset, reg);
> + if (!rc)
> + mpp_chip->ctrl_reg[offset] = reg;
> +
> + spin_unlock_irqrestore(&mpp_chip->pm_lock, flags);
> +
> + return rc;
> +}
> +
> +static int pm8xxx_mpp_to_irq(struct gpio_chip *chip, unsigned offset)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> +
> + return mpp_chip->irq_base + offset;
> +}
> +
> +static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> + int rc;
> +
> + if ((mpp_chip->ctrl_reg[offset] & PM8XXX_MPP_TYPE_MASK) >>
> + PM8XXX_MPP_TYPE_SHIFT == PM8XXX_MPP_TYPE_D_OUTPUT)
> + rc = mpp_chip->ctrl_reg[offset] & PM8XXX_MPP_CONFIG_CTRL_MASK;
> + else
> + rc = pm8xxx_read_irq_stat(mpp_chip->gpio_chip.dev->parent,
> + mpp_chip->irq_base + offset);
> +
> + return rc;
> +}
> +
> +static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int val)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> + u8 reg = val ? PM8XXX_MPP_DOUT_CTRL_HIGH : PM8XXX_MPP_DOUT_CTRL_LOW;
> + int rc;
> +
> + rc = pm8xxx_mpp_write(mpp_chip, offset, reg,
> + PM8XXX_MPP_CONFIG_CTRL_MASK);
> + if (rc)
> + pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
> +}
> +
> +static int pm8xxx_mpp_dir_input(struct gpio_chip *chip, unsigned offset)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> + int rc = pm8xxx_mpp_write(mpp_chip, offset,
> + PM8XXX_MPP_TYPE_D_INPUT << PM8XXX_MPP_TYPE_SHIFT,
> + PM8XXX_MPP_TYPE_MASK);
> +
> + if (rc)
> + pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
> + return rc;
> +}
> +
> +static int pm8xxx_mpp_dir_output(struct gpio_chip *chip,
> + unsigned offset, int val)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> + u8 reg = (PM8XXX_MPP_TYPE_D_OUTPUT << PM8XXX_MPP_TYPE_SHIFT) |
> + (val & PM8XXX_MPP_CONFIG_CTRL_MASK);
> + u8 mask = PM8XXX_MPP_TYPE_MASK | PM8XXX_MPP_CONFIG_CTRL_MASK;
> + int rc = pm8xxx_mpp_write(mpp_chip, offset, reg, mask);
> +
> + if (rc)
> + pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
> + return rc;
> +}
> +
> +static void pm8xxx_mpp_dbg_show(struct seq_file *s, struct gpio_chip *chip)
> +{
> + static const char * const ctype[] = { "d_in", "d_out", "bi_dir",
> + "a_in", "a_out", "sink",
> + "dtest_sink", "dtest_out"
> + };
> + struct pm8xxx_mpp_chip *mpp_chip = dev_get_drvdata(chip->dev);
> + u8 type, state;
> + const char *label;
> + int i;
> +
> + for (i = 0; i < mpp_chip->nmpps; i++) {
> + label = gpiochip_is_requested(chip, i);
> + type = (mpp_chip->ctrl_reg[i] & PM8XXX_MPP_TYPE_MASK) >>
> + PM8XXX_MPP_TYPE_SHIFT;
> + state = pm8xxx_mpp_get(chip, i);
> + seq_printf(s, "gpio-%-3d (%-12.12s) %-10.10s"
> + " %s 0x%02x\n",
> + chip->base + i,
> + label ? label : "--",
> + ctype[type],
> + state ? "hi" : "lo",
> + mpp_chip->ctrl_reg[i]);
> + }
> +}
> +
> +int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
> + unsigned control)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip;
> + int rc, found = 0;
> + u8 config, mask;
> +
> + mutex_lock(&pm8xxx_mpp_chips_lock);
> + list_for_each_entry(mpp_chip, &pm8xxx_mpp_chips, link) {
> + if (mpp >= mpp_chip->mpp_base
> + && mpp < mpp_chip->mpp_base + mpp_chip->nmpps) {
> + found = 1;
> + break;
> + }
> + }
> + mutex_unlock(&pm8xxx_mpp_chips_lock);
> + if (!found) {
> + pr_err("called on mpp %d not handled by any pmic\n", mpp);
> + return -EINVAL;
> + }
> +
> + mask = PM8XXX_MPP_TYPE_MASK | PM8XXX_MPP_CONFIG_LVL_MASK |
> + PM8XXX_MPP_CONFIG_CTRL_MASK;
> + config = (type << PM8XXX_MPP_TYPE_SHIFT) & PM8XXX_MPP_TYPE_MASK;
> + config |= (level << PM8XXX_MPP_CONFIG_LVL_SHIFT) &
> + PM8XXX_MPP_CONFIG_LVL_MASK;
> + config |= control & PM8XXX_MPP_CONFIG_CTRL_MASK;
> +
> + rc = pm8xxx_mpp_write(mpp_chip, mpp - mpp_chip->mpp_base, config, mask);
> +
> + if (rc)
> + pr_err("pm8xxx_mpp_write(): rc=%d\n", rc);
> +
> + return rc;
> +}
> +EXPORT_SYMBOL_GPL(pm8xxx_mpp_config);
> +
> +static int __devinit pm8xxx_mpp_reg_init(struct pm8xxx_mpp_chip *mpp_chip)
> +{
> + int rc, i;
> +
> + for (i = 0; i < mpp_chip->nmpps; i++) {
> + rc = pm8xxx_readb(mpp_chip->gpio_chip.dev->parent,
> + mpp_chip->base_addr + i,
> + &mpp_chip->ctrl_reg[i]);
> + if (rc) {
> + pr_err("failed to read register 0x%x rc=%d\n",
> + mpp_chip->base_addr + i, rc);
> + return rc;
> + }
> + }
> + return 0;
> +}
> +
> +static int __devinit pm8xxx_mpp_probe(struct platform_device *pdev)
> +{
> + int rc;
> + const struct pm8xxx_mpp_platform_data *pdata = pdev->dev.platform_data;
> + struct pm8xxx_mpp_chip *mpp_chip;
> +
> + if (!pdata) {
> + pr_err("missing platform data\n");
> + return -EINVAL;
> + }
> +
> + mpp_chip = kzalloc(sizeof(struct pm8xxx_mpp_chip), GFP_KERNEL);
> + if (!mpp_chip) {
> + pr_err("Cannot allocate %d bytes\n",
> + sizeof(struct pm8xxx_mpp_chip));
> + return -ENOMEM;
> + }
> +
> + mpp_chip->ctrl_reg = kzalloc(pdata->core_data.nmpps, GFP_KERNEL);
> + if (!mpp_chip->ctrl_reg) {
> + pr_err("Cannot allocate %d bytes\n", pdata->core_data.nmpps);
> + rc = -ENOMEM;
> + goto free_mpp_chip;
> + }
> +
> + spin_lock_init(&mpp_chip->pm_lock);
> +
> + mpp_chip->gpio_chip.label = PM8XXX_MPP_DEV_NAME;
> + mpp_chip->gpio_chip.direction_input = pm8xxx_mpp_dir_input;
> + mpp_chip->gpio_chip.direction_output = pm8xxx_mpp_dir_output;
> + mpp_chip->gpio_chip.to_irq = pm8xxx_mpp_to_irq;
> + mpp_chip->gpio_chip.get = pm8xxx_mpp_get;
> + mpp_chip->gpio_chip.set = pm8xxx_mpp_set;
> + mpp_chip->gpio_chip.dbg_show = pm8xxx_mpp_dbg_show;
> + mpp_chip->gpio_chip.ngpio = pdata->core_data.nmpps;
> + mpp_chip->gpio_chip.can_sleep = 1;
> + mpp_chip->gpio_chip.dev = &pdev->dev;
> + mpp_chip->gpio_chip.base = pdata->mpp_base;
> + mpp_chip->irq_base = platform_get_irq(pdev, 0);
> + mpp_chip->mpp_base = pdata->mpp_base;
> + mpp_chip->base_addr = pdata->core_data.base_addr;
> + mpp_chip->nmpps = pdata->core_data.nmpps;
> +
> + mutex_lock(&pm8xxx_mpp_chips_lock);
> + list_add(&mpp_chip->link, &pm8xxx_mpp_chips);
> + mutex_unlock(&pm8xxx_mpp_chips_lock);
> +
> + platform_set_drvdata(pdev, mpp_chip);
> +
> + rc = gpiochip_add(&mpp_chip->gpio_chip);
> + if (rc) {
> + pr_err("gpiochip_add failed, rc=%d\n", rc);
> + goto reset_drvdata;
> + }
> +
> + rc = pm8xxx_mpp_reg_init(mpp_chip);
> + if (rc) {
> + pr_err("failed to read MPP ctrl registers, rc=%d\n", rc);
> + goto remove_chip;
> + }
> +
> + return 0;
> +
> +remove_chip:
> + if (gpiochip_remove(&mpp_chip->gpio_chip))
> + pr_err("failed to remove gpio chip\n");
> +reset_drvdata:
> + platform_set_drvdata(pdev, NULL);
> +free_mpp_chip:
> + kfree(mpp_chip);
> + return rc;
> +}
> +
> +static int __devexit pm8xxx_mpp_remove(struct platform_device *pdev)
> +{
> + struct pm8xxx_mpp_chip *mpp_chip = platform_get_drvdata(pdev);
> +
> + mutex_lock(&pm8xxx_mpp_chips_lock);
> + list_del(&mpp_chip->link);
> + mutex_unlock(&pm8xxx_mpp_chips_lock);
> + platform_set_drvdata(pdev, NULL);
> + if (gpiochip_remove(&mpp_chip->gpio_chip))
> + pr_err("failed to remove gpio chip\n");
> + kfree(mpp_chip->ctrl_reg);
> + kfree(mpp_chip);
> +
> + return 0;
> +}
> +
> +static struct platform_driver pm8xxx_mpp_driver = {
> + .probe = pm8xxx_mpp_probe,
> + .remove = __devexit_p(pm8xxx_mpp_remove),
> + .driver = {
> + .name = PM8XXX_MPP_DEV_NAME,
> + .owner = THIS_MODULE,
> + },
> +};
> +
> +static int __init pm8xxx_mpp_init(void)
> +{
> + return platform_driver_register(&pm8xxx_mpp_driver);
> +}
> +subsys_initcall(pm8xxx_mpp_init);
> +
> +static void __exit pm8xxx_mpp_exit(void)
> +{
> + platform_driver_unregister(&pm8xxx_mpp_driver);
> +}
> +module_exit(pm8xxx_mpp_exit);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("PM8XXX MPP driver");
> +MODULE_VERSION("1.0");
> +MODULE_ALIAS("platform:" PM8XXX_MPP_DEV_NAME);
> diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
> index 0f1691f..2fbd42d 100644
> --- a/drivers/mfd/pm8921-core.c
> +++ b/drivers/mfd/pm8921-core.c
> @@ -25,6 +25,8 @@
> #define REG_HWREV 0x002 /* PMIC4 revision */
> #define REG_HWREV_2 0x0E8 /* PMIC4 revision 2 */
>
> +#define REG_MPP_BASE 0x050
> +
> struct pm8921 {
> struct device *dev;
> struct pm_irq_chip *irq_chip;
> @@ -96,6 +98,22 @@ static struct mfd_cell gpio_cell __devinitdata = {
> .num_resources = ARRAY_SIZE(gpio_cell_resources),
> };
>
> +static const struct resource mpp_cell_resources[] __devinitconst = {
> + {
> + .start = PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, 0),
> + .end = PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, 0)
> + + PM8921_NR_MPPS - 1,
> + .flags = IORESOURCE_IRQ,
> + },
> +};
> +
> +static struct mfd_cell mpp_cell __devinitdata = {
> + .name = PM8XXX_MPP_DEV_NAME,
> + .id = -1,
> + .resources = mpp_cell_resources,
> + .num_resources = ARRAY_SIZE(mpp_cell_resources),
> +};
> +
> static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
> *pdata,
> struct pm8921 *pmic,
> @@ -130,6 +148,18 @@ static int __devinit pm8921_add_subdevices(const struct pm8921_platform_data
> }
> }
>
> + if (pdata->mpp_pdata) {
> + pdata->mpp_pdata->core_data.nmpps = PM8921_NR_MPPS;
> + pdata->mpp_pdata->core_data.base_addr = REG_MPP_BASE;
> + mpp_cell.mfd_data = pdata->mpp_pdata;
> + ret = mfd_add_devices(pmic->dev, 0, &mpp_cell, 1, NULL,
> + irq_base);
> + if (ret) {
> + pr_err("Failed to add mpp subdevice ret=%d\n", ret);
> + goto bail;
> + }
> + }
> +
> return 0;
> bail:
> if (pmic->irq_chip) {
> diff --git a/include/linux/mfd/pm8xxx/mpp.h b/include/linux/mfd/pm8xxx/mpp.h
> new file mode 100644
> index 0000000..2d9884e
> --- /dev/null
> +++ b/include/linux/mfd/pm8xxx/mpp.h
> @@ -0,0 +1,233 @@
> +/* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 and
> + * only version 2 as published by the Free Software Foundation.
> + *
> + * 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.
> + */
> +
> +#ifndef __PM8XXX_MPP_H
> +#define __PM8XXX_MPP_H
> +
> +#include <linux/errno.h>
> +
> +#define PM8XXX_MPP_DEV_NAME "pm8xxx-mpp"
> +
> +struct pm8xxx_mpp_core_data {
> + int base_addr;
> + int nmpps;
> +};
> +
> +struct pm8xxx_mpp_platform_data {
> + struct pm8xxx_mpp_core_data core_data;
> + int mpp_base;
> +};
> +
> +/* API */
> +#if defined(CONFIG_GPIO_PM8XXX_MPP) || defined(CONFIG_GPIO_PM8XXX_MPP_MODULE)
> +
> +/**
> + * pm8xxx_mpp_config() - configure control options of a multi-purpose pin (MPP)
> + * @mpp: global GPIO number corresponding to the MPP
> + * @type: MPP type which determines the overall MPP function (i.e. digital
> + * in/out/bi, analog in/out, current sink, or test). It should be
> + * set to the value of one of PM8XXX_MPP_TYPE_D_*.
> + * @level: meaning depends upon MPP type specified
> + * @control: meaning depends upon MPP type specified
> + * Context: can sleep
> + *
> + * RETURNS: an appropriate -ERRNO error value on error, or zero for success.
> + *
> + * Usage of level argument:
> + * 1. type = PM8XXX_MPP_TYPE_D_INPUT, PM8XXX_MPP_TYPE_D_OUTPUT,
> + * PM8XXX_MPP_TYPE_D_BI_DIR, or PM8XXX_MPP_TYPE_DTEST_OUTPUT -
> + *
> + * level specifies that digital logic level to use for the MPP. It should
> + * be set to the value of one of PM8XXX_MPP_DIG_LEVEL_*. Actual regulator
> + * connections for these level choices are PMIC chip specific.
> + *
> + * 2. type = PM8XXX_MPP_TYPE_A_INPUT -
> + *
> + * level specifies where in the PMIC chip the analog input value should
> + * be routed to. It should be set to the value of one of
> + * PM8XXX_MPP_AIN_AMUX_*.
> + *
> + * 3. type = PM8XXX_MPP_TYPE_A_OUTPUT -
> + *
> + * level specifies the output analog voltage reference level. It should
> + * be set to the value of one of PM8XXX_MPP_AOUT_LVL_*.
> + *
> + * 4. type = PM8XXX_MPP_TYPE_SINK or PM8XXX_MPP_TYPE_DTEST_SINK -
> + *
> + * level specifies the output current level. It should be set to the value
> + * of one of PM8XXX_MPP_CS_OUT_*.
> + *
> + * Usage of control argument:
> + * 1. type = PM8XXX_MPP_TYPE_D_INPUT -
> + *
> + * control specifies how the digital input should be routed in the chip.
> + * It should be set to the value of one of PM8XXX_MPP_DIN_TO_*.
> + *
> + * 2. type = PM8XXX_MPP_TYPE_D_OUTPUT -
> + *
> + * control specifies the digital output value. It should be set to the
> + * value of one of PM8XXX_MPP_DOUT_CTRL_*.
> + *
> + * 3. type = PM8XXX_MPP_TYPE_D_BI_DIR -
> + *
> + * control specifies the pullup resistor value. It should be set to the
> + * value of one of PM8XXX_MPP_BI_PULLUP_*.
> + *
> + * 4. type = PM8XXX_MPP_TYPE_A_INPUT -
> + *
> + * control is unused; a value of 0 is sufficient.
> + *
> + * 5. type = PM8XXX_MPP_TYPE_A_OUTPUT -
> + *
> + * control specifies if analog output is enabled. It should be set to the
> + * value of one of PM8XXX_MPP_AOUT_CTRL_*.
> + *
> + * 6. type = PM8XXX_MPP_TYPE_SINK -
> + *
> + * control specifies if current sinking is enabled. It should be set to
> + * the value of one of PM8XXX_MPP_CS_CTRL_*.
> + *
> + * 7. type = PM8XXX_MPP_TYPE_DTEST_SINK -
> + *
> + * control specifies if current sinking is enabled. It should be set to
> + * the value of one of PM8XXX_MPP_DTEST_CS_CTRL_*.
> + *
> + * 8. type = PM8XXX_MPP_TYPE_DTEST_OUTPUT -
> + *
> + * control specifies which DTEST bus value to output. It should be set to
> + * the value of one of PM8XXX_MPP_DTEST_*.
> + */
> +int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
> + unsigned control);
> +
> +#else
> +
> +static inline int pm8xxx_mpp_config(unsigned mpp, unsigned type, unsigned level,
> + unsigned control)
> +{
> + return -ENXIO;
> +}
> +
> +#endif
> +
> +/* MPP Type: type */
> +#define PM8XXX_MPP_TYPE_D_INPUT 0
> +#define PM8XXX_MPP_TYPE_D_OUTPUT 1
> +#define PM8XXX_MPP_TYPE_D_BI_DIR 2
> +#define PM8XXX_MPP_TYPE_A_INPUT 3
> +#define PM8XXX_MPP_TYPE_A_OUTPUT 4
> +#define PM8XXX_MPP_TYPE_SINK 5
> +#define PM8XXX_MPP_TYPE_DTEST_SINK 6
> +#define PM8XXX_MPP_TYPE_DTEST_OUTPUT 7
> +
> +/* Digital Input/Output: level */
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_0 0
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_1 1
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_2 2
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_3 3
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_4 4
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_5 5
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_6 6
> +#define PM8XXX_MPP_DIG_LEVEL_VIO_7 7
> +
> +/* Digital Input/Output: level [PM8058] */
> +#define PM8058_MPP_DIG_LEVEL_VPH 0
> +#define PM8058_MPP_DIG_LEVEL_S3 1
> +#define PM8058_MPP_DIG_LEVEL_L2 2
> +#define PM8058_MPP_DIG_LEVEL_L3 3
> +
> +/* Digital Input/Output: level [PM8901] */
> +#define PM8901_MPP_DIG_LEVEL_MSMIO 0
> +#define PM8901_MPP_DIG_LEVEL_DIG 1
> +#define PM8901_MPP_DIG_LEVEL_L5 2
> +#define PM8901_MPP_DIG_LEVEL_S4 3
> +#define PM8901_MPP_DIG_LEVEL_VPH 4
> +
> +/* Digital Input/Output: level [PM8921] */
> +#define PM8921_MPP_DIG_LEVEL_S4 1
> +#define PM8921_MPP_DIG_LEVEL_L15 3
> +#define PM8921_MPP_DIG_LEVEL_L17 4
> +#define PM8921_MPP_DIG_LEVEL_VPH 7
> +
> +/* Digital Input: control */
> +#define PM8XXX_MPP_DIN_TO_INT 0
> +#define PM8XXX_MPP_DIN_TO_DBUS1 1
> +#define PM8XXX_MPP_DIN_TO_DBUS2 2
> +#define PM8XXX_MPP_DIN_TO_DBUS3 3
> +
> +/* Digital Output: control */
> +#define PM8XXX_MPP_DOUT_CTRL_LOW 0
> +#define PM8XXX_MPP_DOUT_CTRL_HIGH 1
> +#define PM8XXX_MPP_DOUT_CTRL_MPP 2
> +#define PM8XXX_MPP_DOUT_CTRL_INV_MPP 3
> +
> +/* Bidirectional: control */
> +#define PM8XXX_MPP_BI_PULLUP_1KOHM 0
> +#define PM8XXX_MPP_BI_PULLUP_OPEN 1
> +#define PM8XXX_MPP_BI_PULLUP_10KOHM 2
> +#define PM8XXX_MPP_BI_PULLUP_30KOHM 3
> +
> +/* Analog Input: level */
> +#define PM8XXX_MPP_AIN_AMUX_CH5 0
> +#define PM8XXX_MPP_AIN_AMUX_CH6 1
> +#define PM8XXX_MPP_AIN_AMUX_CH7 2
> +#define PM8XXX_MPP_AIN_AMUX_CH8 3
> +#define PM8XXX_MPP_AIN_AMUX_CH9 4
> +#define PM8XXX_MPP_AIN_AMUX_ABUS1 5
> +#define PM8XXX_MPP_AIN_AMUX_ABUS2 6
> +#define PM8XXX_MPP_AIN_AMUX_ABUS3 7
> +
> +/* Analog Output: level */
> +#define PM8XXX_MPP_AOUT_LVL_1V25 0
> +#define PM8XXX_MPP_AOUT_LVL_1V25_2 1
> +#define PM8XXX_MPP_AOUT_LVL_0V625 2
> +#define PM8XXX_MPP_AOUT_LVL_0V3125 3
> +#define PM8XXX_MPP_AOUT_LVL_MPP 4
> +#define PM8XXX_MPP_AOUT_LVL_ABUS1 5
> +#define PM8XXX_MPP_AOUT_LVL_ABUS2 6
> +#define PM8XXX_MPP_AOUT_LVL_ABUS3 7
> +
> +/* Analog Output: control */
> +#define PM8XXX_MPP_AOUT_CTRL_DISABLE 0
> +#define PM8XXX_MPP_AOUT_CTRL_ENABLE 1
> +#define PM8XXX_MPP_AOUT_CTRL_MPP_HIGH_EN 2
> +#define PM8XXX_MPP_AOUT_CTRL_MPP_LOW_EN 3
> +
> +/* Current Sink: level */
> +#define PM8XXX_MPP_CS_OUT_5MA 0
> +#define PM8XXX_MPP_CS_OUT_10MA 1
> +#define PM8XXX_MPP_CS_OUT_15MA 2
> +#define PM8XXX_MPP_CS_OUT_20MA 3
> +#define PM8XXX_MPP_CS_OUT_25MA 4
> +#define PM8XXX_MPP_CS_OUT_30MA 5
> +#define PM8XXX_MPP_CS_OUT_35MA 6
> +#define PM8XXX_MPP_CS_OUT_40MA 7
> +
> +/* Current Sink: control */
> +#define PM8XXX_MPP_CS_CTRL_DISABLE 0
> +#define PM8XXX_MPP_CS_CTRL_ENABLE 1
> +#define PM8XXX_MPP_CS_CTRL_MPP_HIGH_EN 2
> +#define PM8XXX_MPP_CS_CTRL_MPP_LOW_EN 3
> +
> +/* DTEST Current Sink: control */
> +#define PM8XXX_MPP_DTEST_CS_CTRL_EN1 0
> +#define PM8XXX_MPP_DTEST_CS_CTRL_EN2 1
> +#define PM8XXX_MPP_DTEST_CS_CTRL_EN3 2
> +#define PM8XXX_MPP_DTEST_CS_CTRL_EN4 3
> +
> +/* DTEST Digital Output: control */
> +#define PM8XXX_MPP_DTEST_DBUS1 0
> +#define PM8XXX_MPP_DTEST_DBUS2 1
> +#define PM8XXX_MPP_DTEST_DBUS3 2
> +#define PM8XXX_MPP_DTEST_DBUS4 3
> +
> +#endif
> diff --git a/include/linux/mfd/pm8xxx/pm8921.h b/include/linux/mfd/pm8xxx/pm8921.h
> index def8c31..19cffb2 100644
> --- a/include/linux/mfd/pm8xxx/pm8921.h
> +++ b/include/linux/mfd/pm8xxx/pm8921.h
> @@ -21,22 +21,29 @@
> #include <linux/device.h>
> #include <linux/mfd/pm8xxx/irq.h>
> #include <linux/mfd/pm8xxx/gpio.h>
> +#include <linux/mfd/pm8xxx/mpp.h>
>
> #define PM8921_NR_IRQS 256
>
> #define PM8921_NR_GPIOS 44
>
> +#define PM8921_NR_MPPS 12
> +
> #define PM8921_GPIO_BLOCK_START 24
> +#define PM8921_MPP_BLOCK_START 16
> #define PM8921_IRQ_BLOCK_BIT(block, bit) ((block) * 8 + (bit))
>
> -/* GPIOs [1,N] */
> +/* GPIOs and MPPs [1,N] */
> #define PM8921_GPIO_IRQ(base, gpio) ((base) + \
> PM8921_IRQ_BLOCK_BIT(PM8921_GPIO_BLOCK_START, (gpio)-1))
> +#define PM8921_MPP_IRQ(base, mpp) ((base) + \
> + PM8921_IRQ_BLOCK_BIT(PM8921_MPP_BLOCK_START, (mpp)-1))
>
> struct pm8921_platform_data {
> int irq_base;
> struct pm8xxx_irq_platform_data *irq_pdata;
> struct pm8xxx_gpio_platform_data *gpio_pdata;
> + struct pm8xxx_mpp_platform_data *mpp_pdata;
> };
>
> #endif
> --
> 1.7.1
>
> Sent by an employee of the Qualcomm Innovation Center, Inc.
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-05-04 0:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-27 6:18 [PATCH 0/2] fix mpp and gpio for pm8921 Abhijeet Dharmapurikar
2011-04-27 6:18 ` [PATCH 1/2] gpio: pm8xxx-gpio: Add pm8xxx gpio driver Abhijeet Dharmapurikar
2011-05-04 0:38 ` Grant Likely
2011-04-27 6:18 ` [PATCH 2/2] mfd: pm8xxx-mpp: Add pm8xxx MPP driver Abhijeet Dharmapurikar
2011-05-04 0:54 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).