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 B313F1448F3; Thu, 11 Apr 2024 10:07:43 +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=1712830063; cv=none; b=hdXJtKRUv9OMCTSVeuMhN4jLd7YOEFC9NlouugkXX1RC1UEIDneXPdWftomOkRE6dNQNpg8mnkRJ96ngiHaSBNzu02uwMj98Egx/idAiuiXzSZSBwTTjkVuMFFEaiKQeHOnl6AkLRafyMQEgo0GW1fJCmNUFX0ifF3YdFEwBHc4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830063; c=relaxed/simple; bh=k/vL9GZP7WqFXkLuJhrnceOeiYI94/ooliWMB8qokQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sqH5VMlV6PsI+UnhgwW6a2sk+lHpJLsWZItDymSKK13te36QWt4l2OjzSeNPtRClcByGA+PucRSPWvtu4g/hsDqepwBVL2+b5PvLw0TBIwMnKJPtcN2SozXZ2GqpiKCEpo5QdtBphHzBcKpCS3AD6lDtsrElAHIVT7jN59zG05A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YfG/z87A; 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="YfG/z87A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C004C433C7; Thu, 11 Apr 2024 10:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830063; bh=k/vL9GZP7WqFXkLuJhrnceOeiYI94/ooliWMB8qokQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YfG/z87AoPs42f1nIIECVA25K1uEgKBGrEczR8hQUcjJrOf7iup/xdHHiBaGnAFy8 E6jcsk9ltWTO4kcgkrJJiQPEz0fI3T/0HpAqwJgPLnDVv4oRWq6SQ04C859Z2YtLzg +Etm3lZFu3FPl5ydIxTbpEJK9pHrRFM337Y+W9/s= 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 6.8 023/143] arm64: dts: rockchip: fix rk3399 hdmi ports node Date: Thu, 11 Apr 2024 11:54:51 +0200 Message-ID: <20240411095421.609170708@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095420.903937140@linuxfoundation.org> References: <20240411095420.903937140@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 6.8-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 6e12c5a920cab..fe818a2700aa7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1956,6 +1956,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>, @@ -1964,13 +1965,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>; @@ -1983,6 +1987,10 @@ hdmi_in_vopl: endpoint@1 { remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; }; -- 2.43.0