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: 13095609 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 C819DC54EBC for ; Tue, 10 Jan 2023 19:55:07 +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=1cDoFBEIdcQcoK+79YJUNwJd9G0eadTXx35ViXSNrSI=; b=GtFy72iJ1dXnJU ePtcIIGb9+A35UnxNBYdVMBHgmzvSwjz/HDA69oR8ntLeytHJmHWsoo6F2mwMdk8VnTXwaFNascEn njej1bDNaKAE9IC53n/SPRP+FSTrJY2ey75fuj2NIoVdxfYHtyS7o6zpYuUp1cnWAGS//BCrYjdPn NJ46OgEzLV1eJH90HS3R8TKxNd+87PuBizV6nVYyiZ2rmFLjUYDvRVZBGVBzl8sLn7e1jEK0YgVpR 04bCj99BdBPjyzJfmI8aIqd2s7gMJiS8BNbX0AGm/LsMRHe+oKMhjK1uQiA/qbLQ3G8S1TULUl91E j7b6KXwTXTa45V5jYamQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhB-008NQV-Rb; Tue, 10 Jan 2023 19:54:05 +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-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 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: 13095608 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 8CB21C46467 for ; Tue, 10 Jan 2023 19:55:07 +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=hXIgrdstPPcj0TLecU7vBfApT2mVH4TlMlCoe6EqihU=; b=W39RNDtQdScQ1d FwsgLE0lJi4wlOxcHrELlykGYOx2YmtTZCOKdNyYY4A6SfhrKGfffVc3plM9SCgzDhAXNG1wlWgtM i5AZeAyt4YLfEeKfqeKMlfSsH9uJqvnjbApgkJYoR8d1FGNd57XSyNANSNkuZk3gAhiL2sSOKoDde eDV2ReH7JkiJX8PtE2LwFE4zSvJ5U9dzSkNOB12Y0oaPSPDzPTBGxLj84zCe6c65ZSFCbIuHm4iVw H9KxqyHTjQ4bTy5RBkF2CAjbesSL8jje1YD/Ny4x2tD42nnpavyZLdlOj8ebDOEQyDdu6Z3Yo7QYw 7I+Pb7VL0XIThZKI3t3w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhJ-008NRJ-Eb; Tue, 10 Jan 2023 19:54:13 +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-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 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: 13095610 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 CDF4DC54EBC for ; Tue, 10 Jan 2023 19:55:18 +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=oygX2KRhc7NSQaPZzTDfHHrLZ6Ul0QRNAg0bQbfQEDw=; b=zN/NQXSrLB0bye 8WACFFyS00fsTbAk1EMxneSFaa9VfKeZWCsmYnGZnIVFDjUo+66Swbuy12S0tXKwXWV/rGH7cNhz1 MiCb2q/z/mP/Vp8Cx6BQf+jMLyCkwI1DH2kNa40DoahJg+438z38dExqX8yDflZJyEgeilMSsh1iH jt+JhGF6Hz0oQ8nT18xagiixrfYWCUerUheD36na7JUlqi7SNEmby1wJ11tWClHAelQBPMaEz+0Uw ThiKqvyclFNtMhUlrjAkuZa5nwlmS9FQAQDznRM/7j6tn7bLtYcI3ktpNRF0vajkH58lvaUIrXthg 8g2YVu1yYjpRN2SawyGg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pFKhR-008NSG-R2; 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-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-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 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; };