From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E46F149DFD; Fri, 29 Mar 2024 12:44:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716252; cv=none; b=PfmdMnVkwFsewp0pMZLUgMBRsJ6C9xNE5eqQ1FrL69nTjNBrh9eBrdbx7x7V0ReregnnnGXMLO+sAEuqgJ9EjgB9cwppBwUwMqnJw8fNGOS9WhtE/oPNEmfIFYKyxfeEsr931UY/iJsAbKANBbWPVV7scnwM7rOQDGG8eT4dUgU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716252; c=relaxed/simple; bh=7c9SL6HaFtqcj1ILppO2zgC9RFH/L+E/p3c7nIcweV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZbqBq2roKQGjjnOgQl5XeIVE9TXFadeVaIHbSdmipbnwJBWIfSw92inH8xQdCAi1Pwk0pB9Wl4F7KCxTo7BHqGO8VTcKqjaTdqRBKcyLd1CuXTmZn76sbEApsyr60dtvvFjJnfr99FNR5DhidyTAeR1oMqN1Qldu1aDXzctldJE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t2F4SMjG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="t2F4SMjG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 69DFCC433F1; Fri, 29 Mar 2024 12:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716252; bh=7c9SL6HaFtqcj1ILppO2zgC9RFH/L+E/p3c7nIcweV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t2F4SMjGHKZ9NLRYepyhHZ3lAdg6aE3djnL5eAaUuCV5a510ACZRmXi8ttLk1KuAC 7e3jR3+fTHIYvUYaIjk1gzq1y2frbWCRsKekVehKkW1c96NEhVZeEyg1Q9ZSeViyRc lRBKkSl9StODPkYPIHTuEU+UzGci8cfcNG38cqOOFjwXeATNW2zAGnlH+CDiOnIRsZ BtL/JJvl7ReWQfXVwxrMdblLX5MQqmTdTP1RB3/yI1U/rz4KyCvAZt95ZgU5daLlRw 1pUEhQUwDvtJbxDRrv5Gsb3VCWHLpukONfjY49wMS9DeWhUXbS8CsnGW5ootKlBc4Y 8VUjgv0wfLAOQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Jonker , Heiko Stuebner , Sasha Levin , robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, dsimic@manjaro.org, quentin.schulz@theobroma-systems.com, lukasz.luba@arm.com, s.hauer@pengutronix.de, rick.wertenbroek@gmail.com, chris.obbard@collabora.com, knaerzche@gmail.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 6.6 22/75] arm64: dts: rockchip: fix rk3399 hdmi ports node Date: Fri, 29 Mar 2024 08:42:03 -0400 Message-ID: <20240329124330.3089520-22-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124330.3089520-1-sashal@kernel.org> References: <20240329124330.3089520-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.23 Content-Transfer-Encoding: 8bit From: Johan Jonker [ Upstream commit f051b6ace7ffcc48d6d1017191f167c0a85799f6 ] Fix rk3399 hdmi ports node so that it matches the rockchip,dw-hdmi.yaml binding. Signed-off-by: Johan Jonker Link: https://lore.kernel.org/r/a6ab6f75-3b80-40b1-bd30-3113e14becdd@gmail.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 4a3d0af5ecfe2..fb1ea84c2b14f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1953,6 +1953,7 @@ simple-audio-card,codec { hdmi: hdmi@ff940000 { compatible = "rockchip,rk3399-dw-hdmi"; reg = <0x0 0xff940000 0x0 0x20000>; + reg-io-width = <4>; interrupts = ; clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_SFR>, @@ -1961,13 +1962,16 @@ hdmi: hdmi@ff940000 { <&cru PLL_VPLL>; clock-names = "iahb", "isfr", "cec", "grf", "ref"; power-domains = <&power RK3399_PD_HDCP>; - reg-io-width = <4>; rockchip,grf = <&grf>; #sound-dai-cells = <0>; status = "disabled"; ports { - hdmi_in: port { + #address-cells = <1>; + #size-cells = <0>; + + hdmi_in: port@0 { + reg = <0>; #address-cells = <1>; #size-cells = <0>; @@ -1980,6 +1984,10 @@ hdmi_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; }; -- 2.43.0