mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
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>
This commit is contained in:
parent
9f7f7d8c06
commit
2e294972f0
1 changed files with 0 additions and 9 deletions
|
@ -41,7 +41,6 @@
|
|||
#include <linux/gpio.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/platform_data/atmel.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
static int use_dma = 1;
|
||||
module_param(use_dma, int, 0);
|
||||
|
@ -1464,7 +1463,6 @@ 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) {
|
||||
|
@ -1509,13 +1507,6 @@ 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) {
|
||||
|
|
Loading…
Reference in a new issue