Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp1619745pxb; Mon, 11 Oct 2021 09:36:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+teieWmfIAYpJHhe6Lw7/7ThT9IUabMgfDwu7HIm78YQ/oIStRH4ecgCdSJ2m6yh7xa/m X-Received: by 2002:a05:6402:90c:: with SMTP id g12mr3493108edz.140.1633970204461; Mon, 11 Oct 2021 09:36:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633970204; cv=none; d=google.com; s=arc-20160816; b=K43IbPpwLRickQDyTbtyRGta3Ln0/HLkcsndVcJsj188Ye6ylkSrP3jcTdrJXASEOW 5cIRpLudgy80cbPl/DyzagbUdEF9vBtGss9hEu8hD/7QAF69Nh2CVUYDPJCNpGWpvvKo MiADfo1JaKYt76i7X3TLmuFNhA7qrehkCnfDIz+ZjpTTch88HVlPJPmcySVX2cGeHzns n0obq80N9MDioLBlVyLgwBOg+PSMstWH/+JNjW8O5fTFaHbr2IpDJi+SoTEZ8ZW9NLHF jDzzHa5hi1FLIK1Hx07I3PVKWwdFssiHrAcY7IFWaG4n+qkheWRVZzsouYLmV2/v51eY Q+4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1cbl9KE5PLlEKUDYROyT6vHMMlJjQGQMglumGupkTv0=; b=fH2VvXsQFbnMJQhc3MNCG3OUQFjKiz4WFXcBN67JQMUMCCHB4RRj7RacUnfqz1HvLX rUwJrKor9EXr0QsiXKUfhND4vZ6732JyutvYAWOA4hGfs1i7pbGKQp69XmOuexJuLmHP mnF5vkr9SdBrDd7JFy2qGbO7T2riHvHx7jtbHTNx5EByi934LlkWuxag3M9oLmi0fCRX mVKlD44++cK2XjbcRPowuOsTg3NB4puwvmolyrpRc7MkVcryLQolGMeN8k/G6FL/33xe 22y7CqwX5I+TDD6do8f4eYq//7Ls3/2IZ+/KLjqIT53KIS2mXKMKILPzhphkY4n3AT20 b6JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2vL9ThDN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o16si5411677edi.503.2021.10.11.09.36.19; Mon, 11 Oct 2021 09:36:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=2vL9ThDN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241171AbhJKOM3 (ORCPT + 99 others); Mon, 11 Oct 2021 10:12:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:33628 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242992AbhJKOJO (ORCPT ); Mon, 11 Oct 2021 10:09:14 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8D93F610F8; Mon, 11 Oct 2021 14:01:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960908; bh=FT1gXPshyOhotkOXSnjWFTWPuNGK6o07X5WDtS0la5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2vL9ThDNwgtNYiho1NbYFAwsq04H2QbX6fNXPAWqJ9Xysqhn9oCFZjlelXV+epg63 wzyJgbAG0diZNxppBdTqdOhOcVuG2ogB8JLVBnvbHY8l5Iq4olYj+3FhzZtr+o0JPc h51b4vkTlp3jeIShsGqniGV8bIw3wG6Sm7BjaY9A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Haibo Chen , Shawn Guo , Sasha Levin Subject: [PATCH 5.14 077/151] arm64: dts: imx8: change the spi-nor tx Date: Mon, 11 Oct 2021 15:45:49 +0200 Message-Id: <20211011134520.337008926@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haibo Chen [ Upstream commit 04aa946d57b20c40e541fb4ba2bcb390a22f404c ] Before commit 0e30f47232ab5 ("mtd: spi-nor: add support for DTR protocol"), for all PP command, it only support 1-1-1 mode, no matter the tx setting in dts. But after the upper commit, the logic change. It will choose the best mode(fastest mode) which flash device and spi-nor host controller both support. qspi and fspi host controller do not support read 1-4-4 mode. so need to set the tx to 1, let the common code finally select read 1-1-4 mode. Signed-off-by: Haibo Chen Fixes: 0e30f47232ab ("mtd: spi-nor: add support for DTR protocol") Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 2 +- arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi | 2 +- arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 2 ++ arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi index 988f8ab679ad..40f5e7a3b064 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi @@ -91,7 +91,7 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <80000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts index 4e2820d19244..a2b24d4d4e3e 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-evk.dts @@ -48,7 +48,7 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <80000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi index 54eaf3d6055b..3b2d627a0342 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi @@ -101,7 +101,7 @@ #size-cells = <1>; compatible = "jedec,spi-nor"; spi-max-frequency = <80000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi index aa78e0d8c72b..fc178eebf8aa 100644 --- a/arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-phycore-som.dtsi @@ -74,7 +74,7 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <80000000>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts index 4d2035e3dd7c..4886f3e31587 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts @@ -337,6 +337,8 @@ #size-cells = <1>; compatible = "micron,n25q256a", "jedec,spi-nor"; spi-max-frequency = <29000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <4>; }; }; diff --git a/arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts b/arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts index f593e4ff62e1..564746d5000d 100644 --- a/arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts +++ b/arch/arm64/boot/dts/freescale/imx8mq-kontron-pitx-imx8m.dts @@ -281,7 +281,7 @@ #address-cells = <1>; #size-cells = <1>; reg = <0>; - spi-tx-bus-width = <4>; + spi-tx-bus-width = <1>; spi-rx-bus-width = <4>; m25p,fast-read; spi-max-frequency = <50000000>; -- 2.33.0