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 3FF8C172797; Fri, 29 Mar 2024 12:35:00 +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=1711715700; cv=none; b=bO7pGaTtxmnXEbxiiLigaqOc6ENNBJ3qxZ5LMDFg45R7g/EZsI5yLnkyss1eU9f2yAlwXIkLhZUvTmkr6hQ4cSSnLZ3FTXcEVZlDTQE5WRpuoJp9o5kgdFBtlYjg7depWp5mPB+NiBG6SGSp3uJSXkX63ZvgRuM9eiHtrY4kCQQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711715700; c=relaxed/simple; bh=V52EbVAy2r4mrqffOnFZrJCyqX/WHbQWIBaOCzvqbNw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O3K+6kpw5YTznkeTOGCo+KrlDoP3RzjcCLUU77+1xQyJ+pwL7rse0dsM8cNy5WgbnGhVda1ZpbucOHa0fM4b9aPl5E5P07vEeoCSACGXhMEcQSQjSnwY4cyPzKrVm30nrTk+UQCubLVbGYZfg+uk/+CLyskrOWHQibkQ1y0eogg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sRofLUMw; 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="sRofLUMw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2AD5C43390; Fri, 29 Mar 2024 12:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711715699; bh=V52EbVAy2r4mrqffOnFZrJCyqX/WHbQWIBaOCzvqbNw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sRofLUMwqhTgvt9WX6v7WkrJIidqkHlIcghkTa2PnpbniBCONKmAjQpEP/N8jcCGO dLi6f6pYVGQVBoHbztahONDjOZpF+SqycCS76FZD0IN8BVTaNAraYPAaQRT6FxY4Ke 6WfPBuwLVykTOBzCE2brYGpeIPuQcJlnmFTItVAVhj7ckf6+OJkLQwVkLm30Y8WU11 hCapHgGrXHr4Uwd1BqEWS1BvDmMbCxxny27ZlICN9k8pQTDiq1jb0ibZyzw+bdcaDa H0SG1I4a0tJnzP1A7MaT+P6B/f+mFm1hHFplUAMqdz5iysVTUW3R2OFT8K258kLnbI ZNIb7VOVjwxZw== 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, chris.obbard@collabora.com, knaerzche@gmail.com, quentin.schulz@theobroma-systems.com, lukasz.luba@arm.com, rick.wertenbroek@gmail.com, s.hauer@pengutronix.de, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 07/15] arm64: dts: rockchip: fix rk3399 hdmi ports node Date: Fri, 29 Mar 2024 08:34:30 -0400 Message-ID: <20240329123445.3086536-7-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329123445.3086536-1-sashal@kernel.org> References: <20240329123445.3086536-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 5.4.273 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 4496f7e1c68f8..e5a25bc7d7997 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1743,6 +1743,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>, @@ -1751,13 +1752,16 @@ hdmi: hdmi@ff940000 { <&cru PLL_VPLL>; clock-names = "iahb", "isfr", "cec", "grf", "vpll"; 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>; @@ -1770,6 +1774,10 @@ hdmi_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; }; -- 2.43.0