From patchwork Sat Dec 7 15:39:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 3305081 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 4995C9F384 for ; Sat, 7 Dec 2013 15:41:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 704EC201F4 for ; Sat, 7 Dec 2013 15:41:41 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (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 33DA520295 for ; Sat, 7 Dec 2013 15:41:40 +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 1VpK0V-0006rZ-Sd; Sat, 07 Dec 2013 15:41:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpK0T-0008US-Gh; Sat, 07 Dec 2013 15:41:25 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VpK0Q-0008Te-Hc; Sat, 07 Dec 2013 15:41:23 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 2B5EE7F6; Sat, 7 Dec 2013 16:41:04 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (unknown [190.2.98.212]) by mail.free-electrons.com (Postfix) with ESMTPA id E13D17E9; Sat, 7 Dec 2013 16:41:00 +0100 (CET) From: Ezequiel Garcia To: , Subject: [PATCH] mtd: nand: pxa3xx: Disable "armada370-nand" compatible support Date: Sat, 7 Dec 2013 12:39:47 -0300 Message-Id: <1386430787-2962-1-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.8.1.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131207_104122_680774_995C96C7 X-CRM114-Status: UNSURE ( 8.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.4 (-) Cc: Thomas Petazzoni , Lior Amsalem , Jason Cooper , Andrew Lunn , =?UTF-8?q?Emilio=20L=C3=B3pez?= , Ezequiel Garcia , Gregory Clement , Brian Norris 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Currently the "armada370-nand" compatible support is not complete, and it was mistake to add it. Instead of completely removing the compatible, let's just disable it until all the needed infrastructure is in place. Cc: Emilio López Signed-off-by: Ezequiel Garcia --- The compatible was added in: commit c0f3b8643a6fa2461d70760ec49d21d2b031d611 Author: Ezequiel Garcia Date: Sat Aug 10 16:34:52 2013 -0300 mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string Which means the fix should be applied in v3.12 and v3.13. On Emilio's suggestion, I've opted for the disabling, given all the required support is already queued for v3.14. I'll push a patch removing the #if 0 on top of current l2-mtd.git. Brian: Do you think this is OK to be pushed now for v3.13? drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 3d143fe..2c5066f 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -333,10 +333,16 @@ static struct of_device_id pxa3xx_nand_dt_ids[] = { .compatible = "marvell,pxa3xx-nand", .data = (void *)PXA3XX_NAND_VARIANT_PXA, }, +/* + * Currently, the armada370 support is incomplete and can cause the + * system to crash. Disable it until all the infrastructure is in place. + */ +#if 0 { .compatible = "marvell,armada370-nand", .data = (void *)PXA3XX_NAND_VARIANT_ARMADA370, }, +#endif {} }; MODULE_DEVICE_TABLE(of, pxa3xx_nand_dt_ids);