Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp673834pxb; Tue, 5 Apr 2022 18:14:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUVAlrgz4HDyHxcCvXDgBAcY98Q/pnuSo4dvr3eZ9JBBZ5Vfsd2RbNopUs3f+uTM5t3HV/ X-Received: by 2002:a17:906:5d12:b0:6e7:eb3a:eae5 with SMTP id g18-20020a1709065d1200b006e7eb3aeae5mr6077878ejt.644.1649207644302; Tue, 05 Apr 2022 18:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649207644; cv=none; d=google.com; s=arc-20160816; b=qy48Jjoe2dh2jqpgXHucFqO9WPIxaXoNcyMVFGAyum4L0SxXepUurvWcuVVnv8A67b HvZxI05K6zGEFSHH4eXTqwPm1/ySHDqldLxG9MPcXThJg+cNbIscSPWM/ZBV0Z048UMw Qiwxpipu1jUdTgy4+Z6QYym+sekJUVyX/JAQtQwcaW8BDrYMjLw+sEdYmbQgL91s2ONZ +RvsBH7iBUGAjOd+kvbjU6IJDI+yHjgK07w5n+tTEGbplhih6xOUwzrlmKYK3xI8eZKU Rs+eRnMy6u121x6vHrYbZ5XQmAhjtojM65WQa8z4NndaZ/0EtElLD9YvOA7zoZo2SqjP us5g== 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=oQ54IegM+TFRoZR3BI0Sg9REdglpgjBJtbn6jiKzMFk=; b=kvagEI9GakXvG4QPvirZoevBjzK9xjD7Rp7Od18hDej68MWVX2LMYDs208kiUtu/4m ArB3ovU1tCB4CPfEed6v2hfWL3HN9/MX3JQiNfVPLVNoEp/1hyoAOzOp8TVxS91Zp2hi 40BQnCXnd9dsMXaIbP0IslR4zolfdYhebIO1CYRp5kO6hSfAkOXIn2yP8C07xdQiGLnr NeuHfmI1BHrK4NJwFOKHsNGdk2UH3oXK0EYE0zn9eoh22/l2YeBjQ0DslWPi5YjSrXah o37E39kWD3pJ9iA6UzezPSyIkcnfB9bGOClCmG3MkkmkWrJ+/dHSc2N0LAmtEdJJ4Mlz wU6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zx5a8AOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s18-20020a056402521200b00418fb7cf87bsi11546341edd.139.2022.04.05.18.13.37; Tue, 05 Apr 2022 18:14:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zx5a8AOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S1351968AbiDELFg (ORCPT + 99 others); Tue, 5 Apr 2022 07:05:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237569AbiDEImt (ORCPT ); Tue, 5 Apr 2022 04:42:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DEC2140CB; Tue, 5 Apr 2022 01:35:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 009F8B81B92; Tue, 5 Apr 2022 08:35:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60D93C385A1; Tue, 5 Apr 2022 08:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649147718; bh=8QYO2AMThjA538+hdzVx+um+o/IV7h3ewMsPaWlZaLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zx5a8AOdIqytBjCCxmeyhL8QRSVd9Htf5rwRQQThW4QMHUQLK9CUcGczdTO297EXA F+tNEA+Rkpks5C4rgFBpDsxxAa3IuJXVnP8IYX+KVNr656W2gEwq7frcwIbGT6kf3o t4NGMLibIdAXxtvKXxhXMFE7bWK2irpyq3W3d9LI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Niklas Cassel , Damien Le Moal , Palmer Dabbelt Subject: [PATCH 5.16 0097/1017] riscv: dts: canaan: Fix SPI3 bus width Date: Tue, 5 Apr 2022 09:16:50 +0200 Message-Id: <20220405070357.075910805@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel commit 6846d656106add3aeefcd6eda0dc885787deaa6e upstream. According to the K210 Standalone SDK Programming guide: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf Section 15.4.3.3: SPI0 and SPI1 supports: standard, dual, quad and octal transfers. SPI3 supports: standard, dual and quad transfers (octal is not supported). In order to support quad transfers (Quad SPI), SPI3 must have four IO wires connected to the SPI flash. Update the device tree to specify the correct bus width. Tested on maix bit, maix dock and maixduino, which all have the same SPI flash (gd25lq128d) connected to SPI3. maix go is untested, but it would not make sense for this k210 board to be designed differently. Signed-off-by: Niklas Cassel Reviewed-by: Damien Le Moal Fixes: 8f5b0e79f3e5 ("riscv: Add SiPeed MAIXDUINO board device tree") Fixes: 8194f08bda18 ("riscv: Add SiPeed MAIX GO board device tree") Fixes: a40f920964c4 ("riscv: Add SiPeed MAIX DOCK board device tree") Fixes: 97c279bcf813 ("riscv: Add SiPeed MAIX BiT board device tree") Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt Signed-off-by: Greg Kroah-Hartman --- arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maix_go.dts | 2 ++ arch/riscv/boot/dts/canaan/sipeed_maixduino.dts | 2 ++ 4 files changed, 8 insertions(+) --- a/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_bit.dts @@ -203,6 +203,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; }; --- a/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_dock.dts @@ -205,6 +205,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; }; --- a/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maix_go.dts @@ -213,6 +213,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; }; --- a/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts +++ b/arch/riscv/boot/dts/canaan/sipeed_maixduino.dts @@ -178,6 +178,8 @@ compatible = "jedec,spi-nor"; reg = <0>; spi-max-frequency = <50000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; m25p,fast-read; broken-flash-reset; };