From patchwork Tue Mar 14 00:38:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Karlman X-Patchwork-Id: 1756635 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=MOFbtH/J; 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 4PbF5T2tblz1yWp for ; Tue, 14 Mar 2023 11:39:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9918685DBD; Tue, 14 Mar 2023 01:38:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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="MOFbtH/J"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E797385C52; Tue, 14 Mar 2023 01:38:26 +0100 (CET) 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,UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.2 Received: from wrqvwxzv.outbound-mail.sendgrid.net (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 76BDB8587C for ; Tue, 14 Mar 2023 01:38:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject 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=mCwcPA/cEvhzLEN7FOmaDdTNLhGYApug8uI5UaxHcxc=; b=MOFbtH/J5N0VNHkIJ9jYfIYljBC7rnNWCCQAZSvIahLfmyVWVFSO0GZFLZ+9GG4AZA/b xqCMIA3URG4l2oZEDDk8fgqTE6FHLGBjP//HFrGzdxb1v1vvxynPxulujxDUoz56Q4Soz2 GliZgHpku8+5hUpkJDKQTypoQJ+Sq7e8EDs1Vr4t2FbRefFLwEkX56g5uZKNkwwQ7dbUcE T6885PWEaJcn4Mj8KITfCvUYXrMaMr8/DQqAcIJPmCmLLJ1IVVm1dqwBl6PAZXP4Vcozqw yws1AyS00XFbyZS57CFZVnRkA6Qxc6vKHD1PsshB2xOKc6Ql3TnBzytMwoKucA8w== Received: by filterdrecv-6c845fd887-6zjkw with SMTP id filterdrecv-6c845fd887-6zjkw-1-640FC1FE-29 2023-03-14 00:38:22.864476302 +0000 UTC m=+1731931.790619925 Received: from bionic.localdomain (unknown) by geopod-ismtpd-8 (SG) with ESMTP id 7pa5ZnJTRCyL5wCkffLwwQ Tue, 14 Mar 2023 00:38:22.636 +0000 (UTC) From: Jonas Karlman Subject: [PATCH 02/12] rockchip: rk3568: Fix boot device detection Date: Tue, 14 Mar 2023 00:38:23 +0000 (UTC) Message-Id: <20230314003755.512696-3-jonas@kwiboo.se> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314003755.512696-1-jonas@kwiboo.se> References: <20230314003755.512696-1-jonas@kwiboo.se> MIME-Version: 1.0 X-SG-EID: TdbjyGynYnRZWhH+7lKUQJL+ZxmxpowvO2O9SQF5CwCVrYgcwUXgU5DKUU3QxAfZekEeQsTe+RrMu3cja6a0h+5IzQTXZbxIxRk5EHqOGgyQjEYxtjhgqe96MlMLEwYCCObVv6R63LOZda4/T68Yz3EJrEcU/KlTuzkEIbeC1gdy4IpyrDqR992ojACcz+3ydAaJy7Lxyf0Qffj5H2A0F5szodUHcpb63Vs8EvygThuA7RI/3AU3v5MPG8E99dUr To: Kever Yang , Simon Glass , Philipp Tomsich , Chris Morgan , Peter Geis Cc: Jagan Teki , Eugen Hristev , u-boot@lists.denx.de, Jonas Karlman 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 boot source node path for emmc is using the old sdhci name. Replace with correct mmc name and also add same-as-spl to boot order. Fixes: 0d61f8e5f1c0 ("rockchip: rk3568: add boot device detection") Signed-off-by: Jonas Karlman Reviewed-by: Kever Yang --- arch/arm/dts/rk356x-u-boot.dtsi | 2 +- arch/arm/mach-rockchip/rk3568/rk3568.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi index 23316410496d..04a7b0a0f668 100644 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@ -12,7 +12,7 @@ }; chosen { - u-boot,spl-boot-order = &sdhci, &sdmmc0; + u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc0; }; dmc: dmc { diff --git a/arch/arm/mach-rockchip/rk3568/rk3568.c b/arch/arm/mach-rockchip/rk3568/rk3568.c index 4a08820a0937..69ef19cc85af 100644 --- a/arch/arm/mach-rockchip/rk3568/rk3568.c +++ b/arch/arm/mach-rockchip/rk3568/rk3568.c @@ -82,7 +82,7 @@ static struct mm_region rk3568_mem_map[] = { }; const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe310000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe310000", [BROM_BOOTSOURCE_SPINOR] = "/spi@fe300000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe2b0000", };