From patchwork Tue Jan 26 11:12:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 60440 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1891721lbb; Tue, 26 Jan 2016 03:17:33 -0800 (PST) X-Received: by 10.98.11.209 with SMTP id 78mr33014137pfl.92.1453807052905; Tue, 26 Jan 2016 03:17:32 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ky14si1455254pab.41.2016.01.26.03.17.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 03:17:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-mtd-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-mtd-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org 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 1aO1Zo-0003dN-Uj; Tue, 26 Jan 2016 11:14:24 +0000 Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aO1Ye-0002Sg-U9 for linux-mtd@lists.infradead.org; Tue, 26 Jan 2016 11:13:16 +0000 Received: by mail-lf0-x233.google.com with SMTP id h129so103434943lfh.3 for ; Tue, 26 Jan 2016 03:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=o9Ne3ZOhro0dUccbuLCeqA4/qYgInUTCN4FH1jdignU=; b=YY1KRl/sj6P7E9trlKmG6Zxipr0SvaLMjFt81yO9eloqsDsk9fTI9lIBmhOlo/FKyR XkEQ+jN2pd+5A0T+GexaaQk0CTpIedAlmrhX6WHiPdS6y35L0L6qtMPIXp5OKdaTPMKz oEimHK+Ey5AomcnppY/p0yx7nYSUA+r+2V0ZA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o9Ne3ZOhro0dUccbuLCeqA4/qYgInUTCN4FH1jdignU=; b=QqLDRIqvCm2ZXxCNtO7RZSUtNfth0dqJwl8vmBSzhjhTmbjAnUegoD+GCW9nuDRZBY OnqpbS215jEwxktR//d6lhGx39qTgdaM315toFnyE3yLqSVIvf2pvju/xBI1PVPwSslx EViAEJwr308aiGkFgJ6x2tAfnLzaVanR3MSOrsOxIDcuz0W2rDgqjXxsrNL98Mzr9uts LCshkiXBQHUlVI3/zwIdDt6mO4LGIMrYGpvOAhd0r3xnq7F7y12ZIAG3TSad18uyH8lf 12HAlzvwjZ+/WDf8lSFVIoS7iVxNTJhS1VerCVCKg/88BfztZ8aT6Wl1Y6FlCxSSjsQ9 RR3g== X-Gm-Message-State: AG10YOQHkeBcLv7KIO6DUSJyHX9Dd5OIohm9iri0pcsE3UlTKxXPhK+K9qOaaeQw9ZCNbXqv X-Received: by 10.25.138.2 with SMTP id m2mr8646756lfd.59.1453806771214; Tue, 26 Jan 2016 03:12:51 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id i192sm119832lfb.14.2016.01.26.03.12.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jan 2016 03:12:50 -0800 (PST) From: Linus Walleij To: David Woodhouse , Brian Norris , linux-mtd@lists.infradead.org Subject: [PATCH 6/6] ARM: realview: fix up PB11MP flash compat strings Date: Tue, 26 Jan 2016 12:12:05 +0100 Message-Id: <1453806725-4880-7-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1453806725-4880-1-git-send-email-linus.walleij@linaro.org> References: <1453806725-4880-1-git-send-email-linus.walleij@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160126_031313_528093_CC8AD49F X-CRM114-Status: GOOD ( 14.11 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:233 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , Arnd Bergmann , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+patch=linaro.org@lists.infradead.org The two flash memories in the PB11MPCore have their VPP/WP lines controlled from the system controller add-on in the MTD subsystem. "arm,versatile-flash" is the first compatible string to use to get the right support. Cc: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.4.3 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts index da755c9851a7..63d6a051839f 100644 --- a/arch/arm/boot/dts/arm-realview-pb11mp.dts +++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts @@ -230,14 +230,14 @@ flash0@40000000 { /* 2 * 32MiB NOR Flash memory */ - compatible = "arm,vexpress-flash", "cfi-flash"; + compatible = "arm,versatile-flash", "cfi-flash"; reg = <0x40000000 0x04000000>; bank-width = <4>; }; flash1@44000000 { // 2 * 32MiB NOR Flash memory - compatible = "arm,vexpress-flash", "cfi-flash"; + compatible = "arm,versatile-flash", "cfi-flash"; reg = <0x44000000 0x04000000>; bank-width = <4>; };