diff options
| author | Lee Jones | 2012-04-12 17:51:13 +0200 |
|---|---|---|
| committer | Chris Ball | 2012-05-04 16:08:29 +0200 |
| commit | 9a597016058520665452390df919428e4edd7770 (patch) | |
| tree | 77fa05a567bd3b1b927952eadeb06235e5148b3a /drivers/mmc/host/mmci.c | |
| parent | mmc: mmci: Add required documentation for Device Tree bindings (diff) | |
| download | kernel-qcow2-linux-9a597016058520665452390df919428e4edd7770.tar.gz kernel-qcow2-linux-9a597016058520665452390df919428e4edd7770.tar.xz kernel-qcow2-linux-9a597016058520665452390df919428e4edd7770.zip | |
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/host/mmci.c')
| -rw-r--r-- | drivers/mmc/host/mmci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 5a7da175201c..2303a16263ef 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; |