From patchwork Sun Sep 15 22:04:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Adami X-Patchwork-Id: 2894901 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5C848BFF05 for ; Sun, 15 Sep 2013 22:06:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95C9920205 for ; Sun, 15 Sep 2013 22:06:04 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BAAE32016A for ; Sun, 15 Sep 2013 22:06:03 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VLKRi-0006zC-Ct; Sun, 15 Sep 2013 22:05:34 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VLKRX-0004El-JH; Sun, 15 Sep 2013 22:05:23 +0000 Received: from mail-ee0-x236.google.com ([2a00:1450:4013:c00::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VLKRG-0004AS-Oi for linux-arm-kernel@lists.infradead.org; Sun, 15 Sep 2013 22:05:08 +0000 Received: by mail-ee0-f54.google.com with SMTP id e53so1691904eek.27 for ; Sun, 15 Sep 2013 15:04:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=dus8IKUnIlZZv1tJJkoG7NpCDGGvNtN8vcxBy+YNiug=; b=krGMcn7fJHiJckADwA21vJmdtgGVu+QdJnQiI+gNsiAQhnv6lYI2Bq5WUAuibT3SWp /rpy1jwE/Xw9jMx/wmyEpMYwG5MWXOgQVzlVF0X4DpOzrx+wAn29rGQc8Hpzvy4FvTsj 4bzAqnwBFNM8vzh6kJtx6RBQw2HLT0w6GlVo47tFTW86qWygnFjXXaHmVk5ecRCk3rXa RIn47az9/lP81O1d0bd8hMCYz1Y1IoBcf+7zPB3ylTGd9KjapVq+byHin5tijrCAp5m2 OA9jZXEtlbJtHkPgFHYOsiGkYMFbxIYyDHj33hvmM80obG50iuJa81arJcAEFii9ECWZ WTGQ== X-Received: by 10.14.214.136 with SMTP id c8mr37645093eep.6.1379282684641; Sun, 15 Sep 2013 15:04:44 -0700 (PDT) Received: from mizar.localdomain (host50-7-dynamic.20-79-r.retail.telecomitalia.it. [79.20.7.50]) by mx.google.com with ESMTPSA id y47sm36559859eew.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Sep 2013 15:04:44 -0700 (PDT) From: Andrea Adami To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] ARM: sa1100: collie.c: fall back to jedec_probe flash detection Date: Mon, 16 Sep 2013 00:04:42 +0200 Message-Id: <1379282682-26985-1-git-send-email-andrea.adami@gmail.com> X-Mailer: git-send-email 1.8.1.5 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130915_180507_024515_9719E291 X-CRM114-Status: GOOD ( 12.90 ) X-Spam-Score: -2.0 (--) Cc: Russell King , linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Zaurus collie contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and at the moment cfi will not detect the collie NOR. In the meanwhile we can revert to the jedec-probe map which has been fixed with following commit: mtd: jedec_probe: fix LH28F640BF definition fe2f4c8e0bf2756b670ee78fa9772613a2ea8495 Somehow this is unsatisfactory because the flash is mounted READ ONLY (as from factory, with a RO cramfs) Signed-off-by: Andrea Adami --- arch/arm/mach-sa1100/collie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 612a456..7fb96eb 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -289,7 +289,7 @@ static void collie_flash_exit(void) } static struct flash_platform_data collie_flash_data = { - .map_name = "cfi_probe", + .map_name = "jedec_probe", .init = collie_flash_init, .set_vpp = collie_set_vpp, .exit = collie_flash_exit,