Unverified Commit 13649a41 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm32-for-6.16-2' of... 

Merge tag 'qcom-arm32-for-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

More Arm32 DeviceTree updates for v6.16

This adds missing LVDS clocks to APQ8064 display controller. The unused HDMI HPD
gpio on ifc6410 is dropped (chip uses pinmuxed hpd function).

Missing timer clocks are added to MSM8960 to address bindings warning.

* tag 'qcom-arm32-for-6.16-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: apq8064-ifc6410: drop HDMI HPD GPIO
  ARM: dts: qcom: apq8064: link LVDS clocks
  ARM: dts: qcom-msm8960: add missing clocks to the timer node

Link: https://lore.kernel.org/r/20250520024716.39418-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9896dde1 b2c547cf

arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ &gsbi7_serial { 


&hdmi {

	core-vdda-supply = <&pm8921_hdmi_switch>;

	hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/qcom/qcom-apq8064.dtsi

+12 −4
Original line number Diff line number Diff line
@@ -768,7 +768,8 @@ mmcc: clock-controller@4000000 { 
				 <&dsi0_phy 0>,

				 <&dsi1_phy 1>,

				 <&dsi1_phy 0>,

				 <&hdmi_phy>;

				 <&hdmi_phy>,

				 <&mdp>;

			clock-names = "pxo",

				      "pll3",

				      "pll8_vote",
@@ -776,7 +777,8 @@ mmcc: clock-controller@4000000 { 
				      "dsi1pllbyte",

				      "dsi2pll",

				      "dsi2pllbyte",

				      "hdmipll";

				      "hdmipll",

				      "lvdspll";

		};



		l2cc: clock-controller@2011000 {
@@ -1435,13 +1437,19 @@ mdp: display-controller@5100000 { 
				 <&mmcc MDP_AXI_CLK>,

				 <&mmcc MDP_LUT_CLK>,

				 <&mmcc HDMI_TV_CLK>,

				 <&mmcc MDP_TV_CLK>;

				 <&mmcc MDP_TV_CLK>,

				 <&mmcc LVDS_CLK>,

				 <&rpmcc RPM_PXO_CLK>;

			clock-names = "core_clk",

				      "iface_clk",

				      "bus_clk",

				      "lut_clk",

				      "hdmi_clk",

				      "tv_clk";

				      "tv_clk",

				      "lcdc_clk",

				      "pxo";



			#clock-cells = <0>;



			iommus = <&mdp_port0 0

				  &mdp_port0 2

arch/arm/boot/dts/qcom/qcom-msm8960.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -154,6 +154,8 @@ timer@200a000 { 
				     <GIC_PPI 3 0x301>;

			reg = <0x0200a000 0x100>;

			clock-frequency = <27000000>;

			clocks = <&sleep_clk>;

			clock-names = "sleep";

			cpu-offset = <0x80000>;

		};