diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-07-10 11:57:40 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2013-08-05 16:01:37 -0400 |
commit | 2e294972f0c3616df160f95604d1a75056b75a8a (patch) | |
tree | 3f865a489986c8d278923b692db8c9ff6cf19a69 | |
parent | 9f7f7d8c062331cf4218e0ef2fa573913bad337f (diff) |
mtd: atmel_nand: don't use devm_pinctrl_get_select_default() in probe
Since commit ab78029 (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: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r-- | drivers/mtd/nand/atmel_nand.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c index 08715106f925..73228e0c4e49 100644 --- a/drivers/mtd/nand/atmel_nand.c +++ b/drivers/mtd/nand/atmel_nand.c | |||
@@ -41,7 +41,6 @@ | |||
41 | #include <linux/gpio.h> | 41 | #include <linux/gpio.h> |
42 | #include <linux/io.h> | 42 | #include <linux/io.h> |
43 | #include <linux/platform_data/atmel.h> | 43 | #include <linux/platform_data/atmel.h> |
44 | #include <linux/pinctrl/consumer.h> | ||
45 | 44 | ||
46 | static int use_dma = 1; | 45 | static int use_dma = 1; |
47 | module_param(use_dma, int, 0); | 46 | module_param(use_dma, int, 0); |
@@ -1464,7 +1463,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) | |||
1464 | struct resource *mem; | 1463 | struct resource *mem; |
1465 | struct mtd_part_parser_data ppdata = {}; | 1464 | struct mtd_part_parser_data ppdata = {}; |
1466 | int res; | 1465 | int res; |
1467 | struct pinctrl *pinctrl; | ||
1468 | 1466 | ||
1469 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 1467 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
1470 | if (!mem) { | 1468 | if (!mem) { |
@@ -1509,13 +1507,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev) | |||
1509 | nand_chip->IO_ADDR_W = host->io_base; | 1507 | nand_chip->IO_ADDR_W = host->io_base; |
1510 | nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; | 1508 | nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl; |
1511 | 1509 | ||
1512 | pinctrl = devm_pinctrl_get_select_default(&pdev->dev); | ||
1513 | if (IS_ERR(pinctrl)) { | ||
1514 | dev_err(host->dev, "Failed to request pinctrl\n"); | ||
1515 | res = PTR_ERR(pinctrl); | ||
1516 | goto err_ecc_ioremap; | ||
1517 | } | ||
1518 | |||
1519 | if (gpio_is_valid(host->board.rdy_pin)) { | 1510 | if (gpio_is_valid(host->board.rdy_pin)) { |
1520 | res = gpio_request(host->board.rdy_pin, "nand_rdy"); | 1511 | res = gpio_request(host->board.rdy_pin, "nand_rdy"); |
1521 | if (res < 0) { | 1512 | if (res < 0) { |