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 EEA64145FE7; Thu, 11 Apr 2024 10:07:34 +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=1712830055; cv=none; b=LPQAbUvJBtspKPljvbwzojD52+K8p6nxYrRLmfF0i8vGWwdwA4jWkUcgVcEOEE6XHlts8ZBZq/oLGUFTHYm9+c5dYryZY5wqc+4BN7UX88S9cEjESqBDNvRlHVS6A7DOusVWw2zrLbGy9YdMJn1Gl9DfkspRnyyrDftSQx0Lduc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830055; c=relaxed/simple; bh=+pED2Je3eOZ4uwP1GqmV9xkuTCyY+YXzNIJIdPdZ1H0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qx9jGY72wufqpdZ90OHF2rZQkMOYEdAbIpSOdMXnfT6/ppCApR3+7Eed7nMcowwOd/gdJHC6kbFpa7dOU1JlOyjfmLw80hfBDTwA0Y1cwhtInf8kMYcz9HkpxPeVBneVsdNSq5odWXI8++/rs7O/Tv7X+GGxn8ne97q6odvYoqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pd7YMOa/; 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="pd7YMOa/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76E5AC43390; Thu, 11 Apr 2024 10:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830054; bh=+pED2Je3eOZ4uwP1GqmV9xkuTCyY+YXzNIJIdPdZ1H0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pd7YMOa/HhOmnGZoptjqTN1J8C1HVlKGeTu1i7vCZMH7DM848PfhFXUtv2Dsj146A W0bxtEBK2oQAc8m6nlxzyrpwHcjTaJwyMeS/mIdX1WkBx+uff4w3HqQ0PMUzLrm0x2 OKsRgsvuxm+Yacu964H4q5Y1hEJEQn44Rk4PPKcQ= 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 020/143] ARM: dts: rockchip: fix rk3288 hdmi ports node Date: Thu, 11 Apr 2024 11:54:48 +0200 Message-ID: <20240411095421.519037207@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 585e4dc07100a6465b3da8d24e46188064c1c925 ] Fix rk3288 hdmi ports node so that it matches the rockchip,dw-hdmi.yaml binding with some reordering to align with the (new) documentation about property ordering. Signed-off-by: Johan Jonker Link: https://lore.kernel.org/r/cc3a9b4f-076d-4660-b464-615003b6a066@gmail.com Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm/boot/dts/rockchip/rk3288.dtsi | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3288.dtsi b/arch/arm/boot/dts/rockchip/rk3288.dtsi index ead343dc3df10..3f1d640afafae 100644 --- a/arch/arm/boot/dts/rockchip/rk3288.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3288.dtsi @@ -1240,27 +1240,37 @@ hdmi: hdmi@ff980000 { compatible = "rockchip,rk3288-dw-hdmi"; reg = <0x0 0xff980000 0x0 0x20000>; reg-io-width = <4>; - #sound-dai-cells = <0>; - rockchip,grf = <&grf>; interrupts = ; clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>; clock-names = "iahb", "isfr", "cec"; power-domains = <&power RK3288_PD_VIO>; + 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>; + hdmi_in_vopb: endpoint@0 { reg = <0>; remote-endpoint = <&vopb_out_hdmi>; }; + hdmi_in_vopl: endpoint@1 { reg = <1>; remote-endpoint = <&vopl_out_hdmi>; }; }; + + hdmi_out: port@1 { + reg = <1>; + }; }; }; -- 2.43.0