Commit 725f5936 authored Sep 01, 2023 by Krzysztof Kozlowski Committed by Bjorn Andersson Sep 19, 2023

arm64: dts: qcom: msm8996-xiaomi: fix missing clock populate

Commit 338958e3 ("arm64: dts: qcom: msm8996-xiaomi: drop simple-bus
from clocks") removed "simple-bus" compatible from "clocks" node, but
one of the clocks - divclk1 - is a gpio-gate-clock, which does not have
CLK_OF_DECLARE. This means it will not be instantiated if placed in
some subnode. Move the clocks to the root node, so regular devices will
be populated.

Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Closes: https://lore.kernel.org/all/CAA8EJprF==p87oN+RiwAiNeURF1JcHGfL2Ez5zxqYPRRbN-hhg@mail.gmail.com/

Cc: stable@vger.kernel.org
Fixes: 338958e3 ("arm64: dts: qcom: msm8996-xiaomi: drop simple-bus from clocks")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230901081812.19121-2-krzysztof.kozlowski@linaro.org

Signed-off-by: Bjorn Andersson <andersson@kernel.org>

parent 2ca3e844

arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi

+15 −17

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@
		#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>

		/ {
		clocks {
		divclk1_cdc: divclk1 {
		compatible = "gpio-gate-clock";
		clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
		@@ -31,7 +30,6 @@ divclk4: divclk4 {
		pinctrl-names = "default";
		pinctrl-0 = <&divclk4_pin_a>;
		};
		};

		gpio-keys {
		compatible = "gpio-keys";

+8 −10

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ / {
		qcom,pmic-id = <0x20009 0x2000a 0x00 0x00>;
		qcom,board-id = <31 0>;

		clocks {
		divclk2_haptics: divclk2 {
		compatible = "fixed-clock";
		#clock-cells = <0>;
		@@ -31,7 +30,6 @@ divclk2_haptics: divclk2 {
		pinctrl-0 = <&divclk2_pin_a>;
		};
		};
		};

		&adsp_pil {
		firmware-name = "qcom/msm8996/gemini/adsp.mbn";