lkml.org 
[lkml]   [2018]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 1/2] mtd: rawnand: reorder NAND manufacturer IDs
    Date
    From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

    Reorder NAND manufacturer IDs for clarity.

    Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

    ---

    Changes in v2:
    - Subject prefix s/nand:/rawnand:/ as well as upper-case: s/nand/NAND/
    and s/id/ID/ in the commit log as suggested by Miquèl.
    - Reordering the macro definitions too as suggested by Boris.

    drivers/mtd/nand/raw/nand_ids.c | 20 ++++++++++----------
    include/linux/mtd/rawnand.h | 28 ++++++++++++++--------------
    2 files changed, 24 insertions(+), 24 deletions(-)

    diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
    index 5423c3bb388e..0851cd86bf19 100644
    --- a/drivers/mtd/nand/raw/nand_ids.c
    +++ b/drivers/mtd/nand/raw/nand_ids.c
    @@ -169,21 +169,21 @@ struct nand_flash_dev nand_flash_ids[] = {

    /* Manufacturer IDs */
    static const struct nand_manufacturer nand_manufacturers[] = {
    - {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},
    + {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},
    + {NAND_MFR_ATO, "ATO"},
    + {NAND_MFR_EON, "Eon"},
    {NAND_MFR_ESMT, "ESMT"},
    - {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
    {NAND_MFR_FUJITSU, "Fujitsu"},
    - {NAND_MFR_NATIONAL, "National"},
    - {NAND_MFR_RENESAS, "Renesas"},
    - {NAND_MFR_STMICRO, "ST Micro"},
    {NAND_MFR_HYNIX, "Hynix", &hynix_nand_manuf_ops},
    - {NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},
    - {NAND_MFR_AMD, "AMD/Spansion", &amd_nand_manuf_ops},
    + {NAND_MFR_INTEL, "Intel"},
    {NAND_MFR_MACRONIX, "Macronix", &macronix_nand_manuf_ops},
    - {NAND_MFR_EON, "Eon"},
    + {NAND_MFR_MICRON, "Micron", &micron_nand_manuf_ops},
    + {NAND_MFR_NATIONAL, "National"},
    + {NAND_MFR_RENESAS, "Renesas"},
    + {NAND_MFR_SAMSUNG, "Samsung", &samsung_nand_manuf_ops},
    {NAND_MFR_SANDISK, "SanDisk"},
    - {NAND_MFR_INTEL, "Intel"},
    - {NAND_MFR_ATO, "ATO"},
    + {NAND_MFR_STMICRO, "ST Micro"},
    + {NAND_MFR_TOSHIBA, "Toshiba", &toshiba_nand_manuf_ops},
    {NAND_MFR_WINBOND, "Winbond"},
    };

    diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
    index efb2345359bb..20516fc28b74 100644
    --- a/include/linux/mtd/rawnand.h
    +++ b/include/linux/mtd/rawnand.h
    @@ -1422,21 +1422,21 @@ static inline void *nand_get_manufacturer_data(struct nand_chip *chip)
    /*
    * NAND Flash Manufacturer ID Codes
    */
    -#define NAND_MFR_TOSHIBA 0x98
    +#define NAND_MFR_AMD 0x01
    +#define NAND_MFR_ATO 0x9b
    +#define NAND_MFR_EON 0x92
    #define NAND_MFR_ESMT 0xc8
    -#define NAND_MFR_SAMSUNG 0xec
    #define NAND_MFR_FUJITSU 0x04
    -#define NAND_MFR_NATIONAL 0x8f
    -#define NAND_MFR_RENESAS 0x07
    -#define NAND_MFR_STMICRO 0x20
    #define NAND_MFR_HYNIX 0xad
    -#define NAND_MFR_MICRON 0x2c
    -#define NAND_MFR_AMD 0x01
    +#define NAND_MFR_INTEL 0x89
    #define NAND_MFR_MACRONIX 0xc2
    -#define NAND_MFR_EON 0x92
    +#define NAND_MFR_MICRON 0x2c
    +#define NAND_MFR_NATIONAL 0x8f
    +#define NAND_MFR_RENESAS 0x07
    +#define NAND_MFR_SAMSUNG 0xec
    #define NAND_MFR_SANDISK 0x45
    -#define NAND_MFR_INTEL 0x89
    -#define NAND_MFR_ATO 0x9b
    +#define NAND_MFR_STMICRO 0x20
    +#define NAND_MFR_TOSHIBA 0x98
    #define NAND_MFR_WINBOND 0xef


    @@ -1541,12 +1541,12 @@ nand_manufacturer_name(const struct nand_manufacturer *manufacturer)

    extern struct nand_flash_dev nand_flash_ids[];

    -extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;
    -extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;
    -extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;
    -extern const struct nand_manufacturer_ops micron_nand_manuf_ops;
    extern const struct nand_manufacturer_ops amd_nand_manuf_ops;
    +extern const struct nand_manufacturer_ops hynix_nand_manuf_ops;
    extern const struct nand_manufacturer_ops macronix_nand_manuf_ops;
    +extern const struct nand_manufacturer_ops micron_nand_manuf_ops;
    +extern const struct nand_manufacturer_ops samsung_nand_manuf_ops;
    +extern const struct nand_manufacturer_ops toshiba_nand_manuf_ops;

    int nand_create_bbt(struct nand_chip *chip);
    int nand_markbad_bbt(struct mtd_info *mtd, loff_t offs);
    --
    2.14.4
    \
     
     \ /
      Last update: 2018-09-06 23:32    [W:3.061 / U:0.484 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site