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 0EDDA145FF0; Thu, 11 Apr 2024 10:05:11 +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=1712829912; cv=none; b=YS0fE/Z+jKRvuKaPHHGPygTkdMf8bxn/RyPg+JSdqZ1sfRn4HxjhGX+AWjhTDsn78k3F25CYM6xu2lgysmFuvOANdMEl6en8r3Tz8x4LFP6SAb9Shll9MF1WJTWpc3MKmJeSnwOLgiheFqtPo3/V0w8JwAruebKWOGtXdrfq42I= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712829912; c=relaxed/simple; bh=ZtEmns+Diz69ysGSQlZh339Uq6o/rsZ69Dj8k9l0BNI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E//2fN8ohmfTlPOsoiLFxHvXBt7iDCfhMtvjABiaIo24GnIwxguq0gSZlqc21tjSBGbN+p/9mowk4/dU2YkgqBU91ZIzo1bAUdD8dF4ZSESn9wcTmC6kKgFly2aE6yx1GaZ5cBmeNIoDO1UCN5mfM1dv1EHwQApkiTpb4wGzC2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TMNLd56f; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="TMNLd56f" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B3F4C433F1; Thu, 11 Apr 2024 10:05:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712829911; bh=ZtEmns+Diz69ysGSQlZh339Uq6o/rsZ69Dj8k9l0BNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TMNLd56fEg08e9V9v8SfBPHA0Ujh5X740CECrGlZcOZj8J6vG+0owDCLEZ2rSTiqA 8xVZ4bWUOVHoBI4EyD2P8M9CnZvuycgGRGF45+wSnlzmPvOId5sNxYngEC+4JoRR02 nmg0NzRoPHKx81XafLL/j/pyt+PHcaPTWAHpPcv4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Jonker , Heiko Stuebner , Sasha Levin Subject: [PATCH 4.19 147/175] arm64: dts: rockchip: fix rk3399 hdmi ports node Date: Thu, 11 Apr 2024 11:56:10 +0200 Message-ID: <20240411095423.988953469@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095419.532012976@linuxfoundation.org> References: <20240411095419.532012976@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ 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 5a60faa8e9998..f19d43021a4e7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1683,6 +1683,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>, @@ -1691,13 +1692,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>; @@ -1710,6 +1714,10 @@ hdmi_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; }; -- 2.43.0