From patchwork Tue Jan 10 15:52:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Obbard X-Patchwork-Id: 13095316 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 5EA27C54EBC for ; Tue, 10 Jan 2023 15:54: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: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=oF0MwpkuKvj5BpGVf8JbnUKEQc6/wpr20B5W+f7aqno=; b=a1LkR5T5Y/HLQ6 pmURLQ606OZPna0xuz2KPpRswykrNI1XfJBvHvCmA9OyS5rn9OCHt8uPv3fyfX39yY4IVOSwUD7bJ cbMeEZUYORuMZQHik/W+NdIv69D373DLFH1iRtf1AxNASHN/xCQ37fTBrglQeuWwLBd5+3iWjC3nZ yKfdGcWztNE3eE1BOdYyXUgjEguGvPEQdRw5P6CHUSocrJBUWBRGDn1dP7dNUX10pV7hFwj+Q7QZ5 UzHeApN4kMvnVOsvp5MtTXJGBP39yHx1rBLXX6i35okejU/nW7xq/Qpa0ie84Opmdr0kRXE5M1zKh 2ubAVq0C0KnSWkbVoopw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGwo-007g0x-In; Tue, 10 Jan 2023 15:53:58 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGvu-007fTc-GK; Tue, 10 Jan 2023 15:53:05 +0000 Received: from obbardc-t14.home (unknown [IPv6:2a00:23c7:6883:e501:329c:8425:8e97:eae9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: obbardc) by madras.collabora.co.uk (Postfix) with ESMTPSA id BC95C6602D81; Tue, 10 Jan 2023 15:52:58 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673365978; bh=37/eGoyWURxAWAvYGjV9ek4VQtScHfjgbrz67unm7Cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kRn2WxT00nphHOBV0lgXu6r09P4TGCYkoxo1gcIACuWrtH6gkfrK9YupJCcNe22cp sQuNA0XnAFSogJEsG1nxp7YxxiktWoiANHe1lmsczjpJQkPTTfrbUEAuk8EyPvGn7w eBKvjPWjbTc6FXtXHfnuf8LUFwMdf3o3RoH3JU8h6YCRyKAE761d8jIYNW/1wLdk66 dNu9KkrEhwTkKdXNKzEgkS8xO3eys5pF5e/yY0S6hCotQwEnnm5eAc1Fih2Nj7KfXz mMxg9xFcDvZqibmfQsono5ap4/vz1Y6aT/92tOZAsxpMuG492ooZbW5UYDC6pbdAx9 nKWCtWDdVPI+A== From: Christopher Obbard To: Heiko Stuebner , linux-rockchip@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Michael Riesch , Sebastian Reichel , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Christopher Obbard Subject: [PATCH v1 1/3] arm64: dts: rockchip: Update sdhci alias for rock-5a Date: Tue, 10 Jan 2023 15:52:50 +0000 Message-Id: <20230110155252.189300-2-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110155252.189300-1-chris.obbard@collabora.com> References: <20230110155252.189300-1-chris.obbard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_075302_783633_251701D7 X-CRM114-Status: GOOD ( 12.57 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org In the previous version, the sdhci alias was set to mmc1: an artifact leftover from the port from vendor kernel. Update the alias to mmc0 to match the device's boot order. Fixes: a4a8f1afb360 ("arm64: dts: rockchip: Add rock-5a board") Signed-off-by: Christopher Obbard --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index 409a43d059d8..c85af1334c05 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -11,7 +11,7 @@ / { compatible = "radxa,rock-5a", "rockchip,rk3588s"; aliases { - mmc1 = &sdhci; + mmc0 = &sdhci; serial2 = &uart2; }; From patchwork Tue Jan 10 15:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Obbard X-Patchwork-Id: 13095314 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 5A089C54EBC for ; Tue, 10 Jan 2023 15:53:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Tawz0fEvcvbixj16mlWHlqmOYhdAE7h2mboA742x13U=; b=MowaVffJOPnU2+ AHDDM7LKQIvi3kaPwDOxjYgCSrT8VxvMhXLiQoHBZ7ShqYHTB8BAXkD8pVuXrrLSCS3GC+5uMD2X+ U/EfketVMeOfKrpyQqQoWrfG3BC1Y+tE6sH7yW2lzZMnUmJvZuE7acYaWJ1pjOvjyGFTJUF4x2gqJ g9yL40JWowHfk3g+bXjT/cbIIuVE3DTsDpVdtW3f9QICHb+3MLqoLrVMJ0q18AFBzo/hbTSibh1FP j5vHOjnLrD7Tl4TmG/WpAEpf+KpFgH3vnMEj4utVZJyLSu2g2b+Jdz18kaMMxc1iSX78pk5QLbSKg VK1qOGPd5wlL5LlQuT9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGwB-007feQ-Vd; Tue, 10 Jan 2023 15:53:20 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGvu-007fTj-G0; Tue, 10 Jan 2023 15:53:03 +0000 Received: from obbardc-t14.home (unknown [IPv6:2a00:23c7:6883:e501:329c:8425:8e97:eae9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: obbardc) by madras.collabora.co.uk (Postfix) with ESMTPSA id ED4CF6602D88; Tue, 10 Jan 2023 15:52:58 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673365979; bh=NifcOS43y+N68BurrSuB+JMF2pV8C2qpP/aWsRXSUKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MqwyudRT1PL6D6Tkp7yCXoGGWR1WwqJV/wdzoT3fVHB+r+Uo5SUhdCTp8ZnBxRyYg 74OmvChDrczxyw3nC4HEBVaVrlc/KAijfRCNacVLjoTnREr0dW+3UiUeZYLzeo6QlU 2hRnAoBh2ux6X7s9ONZ6xLw+m18aUvEigTUWBXYgGXFd9fSfqaxUXRBESyoIacs4fO 1XqecZmkQyxPAB962SkrjgtbRltkpzdvG5YzIsvcRMfdTKmKoQXBhxCsSsaDEO1u1u 4tRn2e+KEixWuZ6lmoX3xkwJycCDRhK2diONFVmgKVTZtDdxAfuIq7y5GxU3K6I45R rlrizMspoT6ng== From: Christopher Obbard To: Heiko Stuebner , linux-rockchip@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Michael Riesch , Sebastian Reichel , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Christopher Obbard Subject: [PATCH v1 2/3] arm64: dts: rockchip: Remove empty line from rock-5a Date: Tue, 10 Jan 2023 15:52:51 +0000 Message-Id: <20230110155252.189300-3-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110155252.189300-1-chris.obbard@collabora.com> References: <20230110155252.189300-1-chris.obbard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_075302_759553_F966CBE0 X-CRM114-Status: UNSURE ( 9.16 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org There is a line which is empty. Remove it. Fixes: a4a8f1afb360 ("arm64: dts: rockchip: Add rock-5a board") Signed-off-by: Christopher Obbard --- arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts index c85af1334c05..6432b586bf5a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts @@ -52,7 +52,6 @@ rtl8211f { rtl8211f_rst: rtl8211f-rst { rockchip,pins = <3 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; }; - }; }; From patchwork Tue Jan 10 15:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Obbard X-Patchwork-Id: 13095317 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 9FCC0C54EBC for ; Tue, 10 Jan 2023 15:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0pnpze7/4YjPIzcd4nS24fBuiwMIsqSE2h51da1ImiU=; b=4U/3qyxHdBWxPL sRyuY1TPTJQFREdCNSkd32rtEHfcQJp8N9rEd8nyq3uvFfz6hT3M1mpC3z0h8+BLQQmRTq5B4XGID bq9kqFcewdpbLgpJzJbJDUK7ClMCv/GfKu8tylniNY3cby/OK+K9JlLR8jsv/kBZtgFkuV9HYswVf +tMBb7yNjHwVtStCeh4TxAFl9DkoAjW2h4M2C7N5rqmtq3+kibtOOhNGgudpZU+g9unrAHHVPiFGc EDqU0z2RuOH1A/fz5g4GE5cGl34EHWkpZWNx65g6XuaKIlZX1JN1Q3sF1ZgLDZiqpEtplGJksFhGv 5etRO7LtZkZfdvnpGSSw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGwn-007g05-ID; Tue, 10 Jan 2023 15:53:57 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFGvu-007fTr-G1; Tue, 10 Jan 2023 15:53:04 +0000 Received: from obbardc-t14.home (unknown [IPv6:2a00:23c7:6883:e501:329c:8425:8e97:eae9]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: obbardc) by madras.collabora.co.uk (Postfix) with ESMTPSA id 34BD96602D8C; Tue, 10 Jan 2023 15:52:59 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673365979; bh=HGPm8usCmnU2uD/BuRoPEJSSk889DsjH2Tp5TOPZqMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NT9Vbkoxf2L5ZaPk8FS2cl5XJfmnt6po3uC7NuKz0yRJel16psP6G1HJY4WzT3oDt cVM7LJaVImUqNWkEPtWve9uJ9iJD03P1l/zKIPD0FjnV42kYW+w9GWsoOerdlGMI0m J6C1YpgMRGIl0mcHkJ/vL+raXMsTa4egEx+I9maTM87fCFsyTOBHkk73pKJDHndiYz +19CDAALdMxK+eRw924lbINOTzD342hM9fBBUANInhmCix2BgIPOlyZDPwFv9culbW gW3gridGAiUKUsUCMOiVVg5lCs9tenV5sLTyaEvY94u840/DJQRuFs99miiOEN+jYa OWpyKtt8Bc/UQ== From: Christopher Obbard To: Heiko Stuebner , linux-rockchip@lists.infradead.org Cc: Rob Herring , Krzysztof Kozlowski , Michael Riesch , Sebastian Reichel , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@collabora.com, Christopher Obbard Subject: [PATCH v1 3/3] arm64: dts: rockchip: Update sdhci alias for rock-5b Date: Tue, 10 Jan 2023 15:52:52 +0000 Message-Id: <20230110155252.189300-4-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110155252.189300-1-chris.obbard@collabora.com> References: <20230110155252.189300-1-chris.obbard@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230110_075302_774246_10BBCBAD X-CRM114-Status: GOOD ( 12.77 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org In the previous version, the sdhci alias was set to mmc1: an artifact leftover from the port from vendor kernel. Update the alias to mmc0 to match the device's boot order. Fixes: 6fb2d1549786 ("arm64: dts: rockchip: Add rock-5b board") Signed-off-by: Christopher Obbard --- arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index d2f1e963ce06..95805cb0adfa 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -9,7 +9,7 @@ / { compatible = "radxa,rock-5b", "rockchip,rk3588"; aliases { - mmc1 = &sdhci; + mmc0 = &sdhci; serial2 = &uart2; };