From patchwork Thu Jul 5 11:15:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frieder Schrempf X-Patchwork-Id: 939866 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=exceet.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mv9itWm0"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=infradead.org header.i=@infradead.org header.b="gb3XI3uI"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=as-electronics.de header.i=@as-electronics.de header.b="bPcvTIoJ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41LwNM3PD7z9s29 for ; Thu, 5 Jul 2018 21:18:59 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=G4uMcQCAmdKbbrEd0GTehMN/yhAOLMVvUiupsZap+2o=; b=mv9itWm0RN+d6CcsSWLGLuuK8W jOo1QDxx0WU1F6VBOcs0HBHOr4X0GqF/n01FyP1P1aDV+Bs59HIzw2JM9EVPGjngMmiWtdFG9IgBH /0brEUgFAMvWtqctGHpxTqUV8ytiK+BUr87FH2TXaz4pOt+99yjVujYE3N2TEcoZfMtJyllShCkwM 67BFO8id3JAbAcYl6D5mrs7QIN/oj+/UH/YDif2Fe4OUKe8wsmbDSXgyiTrUy47yFWXGt3KRIHQwM PfaoC1U2c0oIMzi2hKJazb47cPwbtNBbbzZTVFWimSevlQLd+UET86aDdOixr5M/OiHf1elWAnG1P MRlYdYSA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fb2Hh-0001eK-KK; Thu, 05 Jul 2018 11:18:49 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fb2He-0001dP-0d; Thu, 05 Jul 2018 11:18:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6nqxNFfetm6z29BbZ2XLYltD3qUIISTDCljCp98hv6I=; b=gb3XI3uItNg+6mxQCsmoj/3Ol umeJCcjTg0jX++/UAOY4q85quIqP5ehWYTWzCm1OF4olQJkntCfoUvKxvPWzWZsl2SuMHVHoeoMt+ 6z/lQ0nuoCMNY7uJ9UV6ZAr6CMECmiXnY3NO8Yo8kqvDANU4oW3qDmnYIVpPFRoi7ozkF1OXIez0A obCNacDPVfRHrXHlvMSDDQ0zFeUUYkojiOxA6OvPzhe86dSvQlWDX/1TnLazzqyl/BSfjiZaOIk+N KU8oZFwapqmiXCnjJV0R5W/sWC9+7bCvJPdWXqNNCcOOFXSnIqPFeMWDN4JVjnYMkrCG7ChfIyE99 aRI29P4ww==; Received: from mo6-p05-ob.smtp.rzone.de ([2a01:238:20a:202:5305::10]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fb2Hb-0006IE-Hx; Thu, 05 Jul 2018 11:18:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1530789508; s=strato-dkim-0002; d=as-electronics.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=6nqxNFfetm6z29BbZ2XLYltD3qUIISTDCljCp98hv6I=; b=bPcvTIoJ4ONRglDnL5i0sUuU2tRb7FwqNh21ksw0XSjk9PDikEtN0jIWWyeuM6+ayF fY8S1qNoVM0FwPIynvL94Rz6fzX5GibappxmSopwzhLBLntWUTIEHX8AE5gR/QkN1d3M q56ZMW8BdxUrhUJyu5MfnFILur0cI83/hAFsV7RERU2t9kR1qST1TenFm7nm8NIDVAdy zWPa/FG/ReRgKK2zrbzHBb7262D8Aurzjx32MLmz8CGffQJOEDKO7WWaPHEH2zH3gb/q OvKuJNYV9jYgCEknI6Szg7PbiSIGbPSYkvWRuQ3263wc3tRIE/uZR9TMXCMzrWhJB6SO 2CHQ== X-RZG-AUTH: ":LX8JdEmkW/4tAFwMkcNJIloh1hrA5u3owhPk7bdT5Fx22AatU+eLaHfutoZdl+X9BETxn4/4+IVqx+daE87UU5bgm7XHzClQnm8VxHglxo5wj3H1fls=" X-RZG-CLASS-ID: mo05 Received: from fs-work.fritz.box by smtp.strato.de (RZmta 43.12 AUTH) with ESMTPSA id a0925bu65BHq4iE (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Thu, 5 Jul 2018 13:17:52 +0200 (CEST) From: Frieder Schrempf To: linux-mtd@lists.infradead.org, boris.brezillon@bootlin.com, linux-spi@vger.kernel.org Subject: [PATCH v2 06/12] ARM: dts: Reflect change of FSL QSPI driver and remove unused properties Date: Thu, 5 Jul 2018 13:15:02 +0200 Message-Id: <1530789310-16254-7-git-send-email-frieder.schrempf@exceet.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530789310-16254-1-git-send-email-frieder.schrempf@exceet.de> References: <1530789310-16254-1-git-send-email-frieder.schrempf@exceet.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180705_071843_729713_50288EE5 X-CRM114-Status: GOOD ( 13.77 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.1 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a01:238:20a:202:5305:0:0:10 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, yogeshnarayan.gaur@nxp.com, Rob Herring , richard@nod.at, Sascha Hauer , prabhakar.kushwaha@nxp.com, Frieder Schrempf , shawnguo@kernel.org, linux-kernel@vger.kernel.org, marek.vasut@gmail.com, han.xu@nxp.com, broonie@kernel.org, NXP Linux Team , Pengutronix Kernel Team , miquel.raynal@bootlin.com, fabio.estevam@nxp.com, david.wolfe@nxp.com, computersforpeace@gmail.com, dwmw2@infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The FSL QSPI driver was moved to the SPI framework and it now acts as a SPI controller. Therefore the subnodes need to set spi-[rx/tx]-bus-width = <4>, so quad mode is used just as before. Also the properties 'bus-num', 'fsl,spi-num-chipselects' and 'fsl,spi-flash-chipselects' were never read by the driver and can be removed. The 'reg' properties are adjusted to reflect the what bus and chipselect the flash is connected to, as the new driver needs this information. The property 'fsl,qspi-has-second-chip' is not needed anymore and will be removed after the old driver was disabled to avoid breaking ls1021a-moxa-uc-8410a.dts. Signed-off-by: Frieder Schrempf --- arch/arm/boot/dts/imx6sx-sdb-reva.dts | 8 ++++++-- arch/arm/boot/dts/imx6sx-sdb.dts | 8 ++++++-- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 ++ arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 5 ++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts index e3533e7..1a6f680 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts @@ -131,13 +131,17 @@ #size-cells = <1>; compatible = "spansion,s25fl128s", "jedec,spi-nor"; spi-max-frequency = <66000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; }; - flash1: s25fl128s@1 { - reg = <1>; + flash1: s25fl128s@2 { + reg = <2>; #address-cells = <1>; #size-cells = <1>; compatible = "spansion,s25fl128s", "jedec,spi-nor"; spi-max-frequency = <66000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; }; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 6dd9beb..9acfda8 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -117,15 +117,19 @@ #size-cells = <1>; compatible = "micron,n25q256a", "jedec,spi-nor"; spi-max-frequency = <29000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; reg = <0>; }; - flash1: n25q256a@1 { + flash1: n25q256a@2 { #address-cells = <1>; #size-cells = <1>; compatible = "micron,n25q256a", "jedec,spi-nor"; spi-max-frequency = <29000000>; - reg = <1>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; + reg = <2>; }; }; diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index 32a0723..c2c9a2a 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -176,6 +176,8 @@ #size-cells = <1>; compatible = "micron,n25q256a"; spi-max-frequency = <29000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; reg = <0>; }; }; diff --git a/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts b/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts index d01f64b..6a83f30 100644 --- a/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts +++ b/arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts @@ -203,9 +203,6 @@ }; &qspi { - bus-num = <0>; - fsl,spi-num-chipselects = <2>; - fsl,spi-flash-chipselects = <0>; fsl,qspi-has-second-chip; status = "okay"; @@ -214,6 +211,8 @@ #address-cells = <1>; #size-cells = <1>; spi-max-frequency = <20000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; reg = <0>; partitions@0 {