Skip to content

Commit 13649a4

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9896dde + b2c547c commit 13649a4

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138

139139
&hdmi {
140140
core-vdda-supply = <&pm8921_hdmi_switch>;
141-
hpd-gpios = <&tlmm_pinmux 72 GPIO_ACTIVE_HIGH>;
142141
status = "okay";
143142
};
144143

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -768,15 +768,17 @@
768768
<&dsi0_phy 0>,
769769
<&dsi1_phy 1>,
770770
<&dsi1_phy 0>,
771-
<&hdmi_phy>;
771+
<&hdmi_phy>,
772+
<&mdp>;
772773
clock-names = "pxo",
773774
"pll3",
774775
"pll8_vote",
775776
"dsi1pll",
776777
"dsi1pllbyte",
777778
"dsi2pll",
778779
"dsi2pllbyte",
779-
"hdmipll";
780+
"hdmipll",
781+
"lvdspll";
780782
};
781783

782784
l2cc: clock-controller@2011000 {
@@ -1435,13 +1437,19 @@
14351437
<&mmcc MDP_AXI_CLK>,
14361438
<&mmcc MDP_LUT_CLK>,
14371439
<&mmcc HDMI_TV_CLK>,
1438-
<&mmcc MDP_TV_CLK>;
1440+
<&mmcc MDP_TV_CLK>,
1441+
<&mmcc LVDS_CLK>,
1442+
<&rpmcc RPM_PXO_CLK>;
14391443
clock-names = "core_clk",
14401444
"iface_clk",
14411445
"bus_clk",
14421446
"lut_clk",
14431447
"hdmi_clk",
1444-
"tv_clk";
1448+
"tv_clk",
1449+
"lcdc_clk",
1450+
"pxo";
1451+
1452+
#clock-cells = <0>;
14451453

14461454
iommus = <&mdp_port0 0
14471455
&mdp_port0 2

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@
154154
<GIC_PPI 3 0x301>;
155155
reg = <0x0200a000 0x100>;
156156
clock-frequency = <27000000>;
157+
clocks = <&sleep_clk>;
158+
clock-names = "sleep";
157159
cpu-offset = <0x80000>;
158160
};
159161

0 commit comments

Comments
 (0)