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 16/26] memory: omap-gpmc: Prevent GPMC_STATUS from being accessed via gpmc_regs
    Date
    GPMC_STATUS register is private to the GPMC module and must not be
    accessed directly by NAND driver through the gpmc_regs.

    They must use gpmc_omap_get_nand_ops() instead.

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

    diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
    index d958fb6..76ce9fe 100644
    --- a/drivers/memory/omap-gpmc.c
    +++ b/drivers/memory/omap-gpmc.c
    @@ -1061,7 +1061,7 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs)
    {
    int i;

    - reg->gpmc_status = gpmc_base + GPMC_STATUS;
    + reg->gpmc_status = NULL; /* deprecated */
    reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET +
    GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs;
    reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +
    diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
    index ff27e5a..7f6de53 100644
    --- a/include/linux/platform_data/mtd-nand-omap2.h
    +++ b/include/linux/platform_data/mtd-nand-omap2.h
    @@ -45,7 +45,6 @@ enum omap_ecc {
    };

    struct gpmc_nand_regs {
    - void __iomem *gpmc_status;
    void __iomem *gpmc_nand_command;
    void __iomem *gpmc_nand_address;
    void __iomem *gpmc_nand_data;
    @@ -64,6 +63,8 @@ struct gpmc_nand_regs {
    void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];
    void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
    void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
    + /* Deprecated. Do not use */
    + void __iomem *gpmc_status;
    };

    struct omap_nand_platform_data {
    --
    2.1.4
    \
     
     \ /
      Last update: 2016-02-19 22:41    [W:4.046 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site