diff options
| author | Jean-Christophe PLAGNIOL-VILLARD | 2012-07-12 17:31:39 +0200 |
|---|---|---|
| committer | Jean-Christophe PLAGNIOL-VILLARD | 2012-10-13 05:31:41 +0200 |
| commit | 251e783ad0375470fa4fd3848645a38c5d3ee6c3 (patch) | |
| tree | 94c0fe4b49e9fb0ba11bbf3eac58c248648c4592 /drivers/mtd | |
| parent | arm: at91: dt: at91sam9 add nand pinctrl support (diff) | |
| download | kernel-qcow2-linux-251e783ad0375470fa4fd3848645a38c5d3ee6c3.tar.gz kernel-qcow2-linux-251e783ad0375470fa4fd3848645a38c5d3ee6c3.tar.xz kernel-qcow2-linux-251e783ad0375470fa4fd3848645a38c5d3ee6c3.zip | |
MTD: atmel_nand: add pinctrl consumer support
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 914455783302..92623ac2015a 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c @@ -41,6 +41,7 @@ #include <linux/gpio.h> #include <linux/io.h> #include <linux/platform_data/atmel.h> +#include <linux/pinctrl/consumer.h> #include <mach/cpu.h> @@ -1370,6 +1371,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev) struct resource *mem; struct mtd_part_parser_data ppdata = {}; int res; + struct pinctrl *pinctrl; mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!mem) { @@ -1414,6 +1416,13 @@ static int __init atmel_nand_probe(struct platform_device *pdev) nand_chip->IO_ADDR_W = host->io_base; nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; + pinctrl = devm_pinctrl_get_select_default(&pdev->dev); + if (IS_ERR(pinctrl)) { + dev_err(host->dev, "Failed to request pinctrl\n"); + res = PTR_ERR(pinctrl); + goto err_ecc_ioremap; + } + if (gpio_is_valid(host->board.rdy_pin)) { res = gpio_request(host->board.rdy_pin, "nand_rdy"); if (res < 0) { |