lkml.org 
[lkml]   [2016]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 04/26] mtd: nand: omap2: Use gpmc_omap_get_nand_ops() to get NAND registers
    Date
    Deprecate nand register passing via platform data and use
    gpmc_omap_get_nand_ops() instead.

    Signed-off-by: Roger Quadros <rogerq@ti.com>
    ---
    arch/arm/mach-omap2/gpmc-nand.c | 2 --
    drivers/mtd/nand/omap2.c | 9 ++++++++-
    include/linux/platform_data/mtd-nand-omap2.h | 4 +++-
    3 files changed, 11 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
    index 72918c4..04e6998 100644
    --- a/arch/arm/mach-omap2/gpmc-nand.c
    +++ b/arch/arm/mach-omap2/gpmc-nand.c
    @@ -121,8 +121,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
    if (err < 0)
    goto out_free_cs;

    - gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);
    -
    if (!gpmc_hwecc_bch_capable(gpmc_nand_data->ecc_opt)) {
    pr_err("omap2-nand: Unsupported NAND ECC scheme selected\n");
    err = -EINVAL;
    diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
    index c553f78..eb18c04 100644
    --- a/drivers/mtd/nand/omap2.c
    +++ b/drivers/mtd/nand/omap2.c
    @@ -28,6 +28,7 @@
    #include <linux/mtd/nand_bch.h>
    #include <linux/platform_data/elm.h>

    +#include <linux/omap-gpmc.h>
    #include <linux/platform_data/mtd-nand-omap2.h>

    #define DRIVER_NAME "omap2-nand"
    @@ -168,7 +169,9 @@ struct omap_nand_info {
    } iomode;
    u_char *buf;
    int buf_len;
    + /* Interface to GPMC */
    struct gpmc_nand_regs reg;
    + struct gpmc_nand_ops *ops;
    /* generated at runtime depending on ECC algorithm and layout selected */
    struct nand_ecclayout oobinfo;
    /* fields specific for BCHx_HW ECC scheme */
    @@ -1665,9 +1668,13 @@ static int omap_nand_probe(struct platform_device *pdev)

    platform_set_drvdata(pdev, info);

    + info->ops = gpmc_omap_get_nand_ops(&info->reg, info->gpmc_cs);
    + if (!info->ops) {
    + dev_err(&pdev->dev, "Failed to get GPMC->NAND interface\n");
    + return -ENODEV;
    + }
    info->pdev = pdev;
    info->gpmc_cs = pdata->cs;
    - info->reg = pdata->reg;
    info->of_node = pdata->of_node;
    info->ecc_opt = pdata->ecc_opt;
    nand_chip = &info->nand;
    diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
    index 090bbab..a067f58 100644
    --- a/include/linux/platform_data/mtd-nand-omap2.h
    +++ b/include/linux/platform_data/mtd-nand-omap2.h
    @@ -75,10 +75,12 @@ struct omap_nand_platform_data {
    enum nand_io xfer_type;
    int devsize;
    enum omap_ecc ecc_opt;
    - struct gpmc_nand_regs reg;

    /* for passing the partitions */
    struct device_node *of_node;
    struct device_node *elm_of_node;
    +
    + /* deprecated */
    + struct gpmc_nand_regs reg;
    };
    #endif
    --
    2.1.4
    \
     
     \ /
      Last update: 2016-02-19 22:41    [W:4.605 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site