Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   mikhail.kshevetskiy@iopsys.eu
To:     linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org
Cc:     Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>,
        Vignesh Raghavendra <vigneshr@ti.com>,
        Richard Weinberger <richard@nod.at>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        Frieder Schrempf <frieder.schrempf@kontron.de>
Subject: [PATCH v3 1/2] mtd: spinand: winbond: fix flash identification
Date:   Mon, 10 Oct 2022 13:51:09 +0300
Message-Id: <20221010105110.446674-1-mikhail.kshevetskiy@iopsys.eu>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pK0T+fDwhAkWYCyijoK4aG2cRheJElsg1Xq27E/6VC25Dj3Ms4sDVNgV6CIL?=
 =?us-ascii?Q?oorJEzcOJUyYCvQKri9pRfmlUesH36xrDTxf7vlNUlo94+dzE+WJj3Wa84lb?=
 =?us-ascii?Q?Ne3KnNjen+p3IxDVW4csB+3gTz+xBYL3pQdoDbmzTuCdP6IyDegGXxT6vXPl?=
 =?us-ascii?Q?zCeCa2Y9dD1kIsUY/WjF9GpRvf1tue9LtLQ1MMAl3ZyVHAVTJi5L4YOM4Cau?=
 =?us-ascii?Q?TVL18G4RHYW1H2b5bPGqQVyryZxeFyOIYiwg/CHd12ZhnfU2HPpESfEWYxvG?=
 =?us-ascii?Q?mkma2Ml3nHccRUgJcfUepr/KQiQy6gF/i67myznCVPIGyfUk7DVhXLE4NZ2X?=
 =?us-ascii?Q?bM+5XDYPfWfu6wQ8fr4tkiGvSN17MGlXNR/Y5S7YF89sLWsJ2GaWzbG7/GgO?=
 =?us-ascii?Q?c+2ip4eJD4B24sxgje4fwY7IjLsodyuI7HU+JuzHOmpdYDHvoVCysHhy/xhc?=
 =?us-ascii?Q?XA0kWkJ2+ZhQS3lyimNb/+xlfeYEo2CD6hm7GJeQqbG3ShJrJgf74allJICK?=
 =?us-ascii?Q?zCeCAyJxas2dk6OJ5j+bS7XADmv9B6UQZFba2RAy5mDHjKMsELd9eZeOhrtu?=
 =?us-ascii?Q?DVIVSYQbg3HjkKvhj+y6u96Sc07psuaE8TUloL9a3QD4ekE0WLDwDZjVAsIy?=
 =?us-ascii?Q?pO4aNgj40Qd6Df2cq4glwJld0P/QNqXTvS2cZZXnaWrroarH7rPhcClGlNOV?=
 =?us-ascii?Q?1/zmu9N7io21ImAgYidIG4Zeldx/B3AY8nx7EnNZJGeJJcfNuqLBvPlOE9Af?=
 =?us-ascii?Q?l6nFsTIvH6B7W1tYgJcaDgpPlX2HU0IQ0VQXrFpYM5jEtX9jbC+rMdjJQLUR?=
 =?us-ascii?Q?TwX/srwh/VWwV4O2T5PkWgH0Wo/TvR9nRI/Tse0zWkyw7dnDN9lBPVFbhcty?=
 =?us-ascii?Q?pB4wds1tpa1+izqS+GTT+3SGWSZjnd4b1m5eiJ+Iq9BxKMmc+6JJgg8Ud0Ir?=
 =?us-ascii?Q?ofLC8urAZhYQ4mvHg+3le4EnL5m2VnNM9s3dkmuiouAmktfJsZRWKt7hiCjo?=
 =?us-ascii?Q?O/ZVp7XasQ8MPwPzZBRCjFiZwXgcSrGBgLzC0ZowfXKElftOhDdWVgY07gsO?=
 =?us-ascii?Q?HiyUvUOI+4W0sOz4Ganlx55e9+DAVHvebbJAtIG6VmRg0WzCV/N/EdKnD4J5?=
 =?us-ascii?Q?vrvEc+kv1HfQDFMnPNPgexxrlDo7oZvrVvIo15XR9qx+HKOIGw4vZm+tUgoX?=
 =?us-ascii?Q?K5z3IRFHPSkuxF5jJazV9UQrVe3A4HOcmocfo180i36sAwigtZL7T6xj7bBp?=
 =?us-ascii?Q?gWezVkaQcTtTZovu0VGLfe5yguomV6qsLDVFFhMCcoemKw5rMRHoFRWwmb20?=
 =?us-ascii?Q?uFVtKs7kuGljdexaPHAnfFt6CuiXGaNUZhZLt9fOKn+Igmt0IQ1cYyk4TUIm?=
 =?us-ascii?Q?wkdL93q7CQ0XFZ0VuB87Pb+l0oOsTUPgFI9H1D6bSfFoLzmWaJBJSqjVCFC2?=
 =?us-ascii?Q?3QUYtOnk/GQIlGXTYGG1IIBZraUymWcRAZwKvjRcAJho46to1Icyc7wkN+gs?=
 =?us-ascii?Q?2fjGF2znm8OwhwiKlb9CzInYEtY+4PgMPQQXQ32DAnygCFGAdjzjUmDsEAUE?=
 =?us-ascii?Q?Hwwa70iqTvmmqSxHjvGugDYSOcpW8N2lfDF6kbcXmIT901kfzAwMiPjX8wN4?=
 =?us-ascii?Q?nQ=3D=3D?=
X-OriginatorOrg: iopsys.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: d72ebe77-45e1-4d36-f0fe-08daaaad5c70
X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6494.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 10:51:18.5816
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 7ff78d65-2de4-40f5-8675-0569e5c7a65d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1AFqI1WITHHAwVxyy6h8ZXtBR1tTw8o4TZFSz8xzQ1GeimrRrW3iM+xpQhABBDGmxKSwXzg99TSnh0Sv6Ob2JYcBUg4KBuDgOruMDdx3wqE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR08MB5751
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>

Winbond uses 3 bytes to identify flash: vendor_id, dev_id_0, dev_id_1,
but current driver uses only first 2 bytes of it for devices
identification. As result Winbond W25N02KV flash (id_bytes: EF, AA, 22)
is identified as W25N01GV (id_bytes: EF, AA, 21).

Fix this by adding missed identification bytes.

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
---
 drivers/mtd/nand/spi/winbond.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index 76684428354e..ed368a55d68f 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -76,7 +76,7 @@ static int w25m02gv_select_target(struct spinand_device *spinand,
 
 static const struct spinand_info winbond_spinand_table[] = {
 	SPINAND_INFO("W25M02GV",
-		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab),
+		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21),
 		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 2),
 		     NAND_ECCREQ(1, 512),
 		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
@@ -86,7 +86,7 @@ static const struct spinand_info winbond_spinand_table[] = {
 		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL),
 		     SPINAND_SELECT_TARGET(w25m02gv_select_target)),
 	SPINAND_INFO("W25N01GV",
-		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa),
+		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x21),
 		     NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
 		     NAND_ECCREQ(1, 512),
 		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
-- 
2.35.1