* [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table [not found] <20180525222046.11200-1-jmkrzyszt@gmail.com> @ 2018-07-09 19:38 ` Janusz Krzysztofik 2018-07-17 17:05 ` [PATCH RESEND " Janusz Krzysztofik 2018-07-17 19:37 ` [PATCH " Boris Brezillon 0 siblings, 2 replies; 6+ messages in thread From: Janusz Krzysztofik @ 2018-07-09 19:38 UTC (permalink / raw) To: Boris Brezillon Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Krzysztof Kozlowski, Vladimir Zapolskiy, Gregory CLEMENT, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko, Janusz Krzysztofik Now as Amstrad Delta board - the only user of this driver - provides GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and use the table to locate required GPIO pins. Declare static variables for storing GPIO descriptors and replace gpio_ function calls with their gpiod_ equivalents. Pin naming used by the driver should be followed while respective GPIO lookup table is initialized by a board init code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- Changlog: v1: Fix handling of devm_gpiod_get_optional() return values - thanks to Andy Shevchenko. v2: Remove problematic error code conversion, no longer needed if used on top of commit d08605a64e67 ("ARM: OMAP1: ams-delta: move late devices back to init_machine") already in linux-next and commit 8853daf3b4ac ("gpiolib: Defer on non-DT find_chip_by_name() failure") just applied to linux-gpio/devel. drivers/mtd/nand/raw/ams-delta.c | 121 ++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 37a3cc21c7bc..09b2f9fda5b9 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -20,23 +20,28 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/mtd/mtd.h> #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <asm/io.h> #include <asm/sizes.h> -#include <mach/board-ams-delta.h> - #include <mach/hardware.h> /* * MTD structure for E3 (Delta) */ static struct mtd_info *ams_delta_mtd = NULL; +static struct gpio_desc *gpiod_rdy; +static struct gpio_desc *gpiod_nce; +static struct gpio_desc *gpiod_nre; +static struct gpio_desc *gpiod_nwp; +static struct gpio_desc *gpiod_nwe; +static struct gpio_desc *gpiod_ale; +static struct gpio_desc *gpiod_cle; /* * Define partitions for flash devices @@ -70,9 +75,9 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) writew(0, io_base + OMAP_MPUIO_IO_CNTL); writew(byte, this->IO_ADDR_W); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 0); + gpiod_set_value(gpiod_nwe, 0); ndelay(40); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 1); + gpiod_set_value(gpiod_nwe, 1); } static u_char ams_delta_read_byte(struct mtd_info *mtd) @@ -81,11 +86,11 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd) struct nand_chip *this = mtd_to_nand(mtd); void __iomem *io_base = (void __iomem *)nand_get_controller_data(this); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0); + gpiod_set_value(gpiod_nre, 0); ndelay(40); writew(~0, io_base + OMAP_MPUIO_IO_CNTL); res = readw(this->IO_ADDR_R); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 1); + gpiod_set_value(gpiod_nre, 1); return res; } @@ -120,12 +125,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, { if (ctrl & NAND_CTRL_CHANGE) { - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NCE, - (ctrl & NAND_NCE) == 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_CLE, - (ctrl & NAND_CLE) != 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_ALE, - (ctrl & NAND_ALE) != 0); + gpiod_set_value(gpiod_nce, !(ctrl & NAND_NCE)); + gpiod_set_value(gpiod_cle, !!(ctrl & NAND_CLE)); + gpiod_set_value(gpiod_ale, !!(ctrl & NAND_ALE)); } if (cmd != NAND_CMD_NONE) @@ -134,41 +136,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, static int ams_delta_nand_ready(struct mtd_info *mtd) { - return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB); + return gpiod_get_value(gpiod_rdy); } -static const struct gpio _mandatory_gpio[] = { - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NCE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nce", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NRE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nre", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWP, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwp", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwe", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_ALE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_ale", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_CLE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_cle", - }, -}; /* * Main initialization routine @@ -216,12 +186,17 @@ static int ams_delta_init(struct platform_device *pdev) this->write_buf = ams_delta_write_buf; this->read_buf = ams_delta_read_buf; this->cmd_ctrl = ams_delta_hwcontrol; - if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) { - this->dev_ready = ams_delta_nand_ready; - } else { - this->dev_ready = NULL; - pr_notice("Couldn't request gpio for Delta NAND ready.\n"); + + gpiod_rdy = devm_gpiod_get_optional(&pdev->dev, "rdy", GPIOD_IN); + if (IS_ERR(gpiod_rdy)) { + err = PTR_ERR(gpiod_rdy); + dev_warn(&pdev->dev, "RDY GPIO request failed (%d)\n", err); + goto out_mtd; } + + if (gpiod_rdy) + this->dev_ready = ams_delta_nand_ready; + /* 25 us command delay time */ this->chip_delay = 30; this->ecc.mode = NAND_ECC_SOFT; @@ -230,9 +205,42 @@ static int ams_delta_init(struct platform_device *pdev) platform_set_drvdata(pdev, io_base); /* Set chip enabled, but */ - err = gpio_request_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - if (err) - goto out_gpio; + gpiod_nwp = devm_gpiod_get(&pdev->dev, "nwp", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwp)) { + err = PTR_ERR(gpiod_nwp); + dev_err(&pdev->dev, "NWP GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nce = devm_gpiod_get(&pdev->dev, "nce", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nce)) { + err = PTR_ERR(gpiod_nce); + dev_err(&pdev->dev, "NCE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nre = devm_gpiod_get(&pdev->dev, "nre", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nre)) { + err = PTR_ERR(gpiod_nre); + dev_err(&pdev->dev, "NRE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nwe = devm_gpiod_get(&pdev->dev, "nwe", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwe)) { + err = PTR_ERR(gpiod_nwe); + dev_err(&pdev->dev, "NWE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_ale = devm_gpiod_get(&pdev->dev, "ale", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_ale)) { + err = PTR_ERR(gpiod_ale); + dev_err(&pdev->dev, "ALE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_cle = devm_gpiod_get(&pdev->dev, "cle", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_cle)) { + err = PTR_ERR(gpiod_cle); + dev_err(&pdev->dev, "CLE GPIO request failed (%d)\n", err); + goto out_mtd; + } /* Scan to find existence of the device */ err = nand_scan(ams_delta_mtd, 1); @@ -246,9 +254,6 @@ static int ams_delta_init(struct platform_device *pdev) goto out; out_mtd: - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); -out_gpio: - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); out_free: kfree(this); @@ -266,8 +271,6 @@ static int ams_delta_cleanup(struct platform_device *pdev) /* Release resources, unregister device */ nand_release(ams_delta_mtd); - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); /* Free the MTD device structure */ -- 2.16.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH RESEND v3] mtd: rawnand: ams-delta: use GPIO lookup table 2018-07-09 19:38 ` [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table Janusz Krzysztofik @ 2018-07-17 17:05 ` Janusz Krzysztofik 2018-07-17 20:31 ` Boris Brezillon 2018-07-17 19:37 ` [PATCH " Boris Brezillon 1 sibling, 1 reply; 6+ messages in thread From: Janusz Krzysztofik @ 2018-07-17 17:05 UTC (permalink / raw) To: Boris Brezillon Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Masahiro Yamada, Krzysztof Kozlowski, Shawn Guo, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko, Janusz Krzysztofik Now as Amstrad Delta board - the only user of this driver - provides GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and use the table to locate required GPIO pins. Declare static variables for storing GPIO descriptors and replace gpio_ function calls with their gpiod_ equivalents. Pin naming used by the driver should be followed while respective GPIO lookup table is initialized by a board init code. Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> --- Changlog: v1: Fix handling of devm_gpiod_get_optional() return values - thanks to Andy Shevchenko. v2: Remove problematic error code conversion, no longer needed if used on top of commit d08605a64e67 ("ARM: OMAP1: ams-delta: move late devices back to init_machine") and commit 8853daf3b4ac ("gpiolib: Defer on non-DT find_chip_by_name() failure") already in linux-next. drivers/mtd/nand/raw/ams-delta.c | 121 ++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 59 deletions(-) diff --git a/drivers/mtd/nand/raw/ams-delta.c b/drivers/mtd/nand/raw/ams-delta.c index 37a3cc21c7bc..09b2f9fda5b9 100644 --- a/drivers/mtd/nand/raw/ams-delta.c +++ b/drivers/mtd/nand/raw/ams-delta.c @@ -20,23 +20,28 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/delay.h> +#include <linux/gpio/consumer.h> #include <linux/mtd/mtd.h> #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h> -#include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <asm/io.h> #include <asm/sizes.h> -#include <mach/board-ams-delta.h> - #include <mach/hardware.h> /* * MTD structure for E3 (Delta) */ static struct mtd_info *ams_delta_mtd = NULL; +static struct gpio_desc *gpiod_rdy; +static struct gpio_desc *gpiod_nce; +static struct gpio_desc *gpiod_nre; +static struct gpio_desc *gpiod_nwp; +static struct gpio_desc *gpiod_nwe; +static struct gpio_desc *gpiod_ale; +static struct gpio_desc *gpiod_cle; /* * Define partitions for flash devices @@ -70,9 +75,9 @@ static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) writew(0, io_base + OMAP_MPUIO_IO_CNTL); writew(byte, this->IO_ADDR_W); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 0); + gpiod_set_value(gpiod_nwe, 0); ndelay(40); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NWE, 1); + gpiod_set_value(gpiod_nwe, 1); } static u_char ams_delta_read_byte(struct mtd_info *mtd) @@ -81,11 +86,11 @@ static u_char ams_delta_read_byte(struct mtd_info *mtd) struct nand_chip *this = mtd_to_nand(mtd); void __iomem *io_base = (void __iomem *)nand_get_controller_data(this); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 0); + gpiod_set_value(gpiod_nre, 0); ndelay(40); writew(~0, io_base + OMAP_MPUIO_IO_CNTL); res = readw(this->IO_ADDR_R); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NRE, 1); + gpiod_set_value(gpiod_nre, 1); return res; } @@ -120,12 +125,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, { if (ctrl & NAND_CTRL_CHANGE) { - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_NCE, - (ctrl & NAND_NCE) == 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_CLE, - (ctrl & NAND_CLE) != 0); - gpio_set_value(AMS_DELTA_GPIO_PIN_NAND_ALE, - (ctrl & NAND_ALE) != 0); + gpiod_set_value(gpiod_nce, !(ctrl & NAND_NCE)); + gpiod_set_value(gpiod_cle, !!(ctrl & NAND_CLE)); + gpiod_set_value(gpiod_ale, !!(ctrl & NAND_ALE)); } if (cmd != NAND_CMD_NONE) @@ -134,41 +136,9 @@ static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd, static int ams_delta_nand_ready(struct mtd_info *mtd) { - return gpio_get_value(AMS_DELTA_GPIO_PIN_NAND_RB); + return gpiod_get_value(gpiod_rdy); } -static const struct gpio _mandatory_gpio[] = { - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NCE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nce", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NRE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nre", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWP, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwp", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_NWE, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "nand_nwe", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_ALE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_ale", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_NAND_CLE, - .flags = GPIOF_OUT_INIT_LOW, - .label = "nand_cle", - }, -}; /* * Main initialization routine @@ -216,12 +186,17 @@ static int ams_delta_init(struct platform_device *pdev) this->write_buf = ams_delta_write_buf; this->read_buf = ams_delta_read_buf; this->cmd_ctrl = ams_delta_hwcontrol; - if (gpio_request(AMS_DELTA_GPIO_PIN_NAND_RB, "nand_rdy") == 0) { - this->dev_ready = ams_delta_nand_ready; - } else { - this->dev_ready = NULL; - pr_notice("Couldn't request gpio for Delta NAND ready.\n"); + + gpiod_rdy = devm_gpiod_get_optional(&pdev->dev, "rdy", GPIOD_IN); + if (IS_ERR(gpiod_rdy)) { + err = PTR_ERR(gpiod_rdy); + dev_warn(&pdev->dev, "RDY GPIO request failed (%d)\n", err); + goto out_mtd; } + + if (gpiod_rdy) + this->dev_ready = ams_delta_nand_ready; + /* 25 us command delay time */ this->chip_delay = 30; this->ecc.mode = NAND_ECC_SOFT; @@ -230,9 +205,42 @@ static int ams_delta_init(struct platform_device *pdev) platform_set_drvdata(pdev, io_base); /* Set chip enabled, but */ - err = gpio_request_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - if (err) - goto out_gpio; + gpiod_nwp = devm_gpiod_get(&pdev->dev, "nwp", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwp)) { + err = PTR_ERR(gpiod_nwp); + dev_err(&pdev->dev, "NWP GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nce = devm_gpiod_get(&pdev->dev, "nce", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nce)) { + err = PTR_ERR(gpiod_nce); + dev_err(&pdev->dev, "NCE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nre = devm_gpiod_get(&pdev->dev, "nre", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nre)) { + err = PTR_ERR(gpiod_nre); + dev_err(&pdev->dev, "NRE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_nwe = devm_gpiod_get(&pdev->dev, "nwe", GPIOD_OUT_HIGH); + if (IS_ERR(gpiod_nwe)) { + err = PTR_ERR(gpiod_nwe); + dev_err(&pdev->dev, "NWE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_ale = devm_gpiod_get(&pdev->dev, "ale", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_ale)) { + err = PTR_ERR(gpiod_ale); + dev_err(&pdev->dev, "ALE GPIO request failed (%d)\n", err); + goto out_mtd; + } + gpiod_cle = devm_gpiod_get(&pdev->dev, "cle", GPIOD_OUT_LOW); + if (IS_ERR(gpiod_cle)) { + err = PTR_ERR(gpiod_cle); + dev_err(&pdev->dev, "CLE GPIO request failed (%d)\n", err); + goto out_mtd; + } /* Scan to find existence of the device */ err = nand_scan(ams_delta_mtd, 1); @@ -246,9 +254,6 @@ static int ams_delta_init(struct platform_device *pdev) goto out; out_mtd: - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); -out_gpio: - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); out_free: kfree(this); @@ -266,8 +271,6 @@ static int ams_delta_cleanup(struct platform_device *pdev) /* Release resources, unregister device */ nand_release(ams_delta_mtd); - gpio_free_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); - gpio_free(AMS_DELTA_GPIO_PIN_NAND_RB); iounmap(io_base); /* Free the MTD device structure */ -- 2.16.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH RESEND v3] mtd: rawnand: ams-delta: use GPIO lookup table 2018-07-17 17:05 ` [PATCH RESEND " Janusz Krzysztofik @ 2018-07-17 20:31 ` Boris Brezillon 0 siblings, 0 replies; 6+ messages in thread From: Boris Brezillon @ 2018-07-17 20:31 UTC (permalink / raw) To: Janusz Krzysztofik, Tony Lindgren Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Masahiro Yamada, Krzysztof Kozlowski, Shawn Guo, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko +Tony On Tue, 17 Jul 2018 19:05:52 +0200 Janusz Krzysztofik <jmkrzyszt@gmail.com> wrote: > Now as Amstrad Delta board - the only user of this driver - provides > GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and > use the table to locate required GPIO pins. > > Declare static variables for storing GPIO descriptors and replace > gpio_ function calls with their gpiod_ equivalents. > > Pin naming used by the driver should be followed while respective GPIO > lookup table is initialized by a board init code. > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Acked-by: Boris Brezillon <boris.brezillon@bootlin.com> Just a minor comment below (nothing important, just a coding style preference). Also, if it goes through the omap tree (I guess it will target 4.20), I'll need an immutable tag, because I have changes touching this driver in the pipe (that's more a request for Tony). > @@ -230,9 +205,42 @@ static int ams_delta_init(struct platform_device *pdev) > platform_set_drvdata(pdev, io_base); > > /* Set chip enabled, but */ > - err = gpio_request_array(_mandatory_gpio, ARRAY_SIZE(_mandatory_gpio)); > - if (err) > - goto out_gpio; > + gpiod_nwp = devm_gpiod_get(&pdev->dev, "nwp", GPIOD_OUT_HIGH); > + if (IS_ERR(gpiod_nwp)) { > + err = PTR_ERR(gpiod_nwp); > + dev_err(&pdev->dev, "NWP GPIO request failed (%d)\n", err); > + goto out_mtd; > + } Can you add a blank line after each if (IS_ERR(gpiod_nwp)) { } block. > + gpiod_nce = devm_gpiod_get(&pdev->dev, "nce", GPIOD_OUT_HIGH); > + if (IS_ERR(gpiod_nce)) { > + err = PTR_ERR(gpiod_nce); > + dev_err(&pdev->dev, "NCE GPIO request failed (%d)\n", err); > + goto out_mtd; > + } > + gpiod_nre = devm_gpiod_get(&pdev->dev, "nre", GPIOD_OUT_HIGH); > + if (IS_ERR(gpiod_nre)) { > + err = PTR_ERR(gpiod_nre); > + dev_err(&pdev->dev, "NRE GPIO request failed (%d)\n", err); > + goto out_mtd; > + } > + gpiod_nwe = devm_gpiod_get(&pdev->dev, "nwe", GPIOD_OUT_HIGH); > + if (IS_ERR(gpiod_nwe)) { > + err = PTR_ERR(gpiod_nwe); > + dev_err(&pdev->dev, "NWE GPIO request failed (%d)\n", err); > + goto out_mtd; > + } > + gpiod_ale = devm_gpiod_get(&pdev->dev, "ale", GPIOD_OUT_LOW); > + if (IS_ERR(gpiod_ale)) { > + err = PTR_ERR(gpiod_ale); > + dev_err(&pdev->dev, "ALE GPIO request failed (%d)\n", err); > + goto out_mtd; > + } > + gpiod_cle = devm_gpiod_get(&pdev->dev, "cle", GPIOD_OUT_LOW); > + if (IS_ERR(gpiod_cle)) { > + err = PTR_ERR(gpiod_cle); > + dev_err(&pdev->dev, "CLE GPIO request failed (%d)\n", err); > + goto out_mtd; > + } > > /* Scan to find existence of the device */ > err = nand_scan(ams_delta_mtd, 1); ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table 2018-07-09 19:38 ` [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table Janusz Krzysztofik 2018-07-17 17:05 ` [PATCH RESEND " Janusz Krzysztofik @ 2018-07-17 19:37 ` Boris Brezillon 2018-07-17 20:20 ` Janusz Krzysztofik 1 sibling, 1 reply; 6+ messages in thread From: Boris Brezillon @ 2018-07-17 19:37 UTC (permalink / raw) To: Janusz Krzysztofik Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Krzysztof Kozlowski, Vladimir Zapolskiy, Gregory CLEMENT, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko Hi Janusz, On Mon, 9 Jul 2018 21:38:50 +0200 Janusz Krzysztofik <jmkrzyszt@gmail.com> wrote: > Now as Amstrad Delta board - the only user of this driver - provides > GPIO lookup tables, switch from GPIO numbers to GPIO descriptors and > use the table to locate required GPIO pins. > > Declare static variables for storing GPIO descriptors and replace > gpio_ function calls with their gpiod_ equivalents. > > Pin naming used by the driver should be followed while respective GPIO > lookup table is initialized by a board init code. > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> > --- > Changlog: > v1: Fix handling of devm_gpiod_get_optional() return values - thanks to > Andy Shevchenko. > v2: Remove problematic error code conversion, no longer needed if used > on top of commit d08605a64e67 ("ARM: OMAP1: ams-delta: move late > devices back to init_machine") already in linux-next and commit > 8853daf3b4ac ("gpiolib: Defer on non-DT find_chip_by_name() > failure") just applied to linux-gpio/devel. Sorry, but we can't apply this patch now because of the dependency on those 2 commits. I guess it's not a big issue if we defer it to 4.20. Alternatively, we could consider queuing it to mtd/fixes after 4.19-rc1 is out, but we'll need a good reason to do that (like a regression that this patch is supposed to fix). Note for your future contributions: for this kind of cross-subsystem changes, it's better to let everything go through a single tree (usually done by sending all patches in a single series and explaining the dependencies between the patches in the cover letter), but it's already too late here (I guess d08605a64e67 is in the omap tree and 8853daf3b4ac in the gpio one). Regards, Boris ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table 2018-07-17 19:37 ` [PATCH " Boris Brezillon @ 2018-07-17 20:20 ` Janusz Krzysztofik 2018-07-17 20:22 ` Boris Brezillon 0 siblings, 1 reply; 6+ messages in thread From: Janusz Krzysztofik @ 2018-07-17 20:20 UTC (permalink / raw) To: Boris Brezillon Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Krzysztof Kozlowski, Vladimir Zapolskiy, Gregory CLEMENT, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko Hi Boris, On Tuesday, July 17, 2018 9:37:36 PM CEST Boris Brezillon wrote: > ... > Sorry, but we can't apply this patch now because of the dependency on > those 2 commits. I guess it's not a big issue if we defer it to 4.20. > Alternatively, we could consider queuing it to mtd/fixes after 4.19-rc1 > is out, but we'll need a good reason to do that (like a regression > that this patch is supposed to fix). Note for your future contributions: > for this kind of cross-subsystem changes, it's better to let everything > go through a single tree (usually done by sending all patches in a > single series and explaining the dependencies between the patches in > the cover letter), Good advice, Sine I have in my queue a patch for OMAP that depends on this one, and still another one with the same dependency issues, I'll take the path you suggest and resend those three as a series to be merged via OMAP. Thanks, Janusz ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table 2018-07-17 20:20 ` Janusz Krzysztofik @ 2018-07-17 20:22 ` Boris Brezillon 0 siblings, 0 replies; 6+ messages in thread From: Boris Brezillon @ 2018-07-17 20:22 UTC (permalink / raw) To: Janusz Krzysztofik Cc: Miquel Raynal, Richard Weinberger, David Woodhouse, Brian Norris, Marek Vasut, Krzysztof Kozlowski, Vladimir Zapolskiy, Gregory CLEMENT, Shreeya Patel, Arvind Yadav, linux-mtd, linux-omap, linux-kernel, Andy Shevchenko On Tue, 17 Jul 2018 22:20:00 +0200 Janusz Krzysztofik <jmkrzyszt@gmail.com> wrote: > Hi Boris, > > On Tuesday, July 17, 2018 9:37:36 PM CEST Boris Brezillon wrote: > > ... > > Sorry, but we can't apply this patch now because of the dependency on > > those 2 commits. I guess it's not a big issue if we defer it to 4.20. > > Alternatively, we could consider queuing it to mtd/fixes after 4.19-rc1 > > is out, but we'll need a good reason to do that (like a regression > > that this patch is supposed to fix). Note for your future contributions: > > for this kind of cross-subsystem changes, it's better to let everything > > go through a single tree (usually done by sending all patches in a > > single series and explaining the dependencies between the patches in > > the cover letter), > > Good advice, Sine I have in my queue a patch for OMAP that depends on this > one, and still another one with the same dependency issues, I'll take the path > you suggest and resend those three as a series to be merged via OMAP. Sounds good. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-17 20:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180525222046.11200-1-jmkrzyszt@gmail.com>
2018-07-09 19:38 ` [PATCH v3] mtd: rawnand: ams-delta: use GPIO lookup table Janusz Krzysztofik
2018-07-17 17:05 ` [PATCH RESEND " Janusz Krzysztofik
2018-07-17 20:31 ` Boris Brezillon
2018-07-17 19:37 ` [PATCH " Boris Brezillon
2018-07-17 20:20 ` Janusz Krzysztofik
2018-07-17 20:22 ` Boris Brezillon
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox