From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753696AbbCBJ1U (ORCPT ); Mon, 2 Mar 2015 04:27:20 -0500 Received: from atl4mhob04.myregisteredsite.com ([209.17.115.42]:50182 "EHLO atl4mhob04.myregisteredsite.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751126AbbCBJ1S (ORCPT ); Mon, 2 Mar 2015 04:27:18 -0500 X-TCPREMOTEIP: 88.159.208.100 X-Authenticated-UID: mike@milosoftware.com From: Mike Looijmans To: linux-mtd@lists.infradead.org, dwmw2@infradead.org, computersforpeace@gmail.com Cc: michal.simek@xilinx.com, linux-kernel@vger.kernel.org, Mike Looijmans Subject: [PATCH] MTD: m25p80: fix inconsistency in m25p_ids for Micron devices Date: Mon, 2 Mar 2015 10:26:51 +0100 Message-Id: <1425288411-6888-1-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As stated in a5b7616c5, "mtd: m25p80,spi-nor: Fix module aliases for m25p80", m25p_ids[] in m25p80.c needs to be kept in sync with spi_nor_ids[] in spi-nor.c. This patch fixes the mismatches for the Micron devices, the "n25q256a" and "n25q512a" do not exist in the spi_nor_ids, so replace them with the correct names for these chips. This repairs the disappearance of NOR flash on the Miami boards since 3.18. Signed-off-by: Mike Looijmans --- drivers/mtd/devices/m25p80.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index b2b33e4..402172c 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -280,8 +280,11 @@ static const struct spi_device_id m25p_ids[] = { {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, {"mx66l1g55g"}, - {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, - {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, + {"n25q064"}, + {"n25q128a11"}, {"n25q128a13"}, + {"n25q256a11"}, {"n25q256a13"}, + {"n25q512a11"}, {"n25q512a13"}, {"n25q512ax3"}, + {"n25q00"}, {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, -- 1.9.1