Skip to content

Commit f44e8f9

Browse files
committed
Merge tag 'qcom-arm64-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes
Qualcomm ARM64 DTS one more fix for 5.15 This reverts a clock change in the Qualcomm RB5 devicetree which in some combinations of firmware and configuration causes the device to crash during boot. Data on an adjacent platform indicates that this is probably not be the root cause of the problem, but this resolves the regression seen on RB5 and will allow the SM8250 platform to boot v5.15. * tag 'qcom-arm64-fixes-for-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: Revert "arm64: dts: qcom: sm8250: remove bus clock from the mdss node for sm8250 target" Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 36b6dcb + e091b83 commit f44e8f9

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/arm64/boot/dts/qcom/sm8250.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2590,9 +2590,10 @@
25902590
power-domains = <&dispcc MDSS_GDSC>;
25912591

25922592
clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
2593+
<&gcc GCC_DISP_HF_AXI_CLK>,
25932594
<&gcc GCC_DISP_SF_AXI_CLK>,
25942595
<&dispcc DISP_CC_MDSS_MDP_CLK>;
2595-
clock-names = "iface", "nrt_bus", "core";
2596+
clock-names = "iface", "bus", "nrt_bus", "core";
25962597

25972598
assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
25982599
assigned-clock-rates = <460000000>;

0 commit comments

Comments
 (0)