summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-04-12 16:51:13 +0100
committerChris Ball <cjb@laptop.org>2012-05-04 10:08:29 -0400
commit9a597016058520665452390df919428e4edd7770 (patch)
tree77fa05a567bd3b1b927952eadeb06235e5148b3a /drivers/mmc
parent8dde8c467441069144d2430d30fca697c8fae2d3 (diff)
downloadop-kernel-dev-9a597016058520665452390df919428e4edd7770.zip
op-kernel-dev-9a597016058520665452390df919428e4edd7770.tar.gz
mmc: mmci: Use correct GPIO binding for IRQ requests
Now there are irqdomains in place for Snowball, we can request GPIO IRQs directly by their binding. This replaces the previous method of hard-coding the hwirq using u32 values in the DT. Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mmci.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 5a7da17..2303a16 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -26,6 +26,7 @@
#include <linux/clk.h>
#include <linux/scatterlist.h>
#include <linux/gpio.h>
+#include <linux/of_gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/dmaengine.h>
#include <linux/dma-mapping.h>
@@ -1203,11 +1204,11 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
{
int bus_width = 0;
- of_property_read_u32(np, "wp-gpios", &pdata->gpio_wp);
+ pdata->gpio_wp = of_get_named_gpio(np, "wp-gpios", 0);
if (!pdata->gpio_wp)
pdata->gpio_wp = -1;
- of_property_read_u32(np, "cd-gpios", &pdata->gpio_cd);
+ pdata->gpio_cd = of_get_named_gpio(np, "cd-gpios", 0);
if (!pdata->gpio_cd)
pdata->gpio_cd = -1;
OpenPOWER on IntegriCloud