lkml.org 
[lkml]   [2017]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 11/14] mtd: nand: jz4740: Let the pinctrl driver configure the pins
    Date
    Before, this NAND driver would set itself the configuration of the
    chip-select pins for the various NAND banks.

    Now that the JZ4740 and similar SoCs have a pinctrl driver, we rely on
    the pins being properly configured before the driver probes.

    Signed-off-by: Paul Cercueil <paul@crapouillou.net>
    Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
    ---
    drivers/mtd/nand/jz4740_nand.c | 23 +----------------------
    1 file changed, 1 insertion(+), 22 deletions(-)

    v2: No changes
    v3: No changes
    v4: No changes
    v5: No changes
    v6: No changes

    diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
    index 5551c36adbdf..0d06a1f07d82 100644
    --- a/drivers/mtd/nand/jz4740_nand.c
    +++ b/drivers/mtd/nand/jz4740_nand.c
    @@ -25,7 +25,6 @@

    #include <linux/gpio.h>

    -#include <asm/mach-jz4740/gpio.h>
    #include <asm/mach-jz4740/jz4740_nand.h>

    #define JZ_REG_NAND_CTRL 0x50
    @@ -310,34 +309,20 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
    uint8_t *nand_dev_id)
    {
    int ret;
    - int gpio;
    - char gpio_name[9];
    char res_name[6];
    uint32_t ctrl;
    struct nand_chip *chip = &nand->chip;
    struct mtd_info *mtd = nand_to_mtd(chip);

    - /* Request GPIO port. */
    - gpio = JZ_GPIO_MEM_CS0 + bank - 1;
    - sprintf(gpio_name, "NAND CS%d", bank);
    - ret = gpio_request(gpio, gpio_name);
    - if (ret) {
    - dev_warn(&pdev->dev,
    - "Failed to request %s gpio %d: %d\n",
    - gpio_name, gpio, ret);
    - goto notfound_gpio;
    - }
    -
    /* Request I/O resource. */
    sprintf(res_name, "bank%d", bank);
    ret = jz_nand_ioremap_resource(pdev, res_name,
    &nand->bank_mem[bank - 1],
    &nand->bank_base[bank - 1]);
    if (ret)
    - goto notfound_resource;
    + return ret;

    /* Enable chip in bank. */
    - jz_gpio_set_function(gpio, JZ_GPIO_FUNC_MEM_CS0);
    ctrl = readl(nand->base + JZ_REG_NAND_CTRL);
    ctrl |= JZ_NAND_CTRL_ENABLE_CHIP(bank - 1);
    writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
    @@ -377,12 +362,8 @@ static int jz_nand_detect_bank(struct platform_device *pdev,
    dev_info(&pdev->dev, "No chip found on bank %i\n", bank);
    ctrl &= ~(JZ_NAND_CTRL_ENABLE_CHIP(bank - 1));
    writel(ctrl, nand->base + JZ_REG_NAND_CTRL);
    - jz_gpio_set_function(gpio, JZ_GPIO_FUNC_NONE);
    jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
    nand->bank_base[bank - 1]);
    -notfound_resource:
    - gpio_free(gpio);
    -notfound_gpio:
    return ret;
    }

    @@ -503,7 +484,6 @@ static int jz_nand_probe(struct platform_device *pdev)
    err_unclaim_banks:
    while (chipnr--) {
    unsigned char bank = nand->banks[chipnr];
    - gpio_free(JZ_GPIO_MEM_CS0 + bank - 1);
    jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
    nand->bank_base[bank - 1]);
    }
    @@ -530,7 +510,6 @@ static int jz_nand_remove(struct platform_device *pdev)
    if (bank != 0) {
    jz_nand_iounmap_resource(nand->bank_mem[bank - 1],
    nand->bank_base[bank - 1]);
    - gpio_free(JZ_GPIO_MEM_CS0 + bank - 1);
    }
    }

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-05-12 18:56    [W:4.481 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site