From patchwork Tue Jun 3 21:29:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Adami X-Patchwork-Id: 4291071 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D869C9F326 for ; Tue, 3 Jun 2014 21:32:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 451242026C for ; Tue, 3 Jun 2014 21:32:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F11020260 for ; Tue, 3 Jun 2014 21:32:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WrwHB-0003Ba-0K; Tue, 03 Jun 2014 21:29:45 +0000 Received: from mail-wi0-x230.google.com ([2a00:1450:400c:c05::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WrwH5-00038b-Av for linux-arm-kernel@lists.infradead.org; Tue, 03 Jun 2014 21:29:39 +0000 Received: by mail-wi0-f176.google.com with SMTP id n15so7277391wiw.15 for ; Tue, 03 Jun 2014 14:29:17 -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:in-reply-to:references; bh=6ujHYsuCATXxzAayOyE8g5jNECg8QI0m0qe7gnPYl9I=; b=q3CT9bT8PUXztFr1sTZfYrejMXJEMQzvA5L7l0IlssG+WWetZDK6FF9i45b0DLnkMM 2nHguvT4NiybDbtar6PCMYSaP/dmM9ydx3I7hkfyHQ/hvlj8KMnNgP0flWd3C/wBERNv 091Eq4xzvDYRPNlv75ijfKLWq9nVvRIwzFsG2Jz6o1LPmAuaMFNsrw5N+sR9lcOzScuW enI3ZxBHA7Br1l6SDPcnwhuNlHN+dDyzqgPEwOu9LyjRrG2D+xBq0wa9U4q4KZvMEsUk 3zp5dlDnAHdbm7f8Vo0eLblvSVtIUcILSzMT6kgJ46LMnFOgBC/BTeFQ3+ZgKkLR21P8 AvkQ== X-Received: by 10.14.198.197 with SMTP id v45mr1721571een.14.1401830957091; Tue, 03 Jun 2014 14:29:17 -0700 (PDT) Received: from mizar.208.67.220.220 (host73-90-dynamic.180-80-r.retail.telecomitalia.it. [80.180.90.73]) by mx.google.com with ESMTPSA id l49sm357742eef.27.2014.06.03.14.29.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Jun 2014 14:29:16 -0700 (PDT) From: Andrea Adami To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] arm: sa1100: collie: revert back to cfi_probe Date: Tue, 3 Jun 2014 23:29:00 +0200 Message-Id: <1401830941-17086-2-git-send-email-andrea.adami@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1401830941-17086-1-git-send-email-andrea.adami@gmail.com> References: <1401830941-17086-1-git-send-email-andrea.adami@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140603_142939_534412_6592BF63 X-CRM114-Status: GOOD ( 13.02 ) X-Spam-Score: -0.1 (/) Cc: Dmitry Eremin-Solenikov , Olof Johansson , Russell King , linux-kernel@vger.kernel.org, Andrea Adami 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=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 Reverts commit d26b17edafc45187c30cae134a5e5429d58ad676 ARM: sa1100: collie.c: fall back to jedec_probe flash detection Unfortunately the detection was challenged on the defective unit used for tests: one of the NOR chips did not respond to the CFI query. Moreover that bad device needed extra delays on erase-suspend/resume cycles. Tested personally on 3 different units and with feedback of two other users. 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 f9874ba..f26aeea 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -356,7 +356,7 @@ static void collie_flash_exit(void) } static struct flash_platform_data collie_flash_data = { - .map_name = "jedec_probe", + .map_name = "cfi_probe", .init = collie_flash_init, .set_vpp = collie_set_vpp, .exit = collie_flash_exit,