From patchwork Wed Jul 5 14:10:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Obbard X-Patchwork-Id: 13302195 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 90D9DEB64DA for ; Wed, 5 Jul 2023 14:10:56 +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=DWXO59qXrDfLYl29Q+ZkNRjweyTm+G2Hn09UbuW7KRk=; b=cdX1l6xkeIVhMq 7fICKrWZ7kihoRvQRcQixibixyKERHt9nSClPdON4hvHzTfh6gK/d5NaG4ZCxAmb0G+WMpgxrylv9 +lwKIFSO30d4lKufw9oY966EJifa8YoKYR1voZBuWLrzP/lopl6NVRX9cHwrXbEX7fzJfPeFowIII Iq8iYwgwWQtJt/5WsTXJrqNHlhsGnUXtUi9cS0yPpZhEPbmHFzcgvwxbg9rkrKswH1yR+HCGtiZ5C rCEGq4+CASnBLZst27m7m+BSo4Dhqm+ImCqti7klLlE9cw2dZMJU3g64NM7EMH5EvtwhM163/OI5V wTj+aX/WwsJn55QqsTCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qH3DK-00G53k-1q; Wed, 05 Jul 2023 14:10:38 +0000 Received: from madras.collabora.co.uk ([46.235.227.172]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qH3DD-00G4zn-1T; Wed, 05 Jul 2023 14:10:32 +0000 Received: from obbardc-t14.home (unknown [IPv6:2a00:23c8:b70a:ae01:7599:ed26:1798:f430]) (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 8F8916606FBB; Wed, 5 Jul 2023 15:10:28 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1688566228; bh=fl22C7uQE0nIwjINET+l+iT5MZzv1U3bD6YeVO94hJE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aogTz2beTFu7sAfcD18VNGJTVJkSDuiH9hCq86pyAyTaKXcbctYcLDnLhs8PW81Y+ EczDvNW6JultzTtC2TI91ahZh3/JRp6An5NX3lmLQAZMFs7xs0B5tLoCxP27mnujfN E0yASiXD23CN69+cz9x3VxXWoTmbH3/L5ec2fOyCp8jEi5c7y+uchZmt1oKIxnILZ9 75Wj1CD+yR8fkjNkHoTRaUaXsrU0fRmEil9s+FjcRuU/uSLpczu1WXn/+Da7XgOcnS PaK3hm3hQeKAlg6OjIi7fO9WUBcjSzh0cr37kdLw2EPB16ppTBONdOsX8xGZI/ptRz +7W8fcfBf1iUg== From: Christopher Obbard To: linux-rockchip@lists.infradead.org Cc: kernel@collabora.com, Christopher Obbard , Conor Dooley , FUKAUMI Naoki , Heiko Stuebner , Jagan Teki , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] arm64: dts: rockchip: Move OPP table from ROCK Pi 4 dtsi Date: Wed, 5 Jul 2023 15:10:09 +0100 Message-Id: <20230705141011.111568-2-chris.obbard@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230705141011.111568-1-chris.obbard@collabora.com> References: <20230705141011.111568-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-20230705_071031_621690_FCD69C48 X-CRM114-Status: GOOD ( 12.75 ) 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 The ROCK 4SE uses the RK3399-T variant of the RK3399 SoC, which has some changes to the OPP tables. Prepare for the bringup of this SoC by moving the inclusion of existing OPP tables from the common devicetree into each board-specific devicetree. Signed-off-by: Christopher Obbard --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 1 + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 1 + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 907071d4fe80..ec307ee20c66 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -9,7 +9,6 @@ #include #include #include "rk3399.dtsi" -#include "rk3399-opp.dtsi" / { aliases { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts index 89f2af5e111d..931334aa3d62 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "rk3399-rock-pi-4.dtsi" +#include "rk3399-opp.dtsi" / { model = "Radxa ROCK Pi 4A"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts index 0806545922f5..e98a182f8572 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts @@ -6,6 +6,7 @@ /dts-v1/; #include "rk3399-rock-pi-4.dtsi" +#include "rk3399-opp.dtsi" / { model = "Radxa ROCK Pi 4B"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts index 4053ba72618c..d32efab74e94 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3399-rock-pi-4.dtsi" +#include "rk3399-opp.dtsi" / { model = "Radxa ROCK Pi 4C";