mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Jan Luebbe <jlu@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] mtd: update NAND manufacturer names from the kernel
Date: Thu, 11 Apr 2013 10:46:43 +0200	[thread overview]
Message-ID: <20130411084643.GK1906@pengutronix.de> (raw)
In-Reply-To: <1365607897-32319-1-git-send-email-jlu@pengutronix.de>

On Wed, Apr 10, 2013 at 05:31:37PM +0200, Jan Luebbe wrote:
> Signed-off-by: Jan Luebbe <jlu@pengutronix.de>

Applied, thanks

Sascha

> ---
>  drivers/mtd/nand/nand_ids.c |  4 +++-
>  include/linux/mtd/nand.h    | 20 +++++++++++---------
>  2 files changed, 14 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
> index 72593d4..4f8fb02 100644
> --- a/drivers/mtd/nand/nand_ids.c
> +++ b/drivers/mtd/nand/nand_ids.c
> @@ -178,7 +178,9 @@ struct nand_manufacturers nand_manuf_ids[] = {
>  	{NAND_MFR_STMICRO, __NANDSTR("ST Micro")},
>  	{NAND_MFR_HYNIX, __NANDSTR("Hynix")},
>  	{NAND_MFR_MICRON, __NANDSTR("Micron")},
> -	{NAND_MFR_AMD, __NANDSTR("AMD")},
> +	{NAND_MFR_AMD, __NANDSTR("AMD/Spansion")},
> +	{NAND_MFR_MACRONIX, __NANDSTR("Macronix")},
> +	{NAND_MFR_EON, __NANDSTR("Eon")},
>  	{0x0, "Unknown"}
>  };
>  
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
> index d2f8648..1df1a7b 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/nand.h
> @@ -497,15 +497,17 @@ struct nand_chip {
>  /*
>   * NAND Flash Manufacturer ID Codes
>   */
> -#define NAND_MFR_TOSHIBA	0x98
> -#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_TOSHIBA        0x98
> +#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_MACRONIX       0xc2
> +#define NAND_MFR_EON            0x92
>  
>  /**
>   * struct nand_flash_dev - NAND Flash Device ID Structure
> -- 
> 1.8.2.rc2
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2013-04-11  8:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-10 15:31 Jan Luebbe
2013-04-11  8:46 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130411084643.GK1906@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=jlu@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox