From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752697AbbLNB51 (ORCPT ); Sun, 13 Dec 2015 20:57:27 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36487 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752331AbbLNB50 (ORCPT ); Sun, 13 Dec 2015 20:57:26 -0500 From: Karl Zhang X-Google-Original-From: Karl Zhang To: computersforpeace@gmail.com, linux-mtd@lists.infradead.org, dwmw2@infradead.org, paul.gortmaker@windriver.com, artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org Cc: peterpandong@micron.com, beanhuo@micron.com, Karl Zhang Subject: [PATCH v2 1/2] mtd: spi-nor: add Manufacturer ID for Micron Date: Mon, 14 Dec 2015 01:40:00 +0000 Message-Id: <1450057201-28419-2-git-send-email-karlzhang@micron.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450057201-28419-1-git-send-email-karlzhang@micron.com> References: <1450057201-28419-1-git-send-email-karlzhang@micron.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Micron Manufacturer ID assigned by JEDEC is 2Ch. Add this ID, for new Spi NOR from Micron. ST's ID(20h) is Micron due to the history. Signed-off-by: Karl Zhang --- v2: no change include/linux/mtd/cfi.h | 1 + include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h index 9b57a9b..cbf7716 100644 --- a/include/linux/mtd/cfi.h +++ b/include/linux/mtd/cfi.h @@ -377,6 +377,7 @@ struct cfi_fixup { #define CFI_MFR_SHARP 0x00B0 #define CFI_MFR_SST 0x00BF #define CFI_MFR_ST 0x0020 /* STMicroelectronics */ +#define CFI_MFR_MICRON 0x002C /* Micron */ #define CFI_MFR_TOSHIBA 0x0098 #define CFI_MFR_WINBOND 0x00DA diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h index fac3f6f..b858e93 100644 --- a/include/linux/mtd/spi-nor.h +++ b/include/linux/mtd/spi-nor.h @@ -22,6 +22,8 @@ */ #define SNOR_MFR_ATMEL CFI_MFR_ATMEL #define SNOR_MFR_INTEL CFI_MFR_INTEL +/* Micron Manufacturer ID assigned by JEDEC */ +#define SNOR_MFR_MICRON_JEDEC CFI_MFR_MICRON #define SNOR_MFR_MICRON CFI_MFR_ST /* ST Micro <--> Micron */ #define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX #define SNOR_MFR_SPANSION CFI_MFR_AMD -- 1.9.1