arm64: dts: qcom: apq8096-db820c: fix missing clock populate

Commit 704e26678c8d ("arm64: dts: qcom: apq8096-db820c: 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: 704e26678c8d ("arm64: dts: qcom: apq8096-db820c: drop simple-bus from clocks")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20230901081812.19121-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 385b178..3067a40 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -62,25 +62,23 @@
                stdout-path = "serial0:115200n8";
        };
 
-       clocks {
-               divclk4: divclk4 {
-                       compatible = "fixed-clock";
-                       #clock-cells = <0>;
-                       clock-frequency = <32768>;
-                       clock-output-names = "divclk4";
+       div1_mclk: divclk1 {
+               compatible = "gpio-gate-clock";
+               pinctrl-0 = <&audio_mclk>;
+               pinctrl-names = "default";
+               clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
+               #clock-cells = <0>;
+               enable-gpios = <&pm8994_gpios 15 0>;
+       };
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&divclk4_pin_a>;
-               };
+       divclk4: divclk4 {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <32768>;
+               clock-output-names = "divclk4";
 
-               div1_mclk: divclk1 {
-                       compatible = "gpio-gate-clock";
-                       pinctrl-0 = <&audio_mclk>;
-                       pinctrl-names = "default";
-                       clocks = <&rpmcc RPM_SMD_DIV_CLK1>;
-                       #clock-cells = <0>;
-                       enable-gpios = <&pm8994_gpios 15 0>;
-               };
+               pinctrl-names = "default";
+               pinctrl-0 = <&divclk4_pin_a>;
        };
 
        gpio-keys {