aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/stmpe.c
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-05-08 17:16:34 -0400
committerLee Jones <lee.jones@linaro.org>2014-05-23 04:41:01 -0400
commit9e9dc7d9597bd6881b3e7ae6ae3d710319605c47 (patch)
tree86a55e9ccf8388a805eaaa4fed10b472590af6b4 /drivers/mfd/stmpe.c
parent9c9e321455fb806108f9dbb1872bacfd42c6002b (diff)
mfd: stmpe: root out static GPIO and IRQ assignments
The only platform using the STMPE expander now boots from device tree using all-dynamic GPIO and IRQ number assignments, so remove the mechanism to pass this from the device tree entirely. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/mfd/stmpe.c')
-rw-r--r--drivers/mfd/stmpe.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 294731be1a15..3b6bfa7184ad 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -996,9 +996,6 @@ static int stmpe_irq_init(struct stmpe *stmpe, struct device_node *np)
996 int base = 0; 996 int base = 0;
997 int num_irqs = stmpe->variant->num_irqs; 997 int num_irqs = stmpe->variant->num_irqs;
998 998
999 if (!np)
1000 base = stmpe->irq_base;
1001
1002 stmpe->domain = irq_domain_add_simple(np, num_irqs, base, 999 stmpe->domain = irq_domain_add_simple(np, num_irqs, base,
1003 &stmpe_irq_ops, stmpe); 1000 &stmpe_irq_ops, stmpe);
1004 if (!stmpe->domain) { 1001 if (!stmpe->domain) {
@@ -1077,7 +1074,7 @@ static int stmpe_chip_init(struct stmpe *stmpe)
1077static int stmpe_add_device(struct stmpe *stmpe, const struct mfd_cell *cell) 1074static int stmpe_add_device(struct stmpe *stmpe, const struct mfd_cell *cell)
1078{ 1075{
1079 return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1, 1076 return mfd_add_devices(stmpe->dev, stmpe->pdata->id, cell, 1,
1080 NULL, stmpe->irq_base, stmpe->domain); 1077 NULL, 0, stmpe->domain);
1081} 1078}
1082 1079
1083static int stmpe_devices_init(struct stmpe *stmpe) 1080static int stmpe_devices_init(struct stmpe *stmpe)
@@ -1181,7 +1178,6 @@ int stmpe_probe(struct stmpe_client_info *ci, int partnum)
1181 stmpe->dev = ci->dev; 1178 stmpe->dev = ci->dev;
1182 stmpe->client = ci->client; 1179 stmpe->client = ci->client;
1183 stmpe->pdata = pdata; 1180 stmpe->pdata = pdata;
1184 stmpe->irq_base = pdata->irq_base;
1185 stmpe->ci = ci; 1181 stmpe->ci = ci;
1186 stmpe->partnum = partnum; 1182 stmpe->partnum = partnum;
1187 stmpe->variant = stmpe_variant_info[partnum]; 1183 stmpe->variant = stmpe_variant_info[partnum];