linux-next: manual merge of the pinctrl tree with Linus' tree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
drivers/mtd/nand/atmel_nand.c between commit 28446acb1f82 ("mtd: atmel
nand: fix gpio missing request") from Linus' tree and commit 08695153170c
("MTD: atmel nand: fix gpio missing request") from the pinctrl tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/mtd/nand/atmel_nand.c
index 9144557,f48587b..0000000
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@@ -1414,12 -585,19 +1416,20 @@@ static int __init atmel_nand_probe(stru
        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");
+               res = devm_gpio_request(&pdev->dev,
+                               host->board.rdy_pin, "nand_rdy");
                if (res < 0) {
                        dev_err(&pdev->dev,
 -                              "can't request rdy gpio %d\n", 
host->board.rdy_pin);
 +                              "can't request rdy gpio %d\n",
 +                              host->board.rdy_pin);
                        goto err_ecc_ioremap;
                }
  
@@@ -1435,11 -612,11 +1444,12 @@@
        }
  
        if (gpio_is_valid(host->board.enable_pin)) {
-               res = gpio_request(host->board.enable_pin, "nand_enable");
+               res = devm_gpio_request(&pdev->dev,
+                               host->board.enable_pin, "nand_enable");
                if (res < 0) {
                        dev_err(&pdev->dev,
 -                              "can't request enable gpio %d\n", 
host->board.enable_pin);
 +                              "can't request enable gpio %d\n",
 +                              host->board.enable_pin);
                        goto err_ecc_ioremap;
                }
  
@@@ -1465,11 -664,11 +1475,12 @@@
        atmel_nand_enable(host);
  
        if (gpio_is_valid(host->board.det_pin)) {
-               res = gpio_request(host->board.det_pin, "nand_det");
+               res = devm_gpio_request(&pdev->dev,
+                               host->board.det_pin, "nand_det");
                if (res < 0) {
                        dev_err(&pdev->dev,
 -                              "can't request det gpio %d\n", 
host->board.det_pin);
 +                              "can't request det gpio %d\n",
 +                              host->board.det_pin);
                        goto err_no_card;
                }
  

pgpImxNCqOazi.pgp
Description: PGP signature