Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5380727imu; Tue, 13 Nov 2018 05:48:05 -0800 (PST) X-Google-Smtp-Source: AJdET5fu6FT9gvY2lMztdrZghMbJzDaxhUYKmMz+4BC2Ims7QXSlHVEVPjSamRmowlcQ2um5juMO X-Received: by 2002:a63:fd12:: with SMTP id d18-v6mr4913915pgh.164.1542116885436; Tue, 13 Nov 2018 05:48:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542116885; cv=none; d=google.com; s=arc-20160816; b=gdS6e2TZD9WvEIEPRe4ke98xz0w9bY6IEYRpfLfjroGqIzhWDX9Jvy7Gw7v4Kuqgod TWkXmSlzEbEe3sKX+ljquqfUD9wupLmw/8pMaYyUpIQtw8uIcmAlVjvQ6u1uysSo91QR 3qrpmwDiCtdTVpuEDiUwrzJ7oPcZFkEHNuLRUAdAM1k89w00BDcct8d1JQ8GiekUdz6O cCY/vqdoMpk9B7JmU4J5pKbqQ1qrKgUt9z3Q/zqTlJoxdbmiq/9PcCPVVWGn74SlnNs7 EnQXgSHwmF9EApGw1yWG9Bc8d6Ph0g6KeHC3sPV3a7MJ12EerSI7Vjpveuq5ISfGGpFh +9+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :content-language:accept-language:in-reply-to:references:message-id :date:thread-index:thread-topic:subject:cc:to:from; bh=8kCJtv/9vwFVhyy2QeBMDj/XtiBkRrfxRBl3xQPW3os=; b=g7UBkzvJoWZd0VrtLbhr+VZROd3/VJA5dFvgeMheiAzYwZLB5IzsBjXUGU4v6omskp bF7tyAazkOLBwNgsjUVKZyccVnJnkZrbOS0t1LQXm4QwBhTHNo9wPwxOqW5Xp3C4x6Qc tyDEPOMxAOTPbR/enxZKaJupu0zbCGcrbbNe1lgVorQPNqywauwno6duk1tWMaDH+IIO 6ruA7T7haZX1Bssh+wjyeeHstDe2JSFImUsrIJpmbzfFOK7Mxwm8wLRcBGYOC2exDkJN 6TPBAOv8EMiOrWTJXF6B44FU9ZHepbRg1PbP+SGPMMgQRp7tE5Sx7MJ5exbFCeor5u5M CdSw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a6-v6si18704260pgc.578.2018.11.13.05.47.48; Tue, 13 Nov 2018 05:48:05 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733153AbeKMXpc convert rfc822-to-8bit (ORCPT + 99 others); Tue, 13 Nov 2018 18:45:32 -0500 Received: from skedge03.snt-world.com ([91.208.41.68]:45006 "EHLO skedge03.snt-world.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733053AbeKMXpc (ORCPT ); Tue, 13 Nov 2018 18:45:32 -0500 Received: from sntmail10s.snt-is.com (unknown [10.203.32.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by skedge03.snt-world.com (Postfix) with ESMTPS id 343404FE847B; Tue, 13 Nov 2018 14:47:17 +0100 (CET) Received: from sntmail11s.snt-is.com (10.203.32.181) by sntmail10s.snt-is.com (10.203.32.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1466.3; Tue, 13 Nov 2018 14:47:16 +0100 Received: from sntmail11s.snt-is.com ([fe80::b972:ad22:ada5:7c6a]) by sntmail11s.snt-is.com ([fe80::b972:ad22:ada5:7c6a%4]) with mapi id 15.01.1466.003; Tue, 13 Nov 2018 14:47:16 +0100 From: Schrempf Frieder To: "linux-mtd@lists.infradead.org" , "boris.brezillon@bootlin.com" , "linux-spi@vger.kernel.org" , Shawn Guo , Sascha Hauer , "Pengutronix Kernel Team" , Fabio Estevam , NXP Linux Team , Rob Herring , "Mark Rutland" , Li Yang CC: "dwmw2@infradead.org" , "computersforpeace@gmail.com" , "marek.vasut@gmail.com" , "richard@nod.at" , "miquel.raynal@bootlin.com" , "broonie@kernel.org" , "david.wolfe@nxp.com" , "prabhakar.kushwaha@nxp.com" , "yogeshnarayan.gaur@nxp.com" , "han.xu@nxp.com" , Schrempf Frieder , "linux-arm-kernel@lists.infradead.org" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v5 1/9] ARM: dts: Reflect change of FSL QSPI driver and remove unused properties Thread-Topic: [PATCH v5 1/9] ARM: dts: Reflect change of FSL QSPI driver and remove unused properties Thread-Index: AQHUe1djtIXqLsyNOEyeM/lr4eMBxA== Date: Tue, 13 Nov 2018 13:47:16 +0000 Message-ID: <1542116782-13118-2-git-send-email-frieder.schrempf@kontron.de> References: <1542116782-13118-1-git-send-email-frieder.schrempf@kontron.de> In-Reply-To: <1542116782-13118-1-git-send-email-frieder.schrempf@kontron.de> Accept-Language: de-DE, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [172.25.9.43] x-c2processedorg: 51b406b7-48a2-4d03-b652-521f56ac89f3 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-SnT-MailScanner-Information: Please contact the ISP for more information X-SnT-MailScanner-ID: 343404FE847B.A94FD X-SnT-MailScanner: Found to be clean X-SnT-MailScanner-SpamCheck: X-SnT-MailScanner-From: frieder.schrempf@kontron.de X-SnT-MailScanner-To: boris.brezillon@bootlin.com, broonie@kernel.org, computersforpeace@gmail.com, david.wolfe@nxp.com, devicetree@vger.kernel.org, dwmw2@infradead.org, fabio.estevam@nxp.com, han.xu@nxp.com, kernel@pengutronix.de, leoyang.li@nxp.com, linux-arm-kernel@lists.infradead.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org, linux-spi@vger.kernel.org, marek.vasut@gmail.com, mark.rutland@arm.com, miquel.raynal@bootlin.com, prabhakar.kushwaha@nxp.com, richard@nod.at, robh+dt@kernel.org, s.hauer@pengutronix.de, shawnguo@kernel.org, yogeshnarayan.gaur@nxp.com X-Spam-Status: No Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The FSL QSPI driver will be moved to the SPI framework and it then 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 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 9cc6ff2..9997156 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-reva.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts @@ -132,13 +132,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 { -- 2.7.4