From patchwork Tue Oct 22 19:35:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 13846099 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EC56CDD0DB for ; Tue, 22 Oct 2024 19:38:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cGUU/iG7YJDkLyArhva5LWM7ySXTw/bZxI0PEkU3+xc=; b=sDqxEYQcP9+q/bw950jUGJRAuR kHk7mtyF0N4yIf6JWfXZclS3qmL4RMEQ0G1e5aQiwA2FnvWeagNHtIcKJjVtceFcfTSzffd+EgSfO BZJwpMDccX7JP42vzjuQa3fJMZHlDtVomZBkZqjtwfr+evDN69Rekp16JZs81hCmaK2OPjaqMRVnS TKce2RamQb1w5a1oJZ3lbzsnzgcYiWntgAk/932sW2loCmAgC6sBWi14oO87yAaH0pjMtqkSg5jLh CRwhNms+mKKdmbwl5iwqVJ7uEbCSTJ8SvV7upBcWsks166YBrCj7mwkRyolZnDGyTw6HsmZ1Calkr rKxqQumQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Khb-0000000By7i-1zbA; Tue, 22 Oct 2024 19:37:59 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kfi-0000000BxVl-0XLo; Tue, 22 Oct 2024 19:36:03 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-20cceb8d8b4so1158155ad.1; Tue, 22 Oct 2024 12:36:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729625761; x=1730230561; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cGUU/iG7YJDkLyArhva5LWM7ySXTw/bZxI0PEkU3+xc=; b=jMFvGaKT6O18UwKUVhc/f8mmL9emcBxASAn7vd9bXD/cMVFGpUjfV1MI6MPQUpOnFR vHHGQUDmk0HZDhdANDO+sABy+l73h84KdiaLilk/u5yG/L89nyoiaRRrTSZdDaSU+RN/ FdwSNwq1XJmEEtOPGfmxOUGAjyMTwmYf+GIeHGYuJzNn7sdPlHQuIX40LD/bgRNS5nL/ zfKBn6bc3kvYQhojRx/WC/+DVY+yBtrtXhrcmYsd4Ysn6lBvB7QQzXA833JehmpllC34 bD5dCGBie2PQthA8fBMCxj86sqHbkwFgHowRVry7F3m25oZj7wj1T4u6D6qMJl+AGRC+ Q7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729625761; x=1730230561; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cGUU/iG7YJDkLyArhva5LWM7ySXTw/bZxI0PEkU3+xc=; b=ET2eNh9dMZq56sQlFyBUXte18zWTV22SXyifGPNzn82+YgN2iSetN/KSks+HrtXORm GDyPH/SLWcBtZReYwsFja8JWI7OhGc2UoKSUFHcxekOBvZKwUkYudAkSBmiNAr3OBiYX LWA8+YbMJg92gXtavNUqFQd5MQ1dJIEoDdnU1r9BSRz5A5a2ZKPn92D9JC+aK4oEpGT6 zcDR2WUj7WDa59Z03fQcw+Lh3bUBIK/LnBV3rFwHBqRAVm/EB/b63imIvvXtGNce2n1t kvKb0zxuM+mjoH8DT5SXxktpp1TcLTDFcmxl+ul0mu9zH/S2SL3OVX6YxYwFEAtrZNxB 4LNg== X-Forwarded-Encrypted: i=1; AJvYcCVnxCq4mB/zRlEZDocyoOrxXfNcVvL1184/JWyuOJmCvXOGWcE4ZcTheDb/3c6xaVsEf3z67+8qQkI+Htnasmk=@lists.infradead.org, AJvYcCWihzXQS1NMMExTM0s2gMfckDHPjGNxvAKpFQcwxjiSh9ztkCotLF1qKqwybumQwjJ7D4gTJfS0N/fT1Ng5gKS5@lists.infradead.org X-Gm-Message-State: AOJu0YyS8RSI5njqJ5t0uRQNuqg2o0pNSQGAbdfe6Tc6IK/J107pqwFx VfjeFAcr5ir2DWF26TEH/0CiFrbOViK1vJYTEAxfksato3NS6C5e X-Google-Smtp-Source: AGHT+IF0hH1aKXgSZGmueQFJTPu4by03l1jAsjzPCoRjd1QS9+mDIqVHJuSSKO/3/auin2gHgPWK3w== X-Received: by 2002:a17:903:1c4:b0:20c:f6c5:7f6c with SMTP id d9443c01a7336-20e9701dd7fmr50654715ad.16.1729625760598; Tue, 22 Oct 2024 12:36:00 -0700 (PDT) Received: from CNSZTL-DEB.lan ([2408:8262:245d:4d65:bc4b:53ff:fead:2725]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafb1e0sm5467316a12.3.2024.10.22.12.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 12:36:00 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Morgan , Jonas Karlman , Andy Yan , Jagan Teki , Tianling Shen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] arm64: dts: rockchip: fix model name for FriendlyElec NanoPi R3S Date: Wed, 23 Oct 2024 03:35:26 +0800 Message-ID: <20241022193537.1117919-2-cnsztl@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022193537.1117919-1-cnsztl@gmail.com> References: <20241022193537.1117919-1-cnsztl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241022_123602_190177_38834846 X-CRM114-Status: GOOD ( 11.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Use the marketing name for model name, this matches the dt-binding. Also update the website url in copyright. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts index a7a55d68dbb6..6bc17f755b79 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -3,7 +3,7 @@ * Copyright (c) 2020 Rockchip Electronics Co., Ltd. * * Copyright (c) 2024 FriendlyElec Computer Tech. Co., Ltd. - * (http://www.friendlyarm.com) + * (http://www.friendlyelec.com) * * Copyright (c) 2024 Tianling Shen */ @@ -17,7 +17,7 @@ #include "rk3566.dtsi" / { - model = "FriendlyARM NanoPi R3S"; + model = "FriendlyElec NanoPi R3S"; compatible = "friendlyarm,nanopi-r3s", "rockchip,rk3566"; aliases { From patchwork Tue Oct 22 19:35:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 13846101 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0006CDD0DB for ; Tue, 22 Oct 2024 19:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dV9l/v2LcDXnviTDuNMkbMeVnn+PWfoffe417y/FNaw=; b=kwVmhbmaFGxql1gwZ7qi8BlML8 VEJEbdRHESj7v19QfhU+pHaBNjipm6BVRUagd440BF3sJMB/9y/mVwyZH5pVt5+OE5vqrZkRmaO6b 9wgg6XtJiVfcK/WiIxeSh6BU7NSD+f6EIa3jw/9064zNK9qHzOu8ukqwo11vQiwiSzNV6a9bQKDto oOLIrohSQkSF5LId5ByJplBC3jXFjMaEVe/1EwBqOQ0PayemXc64877bJXLEMLWcrcImRq5EtcG3a HIQxt4gDRuXC0p7rV1RyLjT4mz8DSzezsl1av4B/rtaBUzafKuh0tQXZkMSsZX88c8PjwoS3guBTu cN4xGkow==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kka-0000000ByZU-2rZ0; Tue, 22 Oct 2024 19:41:04 +0000 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kfo-0000000BxZ0-2rxy; Tue, 22 Oct 2024 19:36:10 +0000 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-3a4d2d028b3so2437535ab.1; Tue, 22 Oct 2024 12:36:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729625767; x=1730230567; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dV9l/v2LcDXnviTDuNMkbMeVnn+PWfoffe417y/FNaw=; b=haQ5p+46ijhNBTdi5wBcogHMUARQVZCqEPJz5rioeqqNdTDoABo16Sc4834Rj0JvZL Fd7oDbXHQyUVTm2Yf/i317Djrlhb8dCSnyS29jxRn97t8SA4++0jZgy+vcaqV0aUTPLX fkYqN1x++u+XGXoX2lb8TkDn2TxfUGyBZEyWe/eetu2oWZuhn/r8ZgiwLXLqsdajwj4/ HENBCxKQpj8txYZ0zWfuu+9pfBdmYNDU3nWx7Ajosl0tpjpe+XUDY8dActKOqs40rSB/ UZ2DMsmissfLXZWu34/FXkkPdTKRF5cmOGlpw5qi37uSTe5HG2rJOyquGzG3yUPD6H+u Vq/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729625767; x=1730230567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dV9l/v2LcDXnviTDuNMkbMeVnn+PWfoffe417y/FNaw=; b=fbxRsCMnSBNxUkOHiv++p8vfeK8Ih2GBz21rXGCaB9l0uH81hEgbIILZKGqTOyKErk gjzT1CPFwAFURuwJoDFUoymZAYKl6rPArIL8mpwFYm4WB+VLfPO2j5vbsK7d0ZaHqF1c kEItL3ThIdODMp/SVxbukDCv6h//LDo+1kSiICIOI0rIJqnC68PpzZPfCRje8vhuC8Sc zsg4wSTWECps+RKubeeOdFsaIru76/0KzxvRk05sMPeLONV464NhW54wzFyQLTahMxva Hs4i5vcQTMbmpchAr14nYORBVVVGFE7pSYzpiuvX5fZliflstsaN6ggAbu1nJl5f8txq mn3A== X-Forwarded-Encrypted: i=1; AJvYcCVa9+vey+mZoh8NyH+Wxi9LaspqdZ2nTxTYUefe8ApN8U95M2OTif7UZNKhjNykEaibvMXfRoOSJ7ANJnowPuQ=@lists.infradead.org, AJvYcCXaP1d0tctoqbVajOtYmuME11fAsZ6DmaBt3hRHztsfoIn498LRiziECzotOMXsCCFUODoUfPGC3aV6afRObh+W@lists.infradead.org X-Gm-Message-State: AOJu0YyRl0fZ9ALh+Wxqrx6EVGUbf7aQCY3ZScScrp9DyM8epQmHXr2Z VOdKLY6Bq8ESzEFFe1ttB+MRhuNlOw1QEA1jnxKdc4qfABj0W27Z X-Google-Smtp-Source: AGHT+IHLlalPSHm8zG0hppdjSOOKHduEt8dQUk/4lbr+y7EGhPZQjy5bqFOm5stgAa1QyW5y40KauA== X-Received: by 2002:a05:6e02:1749:b0:3a2:7592:2c5 with SMTP id e9e14a558f8ab-3a4d59be0c3mr2384155ab.17.1729625767259; Tue, 22 Oct 2024 12:36:07 -0700 (PDT) Received: from CNSZTL-DEB.lan ([2408:8262:245d:4d65:bc4b:53ff:fead:2725]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafb1e0sm5467316a12.3.2024.10.22.12.36.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 12:36:06 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Morgan , Jonas Karlman , Andy Yan , Jagan Teki , Tianling Shen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arm64: dts: rockchip: replace deprecated snps,reset props for NanoPi R3S Date: Wed, 23 Oct 2024 03:35:27 +0800 Message-ID: <20241022193537.1117919-3-cnsztl@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022193537.1117919-1-cnsztl@gmail.com> References: <20241022193537.1117919-1-cnsztl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241022_123608_758746_733BF811 X-CRM114-Status: GOOD ( 10.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Replace deprecated snps,reset props and move them to the PHY node. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts index 6bc17f755b79..66a00cddda0c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -149,10 +149,6 @@ &gmac1m0_tx_bus2_level3 &gmac1m0_rx_bus2 &gmac1m0_rgmii_clk_level2 &gmac1m0_rgmii_bus_level3>; - snps,reset-gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - /* Reset time is 20ms, 100ms for rtl8211f */ - snps,reset-delays-us = <0 20000 100000>; status = "okay"; }; @@ -414,6 +410,9 @@ rgmii_phy1: ethernet-phy@1 { interrupts = ; pinctrl-names = "default"; pinctrl-0 = <ð_phy_reset_pin>; + reset-assert-us = <20000>; + reset-deassert-us = <100000>; + reset-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>; }; }; From patchwork Tue Oct 22 19:35:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 13846118 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 287CFCDD0DB for ; Tue, 22 Oct 2024 19:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZATNHLu7ryXLlEMWdw/soQewkOcMuE+6eXALk2zJ/y8=; b=pNHgYFiAiUcaaDtMs5kZQ4WMrT MnsqyfCf5ttMcCK6hInkqe2Zer9QmC6JdIe9h/KdHTeFvxza5lwSHKEgNQ6szeNtsVq3ftXQ2DnmT KRKBc6YuL9hhiN6tozBOP6mgbIHplvGjMNndn1mNYl8voLwowc1PDKsPJpii5cRL4dRc5XOKE27rO 7ISsKnKfnGf/+ZxllwMClKDIyozFYzr43LCiA8kR5h00OwtKWDI/NW8UolplxiXRUm7Xm19AADvqz OTi3L0av639cSdl55vHbITLK00ReqYySHGkqvKRatOTMsvCdbu4eyiwM0VB3nzgORh60sEKGxVLTx BHnTX11g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Km4-0000000Byox-0N4a; Tue, 22 Oct 2024 19:42:36 +0000 Received: from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kfv-0000000BxcO-0vvV; Tue, 22 Oct 2024 19:36:16 +0000 Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-7ea76a12c32so4879958a12.1; Tue, 22 Oct 2024 12:36:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729625774; x=1730230574; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZATNHLu7ryXLlEMWdw/soQewkOcMuE+6eXALk2zJ/y8=; b=b94lF01XzZ5GvAQsHY5iLaetjBqxeKkFsckSFiuTgEZSOpjJ+TNCcKny3MMxJSyQ1D WCe61BpYIMxEvGm4JDmmwXh0Dl+VhWbHIyMWFnro6ChSUSUOIUUhAutRCUS4f3AwnVkP e7Csl0HiwOlhByceheuuVx9/5QJ6EP0NdNTxQq/ON0uF7T3YC4TTQNQ87/0DnybS4OV8 /eoYFwtW9ibWGkF+kOE9l0lUwIxUtqHjCNJVceJvpdlLk7aw6Z8i4Fw8MGwO26IbojFI Iq2lOj69A7E7fiKXuFs1XvXKYq1+7sva+SsCU+tfnzgu8+M23w7M6cJywueIhu/8bbQd 0nFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729625774; x=1730230574; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZATNHLu7ryXLlEMWdw/soQewkOcMuE+6eXALk2zJ/y8=; b=vFrsejmBIGT3J4N1fuiDTy0BFjzEqKa7PMqBxur5YNNE2uQ90l4czaO/o8DRYzdv+X MRIUV9RgdMT6aXk/KppnNaXtmDzIJ9Klv105OYwG8SHit+5/+M4/wc78tqy1fGGdr3fB /JfleSozc8LFujQGoi8U/z9VhTkoQ09Y1OgJD44mIndeOnbyfXsPPyIYDooIYufB75kc z4zWy1gk6UaCxdJGDoZ7aNvyRzVt4wA6uJzTGUHrQK3GJz2Hpzk/L5H38XaDcfDeMCTo t2ToNvEcnU+sahi1FmzPfzm6y97Rgp4av4mfXcYI1PDTzom++8X+ToFB9HerSyaKc0Gi loBQ== X-Forwarded-Encrypted: i=1; AJvYcCWM+4ywdjfOIbyK54t7H8KVRMNXAZ09QXwP97PRAX8JM1bCR5AFJFidroQj1bjLx7XeALLhkaogM/kgWLb8asg=@lists.infradead.org, AJvYcCX7AUmzdDt8o+1ayyBvuQNmb9h/7BOngME5nTdIVgHuiHL55ZSEqN+8hPSOe/+e51HPUtxoXOCtymKfeG7mrP0D@lists.infradead.org X-Gm-Message-State: AOJu0YwD25XqcHgz4b75/TRXHaoGKZXguyQQR8lOnvFfeNdvAK+Ir82J ANt85BF7PG+70FIaI5miMW25GUzc4frEQhTiCp5wqMXKTkhpdxnk X-Google-Smtp-Source: AGHT+IGuEr0jw3gysbwK6xAgXQVAp73Rxim5u5IqSonSQ50FehaQdZxMf9RI5ejAh/MnH32asL036w== X-Received: by 2002:a05:6a21:168e:b0:1d9:2a0e:971e with SMTP id adf61e73a8af0-1d978bb27c5mr96065637.46.1729625773809; Tue, 22 Oct 2024 12:36:13 -0700 (PDT) Received: from CNSZTL-DEB.lan ([2408:8262:245d:4d65:bc4b:53ff:fead:2725]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafb1e0sm5467316a12.3.2024.10.22.12.36.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 12:36:13 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Morgan , Jonas Karlman , Andy Yan , Jagan Teki , Tianling Shen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] arm64: dts: rockchip: sort props in pmu_io_domains node for NanoPi R3S Date: Wed, 23 Oct 2024 03:35:28 +0800 Message-ID: <20241022193537.1117919-4-cnsztl@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022193537.1117919-1-cnsztl@gmail.com> References: <20241022193537.1117919-1-cnsztl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241022_123615_285336_1ADC345A X-CRM114-Status: GOOD ( 12.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The status prop is typically the last prop. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts index 66a00cddda0c..243574f8da78 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -476,7 +476,6 @@ vcc5v0_usb_host_en: vcc5v0-usb-host-en { }; &pmu_io_domains { - status = "okay"; pmuio1-supply = <&vcc3v3_pmu>; pmuio2-supply = <&vcc3v3_pmu>; vccio1-supply = <&vccio_acodec>; @@ -486,6 +485,7 @@ &pmu_io_domains { vccio5-supply = <&vcc_1v8>; vccio6-supply = <&vcc_3v3>; vccio7-supply = <&vcc_3v3>; + status = "okay"; }; &sdhci { From patchwork Tue Oct 22 19:35:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 13846119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1C8ECDD0DB for ; Tue, 22 Oct 2024 19:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OX3rGRTXjTnfbyh3jkkVkK45Jb1/cfnPyM7MP3Mq4nk=; b=sgzOZlW/uVloHnxDam96ts9n1O SpgPyOaNTfkUIOYaIsh/nhJW+ZOv3l8VdMC9lMnPxf1kjL+X23tWwxs21xSx+/op9MVw0izqhAJaf RethC2ooDLJNCPkhAFWMMXIPLBt6EApM1ThXXxuQt+oIOT9iE//12iAZqB3U1yFigcQigTECc0RLw 0CRzEnl7Pi7Vr8N9LlOwBI3FwDsVVKEssUFxtebIW/fCEQvVLdE3fJV7XIDDRinQ3VN5Ldb8Ss1Jm Pb0JnXUghb7xbDY24jUeCOvtZcZJzyZ/tTTBgbHNOmrRQjjtNaNSky7WCRaJ8gzTitS9Dm3FEygf6 N6w3Fjbg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Knb-0000000BzIP-1ug6; Tue, 22 Oct 2024 19:44:11 +0000 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kg2-0000000BxgA-3RLl; Tue, 22 Oct 2024 19:36:25 +0000 Received: by mail-pg1-x535.google.com with SMTP id 41be03b00d2f7-7ea7ad1e01fso132562a12.0; Tue, 22 Oct 2024 12:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729625782; x=1730230582; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OX3rGRTXjTnfbyh3jkkVkK45Jb1/cfnPyM7MP3Mq4nk=; b=iWvkLpZjE2ab/DUUxndOOA6uzJ0BNvBxIdnDEcxwAVoEfkafH3UvxhHgcE4TssZw1L vC7PVnnUPH8/UZJsKdwRJlKQ7dTdDppZ1pz8jaGzM0jvoacFf0rV5633c9aKNRhvtzD/ DGyj0HdqOieRplVs1Wo0zlTs/dFbHSeyY76ayX46TbfgLABbLI6MaM5r181DvanAS3W/ d0EpARpn4laTFhPmX161n29ykEr/mlVeUPLnD1iUZIuttgvJo0b/TxWC7p/CRB3Zpgl3 tG1Okftg0U7rS34ENfMCYH+XoUoeczlRx4qftEDqmxGHDuX6USJ107cK+5IZ9rppAxw3 KTkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729625782; x=1730230582; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OX3rGRTXjTnfbyh3jkkVkK45Jb1/cfnPyM7MP3Mq4nk=; b=lYDY7/0L4WqVTbZ7bNKDCyuwAox4zl8Ks2F2E8t+fSSQqPSxs3/N1ArRQnIgfmlP42 0auutk4kxXrCm3K0BZQ+vRyywXAlsPHehOr9mQiGFeew+s41VoQO/dYd9l6Q8KHZi6xa +PWuqaQAl2EdMl6LmVfCN7FKRnE9Iq/zqsxkI++YWcNyNXa+sR+9jw5xaelMpbTJUCQG 45DfFDvvZIggHsSyPf/zAF89rvGSYi0A7LYbgIgnLOt9DT/fiPM6HXv0YzvcOlq2LgJ1 0TACrayTgPKBisDLFfY9C4epefUFx9Kiq32WBQCmayHJdMi7dffx2CEExFYmtvjmf03h 4eWg== X-Forwarded-Encrypted: i=1; AJvYcCWhfCOkt7lgnIblga6UdP/qh0mEQC5CnrpJbxnCVNxihtF4BnLTRMuoWRPHvNq23CF9FKLBHh43cJTah4sH0BY=@lists.infradead.org, AJvYcCXgmN5w9yDRRePaLrTNCx+RNaYXeFbVK2C0gF1txtK97/8aDQaBENI3YmT6aqHd7oL8AqHJYrgehOwGyGrDkQcv@lists.infradead.org X-Gm-Message-State: AOJu0YwubhCEPMcMhxdrTh8S3MO1/6EZZ/6XZTHHV1WpZsczm3l7Bpke M2F0wwFQuqc4xiK0fX4/1faD3s877A3k5vjCIeFAYpB3EdYAG//E X-Google-Smtp-Source: AGHT+IGxChW/ByuZYjhL4nrxVUwxoOienwQqLSub4S6jDZ1mxsfZoXM4s4/2IaaNf54eWRFhDaDgpw== X-Received: by 2002:a05:6a21:7747:b0:1d8:a9fa:f7fe with SMTP id adf61e73a8af0-1d96c29621fmr4948174637.10.1729625781417; Tue, 22 Oct 2024 12:36:21 -0700 (PDT) Received: from CNSZTL-DEB.lan ([2408:8262:245d:4d65:bc4b:53ff:fead:2725]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafb1e0sm5467316a12.3.2024.10.22.12.36.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 12:36:20 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Morgan , Jonas Karlman , Andy Yan , Jagan Teki , Tianling Shen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] arm64: dts: rockchip: enable eMMC HS200 mode for NanoPi R3S Date: Wed, 23 Oct 2024 03:35:29 +0800 Message-ID: <20241022193537.1117919-5-cnsztl@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022193537.1117919-1-cnsztl@gmail.com> References: <20241022193537.1117919-1-cnsztl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241022_123622_919994_D655DFD7 X-CRM114-Status: GOOD ( 10.32 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It is required to boot from eMMC without additional patch in u-boot. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts index 243574f8da78..03a2f90f6217 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -491,6 +491,7 @@ &pmu_io_domains { &sdhci { bus-width = <8>; max-frequency = <200000000>; + mmc-hs200-1_8v; non-removable; pinctrl-names = "default"; pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; From patchwork Tue Oct 22 19:35:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 13846120 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 05D47CDD0D8 for ; Tue, 22 Oct 2024 19:45:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=M8wiRg5W1PtOs1HUIUCqVFmtQqvRNw6+deonhikANW0=; b=0hwVDDsP4lOSyWNaxumulhZM0t Ved01j8itaPLlvmuWf2CR08X9bEUkKzSp3RwaPrN8fpZ57/wVw0oRCE2FX1gt4+61f9AQ9k0owWpC oLA98A85UbsSCAXvotcPehlDOTgFEZcRIFC4ivg7O32bDcXepN8sY6hcnMazXwjcD5AFzH32BAhTm 97of9BKPzJVTYq7fGkcWMd3IobEmbQb0YBxVw3j5oxJeI6DvQV+AKtlPzlnbiSEaYbGrMSmJVQuPL Rbu1b+vrA/QaJd01fm7v0orQwI6d9HMo9ft7jfcUgrLTJnJ0LqWsi776jGOGMJSYd5khm74NAg1G/ 3OvRMxNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kp6-0000000BzgY-10fG; Tue, 22 Oct 2024 19:45:44 +0000 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t3Kg9-0000000Bxi9-0ITw; Tue, 22 Oct 2024 19:36:30 +0000 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-20e6981ca77so44575055ad.2; Tue, 22 Oct 2024 12:36:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729625788; x=1730230588; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M8wiRg5W1PtOs1HUIUCqVFmtQqvRNw6+deonhikANW0=; b=al9P6UYyBq4wOgRY7kc2CjxYHBXTXKJf0jiGDITarFNTqxasX5V3x5sLEi1ph0HLIs y6zyXPWgyNmyB3+XQVWVqpFnM7hojUpiGY/kIzbHsVZ9Q0mTO+58aYT3t3WhUBhzSYwn Atv/1a5RdOmUP5cKTM/h4KKuO+ti8l3kBD46Qhhr+vowiquCjSB8wFcUIUz52VjoiSQg VI97qMEgztMEJlwxMoWiAAFR+GFMVSZHFOcUMaxrcmb9mkk37/VwhI7Ka6oTlVUOWv91 6wTsYq8QZ9jj2Hha8X/bJFJOzWDUugGD8zeaR9npp1z/QW2OryHlcHQjSoo9yfmcWAUP qTkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729625788; x=1730230588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M8wiRg5W1PtOs1HUIUCqVFmtQqvRNw6+deonhikANW0=; b=Rs60kyPR2eW4dApwe83powoWDJqwyWmi8Xlm97wgZ1hERFJQe43yPYcCxLP76AuVAm at7Vzhhh+Q0u0USTcIWVeFW9UGkZVZbdHiKYwdfNAdy9TKzyVSgh9tJdk7xz6Ddk4X1r SaKO0xfDBdE95W1W86s1ystTCJs57Gb82Ft285CuuS/jZ2RbEyDwAGlCIWUKjbtpLEvD Bhh63MWw8QYBRvkvsKi6CcZ2mQak5e0o3/ZDvromJnQnxjMbe6vf6ma9niWpgVI4Y5D/ ps/zS5NEvxQfEyVFI2pDliOCAMwpqSg+FAQ//ic9Gij1PlFPTjKlDivwUq0TKUFIwK6w JoeA== X-Forwarded-Encrypted: i=1; AJvYcCUgraMUy72V8ir5lx8ZoeLTVr8XuWV+ds7PIH77BKU8EcJ3gHk5MzwAuYyGuvPAK4e0yB9bHBYNmIDw6k1Yo4VV@lists.infradead.org, AJvYcCXnuDDfkU/Ap/jijl3MgRXw9qVa5wXn6Yd66rHhgSc7mSnhTX1fcOkG+RQLW/Keyi1WmkMgmFQ65rQfK22BXgM=@lists.infradead.org X-Gm-Message-State: AOJu0YzsRvnX+c4Ch4GamdbX5G531KsOSHnUVnlj8d3f/PPJjR8U0dCQ PgZRMkNRbm4sLQ8t4HH9uTkmIfz5EDPio0YSl954MtidJ+nG6uO/CyQ95B1Crik= X-Google-Smtp-Source: AGHT+IHcM9OVE8m7QLGtMQFh/XvemYftK7Dm2+Nn3KopFxQ5Dvr2Qu3K/wfO5X/iP72Xd1Y56zAfYA== X-Received: by 2002:a05:6a21:1798:b0:1d2:e888:3a8e with SMTP id adf61e73a8af0-1d978b1b03cmr128873637.18.1729625787998; Tue, 22 Oct 2024 12:36:27 -0700 (PDT) Received: from CNSZTL-DEB.lan ([2408:8262:245d:4d65:bc4b:53ff:fead:2725]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7eaeaafb1e0sm5467316a12.3.2024.10.22.12.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 12:36:27 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chris Morgan , Jonas Karlman , Andy Yan , Jagan Teki , Tianling Shen Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] arm64: dts: rockchip: reorder mmc aliases for NanoPi R3S Date: Wed, 23 Oct 2024 03:35:30 +0800 Message-ID: <20241022193537.1117919-6-cnsztl@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241022193537.1117919-1-cnsztl@gmail.com> References: <20241022193537.1117919-1-cnsztl@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241022_123629_127862_B2B36870 X-CRM114-Status: GOOD ( 12.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Typically any non-removable storage (emmc) is listed before removable storage (sd-card) options. Also U-Boot will try to override and use mmc0=sdhci and mmc1=sdmmc0 for all rk356x boards. Fixes: 50decd493c83 ("arm64: dts: rockchip: Add FriendlyARM NanoPi R3S board") Suggested-by: Jonas Karlman Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts index 03a2f90f6217..fb1f65c86883 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts @@ -22,8 +22,8 @@ / { aliases { ethernet0 = &gmac1; - mmc0 = &sdmmc0; - mmc1 = &sdhci; + mmc0 = &sdhci; + mmc1 = &sdmmc0; }; chosen: chosen {