Commit 2e294972 authored by Wolfram Sang's avatar Wolfram Sang Committed by David Woodhouse

mtd: atmel_nand: don't use devm_pinctrl_get_select_default() in probe

Since commit ab78029e (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.

Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 9f7f7d8c
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/platform_data/atmel.h> #include <linux/platform_data/atmel.h>
#include <linux/pinctrl/consumer.h>
static int use_dma = 1; static int use_dma = 1;
module_param(use_dma, int, 0); module_param(use_dma, int, 0);
...@@ -1464,7 +1463,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) ...@@ -1464,7 +1463,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
struct resource *mem; struct resource *mem;
struct mtd_part_parser_data ppdata = {}; struct mtd_part_parser_data ppdata = {};
int res; int res;
struct pinctrl *pinctrl;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) { if (!mem) {
...@@ -1509,13 +1507,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) ...@@ -1509,13 +1507,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
nand_chip->IO_ADDR_W = host->io_base; nand_chip->IO_ADDR_W = host->io_base;
nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; 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)) { if (gpio_is_valid(host->board.rdy_pin)) {
res = gpio_request(host->board.rdy_pin, "nand_rdy"); res = gpio_request(host->board.rdy_pin, "nand_rdy");
if (res < 0) { if (res < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment