summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaga Radhesh <naga.radheshy@stericsson.com>2012-02-22 15:18:51 +0530
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:54 +0200
commit22042f07e714d64427fe1e0c4dd7b37f2eaf229d (patch)
tree60d3b5816364eadf950e3b9d42596a87d770e449
parentb4950ad9966ed00df6153956b831874708ea3122 (diff)
gpio-ab8500:Add support for AB8505 Chip
Number of gpio pins has been changed for AB8505, so change gpio configurations according to AB8505. ST-Ericsson ID: 366316 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id:Ifcd5068e4b12de262942ab647c007cf909cbe243 Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/45797 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Bibek BASU <bibek.basu@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
-rw-r--r--drivers/gpio/gpio-ab8500.c41
1 files changed, 35 insertions, 6 deletions
diff --git a/drivers/gpio/gpio-ab8500.c b/drivers/gpio/gpio-ab8500.c
index b78cf2f9530..86163681c24 100644
--- a/drivers/gpio/gpio-ab8500.c
+++ b/drivers/gpio/gpio-ab8500.c
@@ -77,6 +77,7 @@
#define AB9540_ALTFUN_REG_INDEX 7
#define AB8500_NUM_GPIO 42
#define AB9540_NUM_GPIO 54
+#define AB8505_NUM_GPIO 53
#define AB8500_NUM_VIR_GPIO_IRQ 16
enum ab8500_gpio_action {
@@ -127,6 +128,24 @@ static struct ab8500_gpio_irq_cluster ab9540_irq_clusters[] = {
{.start = 49, .end = 53},
};
+/*
+ * For AB8505 Only some GPIOs are interrupt capable, and they are
+ * organized in discontiguous clusters:
+ *
+ * GPIO10 to GPIO11
+ * GPIO13
+ * GPIO40 and GPIO41
+ * GPIO50
+ * GPIO52 to GPIO53
+ */
+static struct ab8500_gpio_irq_cluster ab8505_irq_clusters[] = {
+ {.start = 9, .end = 10}, /* GPIO numbers start from 1 */
+ {.start = 12, .end = 12},
+ {.start = 39, .end = 40},
+ {.start = 49, .end = 49},
+ {.start = 51, .end = 52},
+};
+
/**
* to_ab8500_gpio() - get the pointer to ab8500_gpio
* @chip: Member of the structure ab8500_gpio
@@ -435,6 +454,7 @@ static void ab8500_gpio_irq_remove(struct ab8500_gpio *ab8500_gpio)
static int __devinit ab8500_gpio_probe(struct platform_device *pdev)
{
+ struct ab8500 *parent = dev_get_drvdata(pdev->dev.parent);
struct ab8500_platform_data *ab8500_pdata =
dev_get_platdata(pdev->dev.parent);
struct ab8500_gpio_platform_data *pdata;
@@ -471,12 +491,21 @@ static int __devinit ab8500_gpio_probe(struct platform_device *pdev)
last_gpio_sel_reg = AB9540_GPIO_SEL7_REG;
altfun_reg_index = AB9540_ALTFUN_REG_INDEX;
} else {
- ab8500_gpio->chip.ngpio = AB8500_NUM_GPIO;
- ab8500_gpio->irq_cluster = ab8500_irq_clusters;
- ab8500_gpio->irq_cluster_size =
- ARRAY_SIZE(ab8500_irq_clusters);
- last_gpio_sel_reg = AB8500_GPIO_SEL6_REG;
- altfun_reg_index = AB8500_ALTFUN_REG_INDEX;
+ if (is_ab8505(parent)) {
+ ab8500_gpio->chip.ngpio = AB8505_NUM_GPIO;
+ ab8500_gpio->irq_cluster = ab8505_irq_clusters;
+ ab8500_gpio->irq_cluster_size =
+ ARRAY_SIZE(ab8505_irq_clusters);
+ last_gpio_sel_reg = AB9540_GPIO_SEL7_REG;
+ altfun_reg_index = AB9540_ALTFUN_REG_INDEX;
+ } else {
+ ab8500_gpio->chip.ngpio = AB8500_NUM_GPIO;
+ ab8500_gpio->irq_cluster = ab8500_irq_clusters;
+ ab8500_gpio->irq_cluster_size =
+ ARRAY_SIZE(ab8500_irq_clusters);
+ last_gpio_sel_reg = AB8500_GPIO_SEL6_REG;
+ altfun_reg_index = AB8500_ALTFUN_REG_INDEX;
+ }
}
/* initialize the lock */