All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [MTD] NAND: Adding Micron MFR Id
@ 2007-03-19 16:30 sshahrom
  2007-03-21 15:10 ` Thomas Gleixner
  0 siblings, 1 reply; 3+ messages in thread
From: sshahrom @ 2007-03-19 16:30 UTC (permalink / raw)
  To: linux-mtd; +Cc: sshahrom


Hello,
Adding Micron manufacturing ID.

Signed-off-by: Shahrom Sharif <sshahrom@micron.com>
---

 drivers/mtd/nand/nand_ids.c |    1 +
 include/linux/mtd/nand.h    |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 2e2cdf2..9002077 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -137,6 +137,7 @@ struct nand_manufacturers nand_manuf_ids
        {NAND_MFR_RENESAS, "Renesas"},
        {NAND_MFR_STMICRO, "ST Micro"},
        {NAND_MFR_HYNIX, "Hynix"},
+       {NAND_MFR_MICRON, "Micron"},
        {0x0, "Unknown"}
 };
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 9752388..cf197ad 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -431,6 +431,7 @@ struct nand_chip {
 #define NAND_MFR_RENESAS       0x07
 #define NAND_MFR_STMICRO       0x20
 #define NAND_MFR_HYNIX         0xad
+#define NAND_MFR_MICRON                0x2c
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] [MTD] NAND: Adding Micron MFR Id
  2007-03-19 16:30 [PATCH] [MTD] NAND: Adding Micron MFR Id sshahrom
@ 2007-03-21 15:10 ` Thomas Gleixner
  0 siblings, 0 replies; 3+ messages in thread
From: Thomas Gleixner @ 2007-03-21 15:10 UTC (permalink / raw)
  To: sshahrom; +Cc: linux-mtd

On Mon, 2007-03-19 at 09:30 -0700, sshahrom@micron.com wrote:
> Hello,
> Adding Micron manufacturing ID.
> 
> Signed-off-by: Shahrom Sharif <sshahrom@micron.com>

patching file drivers/mtd/nand/nand_ids.c
Hunk #1 FAILED at 137.
1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/nand_ids.c.rej
patching file include/linux/mtd/nand.h
Hunk #1 FAILED at 431.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/mtd/nand.h.rej

Your patch is whitespace damaged, please fix your mail client or your editor.

	tglx	

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] [MTD] NAND: Adding Micron MFR ID
@ 2007-03-22  1:48 sshahrom
  0 siblings, 0 replies; 3+ messages in thread
From: sshahrom @ 2007-03-22  1:48 UTC (permalink / raw)
  To: linux-mtd; +Cc: sshahrom


Hi, 
Sorry for confusion, cleaned up from white space. Added Micron
Manufacturing ID.

Signed-off-by: Shahrom Sharif <sshahrom@micron.com>
---
:100644 100644 2e2cdf2... 0000000... M	drivers/mtd/nand/nand_ids.c
:100644 100644 9752388... 0000000... M	include/linux/mtd/nand.h

diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 2e2cdf2..9002077 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -137,6 +137,7 @@ struct nand_manufacturers nand_manuf_ids
 	{NAND_MFR_RENESAS, "Renesas"},
 	{NAND_MFR_STMICRO, "ST Micro"},
 	{NAND_MFR_HYNIX, "Hynix"},
+	{NAND_MFR_MICRON, "Micron"},
 	{0x0, "Unknown"}
 };
 
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 9752388..cf197ad 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -431,6 +431,7 @@ struct nand_chip {
 #define NAND_MFR_RENESAS	0x07
 #define NAND_MFR_STMICRO	0x20
 #define NAND_MFR_HYNIX		0xad
+#define NAND_MFR_MICRON		0x2c
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2007-03-22  1:48 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-19 16:30 [PATCH] [MTD] NAND: Adding Micron MFR Id sshahrom
2007-03-21 15:10 ` Thomas Gleixner
2007-03-22  1:48 [PATCH] [MTD] NAND: Adding Micron MFR ID sshahrom

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.