From patchwork Tue Jan 10 19:53: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: 13095603 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 F222DC46467 for ; Tue, 10 Jan 2023 19:54:29 +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=50y7Nez5aUtIqu8ge2cWBK37eR29X1Jr3SZrRvtFQR0=; b=pXB77rkEzH8ybi GWrMO9fMBXYfdDhqF9ygDzdShavWwstnrhnqtyQRq0ueM9b4wfTo07uYT1lin+zbE97Xx31dZ3ltQ 8THXlHReaEot2itNhoUSsaUE6R9u7QROOVkPnnamAfCImz/loq0qSDe8W8HwZL9UesWYegPivoC1s b0VkblKN39yDtP3rt0QHvDuZQqrY/zq3wMOoAnDBTsZ+UbMYm6cXfjX04fqv9ux6/KxVDTGk4/hny 4t8kwnSKkKXgTBDG8ZZ1d8o8IzjYkbLjXU1q4JhoLZbaE4KGAlVwtCTDPYMIcC8+crIuBl98CTcVe wjG0ReO53ux7kJPzCrRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhQ-008NS4-RP; Tue, 10 Jan 2023 19:54:20 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKh7-008NOp-IX; Tue, 10 Jan 2023 19:54: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 5F0416602D70; Tue, 10 Jan 2023 19:53:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673380437; bh=XtuZqyrzVyw7Kc8xc2o7u4BAqoLjBfUezpqTdjdVNig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZAznN0/E39zUYCnPz68Vl5zV9j/TD7R2FXuNrhWsoEHDxgZkbqBJ0bjkvxXoPBddX lvkYSjZXdeAAalVIjM63NtdCV6q2s2gHTJ5DmhqotvF8CqExvi6rl7eMsxeVJWBump LoJBALL3FlPsiRYiQrR1uRFyn8tVWVByWDGtos7g2HqZmuXLZrqwTWu5hny0D8+fAb lXCRiShvr8YA0usiqwjuH3WSgxYZUMu4P/NoZfpLBqEBpwCKKNhxVyNCHniGe8Tv2q JPiWh8e0lR+fn2AptzMd/yinKgWMOz2h5AASkvqQnW/aLbVNVruPR1efOlMG2RnGDB K9fOs7VVS38YA== 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 v2 1/3] arm64: dts: rockchip: Update sdhci alias for rock-5a Date: Tue, 10 Jan 2023 19:53:50 +0000 Message-Id: <20230110195352.272360-2-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110195352.272360-1-chris.obbard@collabora.com> References: <20230110195352.272360-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_115401_881407_6960E8D6 X-CRM114-Status: GOOD ( 12.68 ) 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 19:53: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: 13095605 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 C4EE5C54EBC for ; Tue, 10 Jan 2023 19:54:36 +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=NryPnMv6l1a8vm fbQpNcxSuizAVg4j9f4VFBTYspaiVt9UCJuNjCYAPUL9OvTdb5uI12keJQm8ArUruqvpVTd2FtRMt sIsL+WCiHELj//i1vjkrK/KzgtCsTnLICf6CZOJRLbiUHBysc8TRLNM+kVozE2LUkX3O7DLcj/xAK 3/SQul9yAMJtpbVLPqUMZQChE8gOgIzX2GpzPTLcmCPrEWQ4mtu3fJ09AOmYKoTFDOsUWd/3dX5rs oC70OZjF3HW6Rkom4+IUo432czxcZ28cfftr6+VPcjf0a0WE+apQvA9SSHV4Dy9pKIwq1oxPBJ1Bg Ic1+FT9Dzfm23ShYUXgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhR-008NSB-6U; Tue, 10 Jan 2023 19:54:21 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKh7-008NOt-IW; Tue, 10 Jan 2023 19:54: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 98A3F6602D8F; Tue, 10 Jan 2023 19:53:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673380437; bh=NifcOS43y+N68BurrSuB+JMF2pV8C2qpP/aWsRXSUKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N0fRjUzXMP3KKEK371KCiEY6xzuepwB3W220WKNzyE8Cl+fA2WBxL98pvTueApZV2 2UwtBaIFvF+beMw7bgIChN0ZL9GIJkjovDsoRv+odSa80yhywUJCLqZlHRCQ9nLNU/ bJBgfFgd0a1FNselkgwfbN5D6cUIF/RMdhcpWYypgqoO2Y68he8LfcBG4rtqO0uGDx q0Bq0woKucT6tSEny8LypHxCldBJvhtIt/b7y4u7sYrbuMTsNwas5FVFgqjOKlO+sK whLu5tV7MpD+SZooXqNWEq0X7wk0FyZ1HfW/ZoG9UQiR716POq0q1bdpUTtGzqGb9v /iU3fmYCFlHfQ== 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 v2 2/3] arm64: dts: rockchip: Remove empty line from rock-5a Date: Tue, 10 Jan 2023 19:53:51 +0000 Message-Id: <20230110195352.272360-3-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110195352.272360-1-chris.obbard@collabora.com> References: <20230110195352.272360-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_115401_871370_6C39BB4B X-CRM114-Status: UNSURE ( 9.27 ) 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 19:53: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: 13095604 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 6E842C46467 for ; Tue, 10 Jan 2023 19:54: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=qk1nJoDWR4tEXcucygiThFfcBk2bkmBJWky8lcSXwdg=; b=JPgOkr2lahUgfC 4ZeG14Nmc1RONYVpVO4QnhCgMe1bnaDuKWXVtd3uApjpeNBkKlwu3U5vky5jgAr7Xz6xuYWWAa9XE iJySDIWSuoPCZZhp8eHTbnPUMx4bYbMkwkDh0jdKnKRrapMEkCspX8UVL23s8GysQu57KyaldcSbA tK1U822LGc3aPIwZ1IGBmSFraTuS/cw34cs7c75VamyY/sKowjzpvuaumjvUBl5T1HOL08j1HOyvy ex9OvESKMWUdImfhBqWIXPC3g1bfBe0dG5VEfAkLjPz6M5N7LlAL233LhCvN73VYHlBqqu69DKm+s 6s0KgN3Vy1sLLb4MogZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhZ-008NVx-MQ; Tue, 10 Jan 2023 19:54:29 +0000 Received: from madras.collabora.co.uk ([2a00:1098:0:82:1000:25:2eeb:e5ab]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKh7-008NOv-IU; Tue, 10 Jan 2023 19:54: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 D21096602D93; Tue, 10 Jan 2023 19:53:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673380438; bh=DQ1lSSmLlKw1V2qE5V5/GrXF6T+Z9D5U9iRwAWX3sco=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PaxMQglptCncEgUmVaIoHY/w5I4emzip73uVg5J1MPZrLZfODx5o+wDyrhIy21VIq QyrZ70GRR9Q5vgsRbVgdYF2mlNRuu20K2M2mShwqizAZ6Xlq6Yzeps5sRTW4HuvKeS kOUhusrp3QVh+XbEIUhhO5tmxLKjALq0Md3Pj8ZNUK3cxFZr7H6jstBiIFtDTG+46x zwMlFOVuCJFALG5iQCFLTOlESvPvgYZEmpQdhKFqhCLJsfuGD7geBOOmNIREwI1sWi 1WTFDv+9yNC+RN53e9mx+xY43tAocU6KkXsd6OU6TXstjz28VNggwI1b8U0ER7U8Fw 4A6AdS5FgL9HA== 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 v2 3/3] arm64: dts: rockchip: Update sdhci alias for rock-5b Date: Tue, 10 Jan 2023 19:53:52 +0000 Message-Id: <20230110195352.272360-4-chris.obbard@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230110195352.272360-1-chris.obbard@collabora.com> References: <20230110195352.272360-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_115401_879636_28EA3457 X-CRM114-Status: GOOD ( 12.78 ) 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; };