From patchwork Fri Jul 28 12:05:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1814252 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=kMDV9/Yd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC5vK3zy5z1ybX for ; Fri, 28 Jul 2023 22:06:05 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C20C5868D6; Fri, 28 Jul 2023 14:05:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="kMDV9/Yd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A13DE8634D; Fri, 28 Jul 2023 14:05:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 Received: from wfbtzhsv.outbound-mail.sendgrid.net (wfbtzhsv.outbound-mail.sendgrid.net [159.183.224.104]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BEE7A863B0 for ; Fri, 28 Jul 2023 14:05:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=9bjQVlJtFih7RCnfRjsGlZU97hQJmuRmvC8EkkE9rvc=; b=kMDV9/YdN6l2EOpMXl2Kc3R76Q6iinass75bCLdjsFydq1f3143JjxZzVvsZRpm3pyhw hqEg0fJTnu1AS7F4g/eM7KJgWvlQsOC5qdFOFKf055UZkJFmFC2Br88iRLcS+ulM+IP8j+ HoekpDUlzLV8eaSr6K1MA1NPeO7IJ9wVGw/7zQbQiUBK1INlslvKeAjQGrF9S/zaLNdZAb l7pLl2xv7mmBoqRfu99evM3JuxutGXuLrPLMGfqHcX4fFjyzw0+DgT5krR3jKWqcNGUXFY Kd06pcMdwIy6X4oto/Eo2TMQxPeMbq2TrJgCyuzSMwK3Zpb41hfjpWoR4JgKaSqg== Received: by filterdrecv-77869f68cc-xxcxl with SMTP id filterdrecv-77869f68cc-xxcxl-1-64C3AF14-52 2023-07-28 12:05:40.615180986 +0000 UTC m=+6784164.398185526 Received: from bionic.localdomain (unknown) by geopod-ismtpd-5 (SG) with ESMTP id xgIWcmQiSy64XSSWM0JVCw Fri, 28 Jul 2023 12:05:40.389 +0000 (UTC) From: Jonas Karlman Subject: [PATCH v2 1/2] rockchip: rk3568-rock-3a: Fix SPI Flash alias Date: Fri, 28 Jul 2023 12:05:40 +0000 (UTC) Message-ID: <20230728120537.1739215-2-jonas@kwiboo.se> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728120537.1739215-1-jonas@kwiboo.se> References: <20230728120537.1739215-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h9Bdew0YtZoD9YnRiCDqJV1nekjdXPGNGg2bFdLBn3Nn3yFNw6w+nD7k1kxpaLKsgXCQFVLH+pdh+lhl3aZYjcu/pV267v6WE7r96+CnkwgVQeTGeHdXtzdmjcW4JhH3mUO0OzHi2hfRfRdnvMD5POUX0BXwOBd7A4Gu0ya7NIPB To: Kever Yang , Simon Glass , Philipp Tomsich , Akash Gajjar , Jonas Karlman Cc: Eugen Hristev , u-boot@lists.denx.de X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The commit 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash") enabled SPI flash support by overriding the spi0 alias. Correct this by adding a new spi4 alias in rk356x-u-boot.dtsi and SF_DEFAULT_BUS=4 and SPL_DM_SEQ_ALIAS=y in defconfig. Also enabled support for parsing and auto discovery of parameters, SFDP. Fixes: 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- v2: - Rebase on u-boot-rockchip/master - Collect r-b tag arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 4 ---- arch/arm/dts/rk356x-u-boot.dtsi | 1 + configs/rock-3a-rk3568_defconfig | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi index e4f1637500f4..68d5935348bb 100644 --- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi +++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi @@ -7,10 +7,6 @@ #include "rk356x-u-boot.dtsi" / { - aliases { - spi0 = &sfc; - }; - chosen { stdout-path = &uart2; }; diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 5644f78ec774..d21b18205220 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -9,6 +9,7 @@ aliases { mmc0 = &sdhci; mmc1 = &sdmmc0; + spi4 = &sfc; }; chosen { diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig index 8e3fe0a25e1d..42fd47eb57be 100644 --- a/configs/rock-3a-rk3568_defconfig +++ b/configs/rock-3a-rk3568_defconfig @@ -57,6 +57,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y CONFIG_SCSI_AHCI=y @@ -71,6 +72,8 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=4 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_XTX=y CONFIG_ETH_DESIGNWARE=y From patchwork Fri Jul 28 12:05:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1814253 X-Patchwork-Delegate: ykai007@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.a=rsa-sha256 header.s=s1 header.b=ci1/bxip; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RC5vX1mTpz1ybX for ; Fri, 28 Jul 2023 22:06:16 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1804C868B5; Fri, 28 Jul 2023 14:06:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kwiboo.se header.i=@kwiboo.se header.b="ci1/bxip"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 62B70868D1; Fri, 28 Jul 2023 14:05:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from s.wrqvwxzv.outbound-mail.sendgrid.net (s.wrqvwxzv.outbound-mail.sendgrid.net [149.72.154.232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 48AE3868CF for ; Fri, 28 Jul 2023 14:05:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kwiboo.se Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=bounces+31435339-7456-u-boot=lists.denx.de@em2124.kwiboo.se DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kwiboo.se; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type:cc:content-type:from:subject:to; s=s1; bh=R1YempNSVbQck5vTRM4zmpKm7EewyfgETMYDXMLeYiE=; b=ci1/bxipsSu0mstgYE8MmQXri5bT/eH4MjforbAbTyR1r0qFJplmcT6CSLdXZLP+LDLs p/Am2UL+rr6l59+I2KeqmmVQH5NTp7qjVJnTP4Mpj5I4T1P3COhaygKpo6PhvAQQTwdlsO h214TPL3RkHXy/fpJLtrDQquYUvlhcOnJH+dZCThd6Z3I1dDExcqAv0ruXOVRqvEcnv9VI AnN9/hv0dqAcAJ1bJVIkWtq/8CaO4o1n0f7vKzve9YReyTfQ4PLSt0naBM6yrNKXKCzMGZ azkm1w3uU1eDetX+bz9HZO8pQyPNBXZLk3ldb+G0H/aEQO9Kq9yKN8jzsXahHUwA== Received: by filterdrecv-66949dbc98-kr5j5 with SMTP id filterdrecv-66949dbc98-kr5j5-1-64C3AF15-AA 2023-07-28 12:05:41.727753362 +0000 UTC m=+6783952.809020624 Received: from bionic.localdomain (unknown) by geopod-ismtpd-5 (SG) with ESMTP id xWvlk4BAQ5eRyJU0NkDT6w Fri, 28 Jul 2023 12:05:41.483 +0000 (UTC) From: Jonas Karlman Subject: [PATCH v2 2/2] rockchip: rk3588-rock-5b: Fix SPI Flash alias Date: Fri, 28 Jul 2023 12:05:41 +0000 (UTC) Message-ID: <20230728120537.1739215-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728120537.1739215-1-jonas@kwiboo.se> References: <20230728120537.1739215-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h4ICN4YyLbmhFVEOTNaokXrXQLnZ+o6znbJaXIvbOU5ASr65jHcuWcA9Mcxb/SW9+NibXJZnfmRMBcNyLDhIKtmIPqOw3No7uiKORo/oXdLK/Wvk7aUKOQt5Gm5knQku7zWUFc3BqvvOB89LU0NWl+DYGsLFm+JTp/x1h7veyq2b To: Kever Yang , Simon Glass , Philipp Tomsich , Eugen Hristev , Jonas Karlman Cc: Akash Gajjar , u-boot@lists.denx.de X-Entity-ID: P7KYpSJvGCELWjBME/J5tg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean The commit fd6e425be243 ("rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash") enabled SPI flash support by adding a spi0 alias. Correct this by adding spi0-spi5 aliases in rk3588s-u-boot.dtsi and SF_DEFAULT_BUS=5 and SPL_DM_SEQ_ALIAS=y in defconfig. Also enabled support for parsing and auto discovery of parameters, SFDP. Fixes: fd6e425be243 ("rockchip: rk3588-rock-5b: Enable boot from SPI NOR flash") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- v2: - Rebase on u-boot-rockchip/master - Collect r-b tag arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 1 - arch/arm/dts/rk3588s-u-boot.dtsi | 9 +++++++++ configs/rock5b-rk3588_defconfig | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi index 5a3292699640..549b242be0a0 100644 --- a/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +++ b/arch/arm/dts/rk3588-rock-5b-u-boot.dtsi @@ -12,7 +12,6 @@ / { aliases { mmc1 = &sdmmc; - spi0 = &sfc; }; chosen { diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi b/arch/arm/dts/rk3588s-u-boot.dtsi index acb1cfe20063..489c5edd6249 100644 --- a/arch/arm/dts/rk3588s-u-boot.dtsi +++ b/arch/arm/dts/rk3588s-u-boot.dtsi @@ -7,6 +7,15 @@ #include / { + aliases { + spi0 = &spi0; + spi1 = &spi1; + spi2 = &spi2; + spi3 = &spi3; + spi4 = &spi4; + spi5 = &sfc; + }; + dmc { compatible = "rockchip,rk3588-dmc"; bootph-all; diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig index 3976a6c0f05c..3fa65cbf9b07 100644 --- a/configs/rock5b-rk3588_defconfig +++ b/configs/rock5b-rk3588_defconfig @@ -60,6 +60,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_SPL_REGMAP=y CONFIG_SPL_SYSCON=y CONFIG_SPL_CLK=y @@ -73,6 +74,8 @@ CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_SF_DEFAULT_BUS=5 +CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPI_FLASH_XTX=y CONFIG_ETH_DESIGNWARE=y