SM6115, SM4250 and QRB4210 have board-level clocks (XO, sleep)
definitions split between the SoC dtsi file and the board file.
This is not optimal, as the clocks are a part of the SoC + PMICs design.
Frequencies are common for the whole set of devices using the same SoC.
Remove the split and move frequencies to the SoC DTSI file.
Suggested-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 8 --------
arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 8 --------
arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 8 --------
arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 ++
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 8 --------
5 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index d8d4cff7d5abed405d1b4cdf9ab8264aab076830..675f9057ed442fb4afd22064b4022df5ed8cb882 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -544,10 +544,6 @@ can@0 {
};
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&tlmm {
gpio-reserved-ranges = <43 2>, <49 1>, <54 1>,
<56 3>, <61 2>, <64 1>,
@@ -695,7 +691,3 @@ &wifi {
status = "okay";
};
-
-&xo_board {
- clock-frequency = <19200000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
index 9153a5a55ed9fe82ea6771ef87dae5620a4fbf2f..ae65dc2abe510d35f1aeeeac5ccf5c576d688734 100644
--- a/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
+++ b/arch/arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts
@@ -193,10 +193,6 @@ vreg_l24a: l24 {
};
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&sdhc_2 {
vmmc-supply = <&vreg_l22a>;
vqmmc-supply = <&vreg_l5a>;
@@ -254,7 +250,3 @@ &usb_hsphy {
vdda-phy-dpdm-supply = <&vreg_l15a>;
status = "okay";
};
-
-&xo_board {
- clock-frequency = <19200000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
index f60d36c03b9b51d1ba5fb2db7d619916fe42f084..5cf0d2383019abec53f875c727e86656f3ac4478 100644
--- a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
@@ -471,10 +471,6 @@ &sdhc_2 {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&tlmm {
gpio-reserved-ranges = <0 4>, <14 4>;
@@ -570,7 +566,3 @@ &wifi {
status = "okay";
};
-
-&xo_board {
- clock-frequency = <19200000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index 9b23534c456bde8c400cc331e847f0f84ae0b74a..29eb179ac519dd0965977902ca0edf6a06fa147b 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -28,11 +28,13 @@ clocks {
xo_board: xo-board {
compatible = "fixed-clock";
#clock-cells = <0>;
+ clock-frequency = <19200000>;
};
sleep_clk: sleep-clk {
compatible = "fixed-clock";
#clock-cells = <0>;
+ clock-frequency = <32764>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index 9d78bb3f71901705fd22d88b472f6fc1d0c0fffb..27936023175bcb73e73a85b463c4b9f5c00541cb 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -305,10 +305,6 @@ &sdhc_2 {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&tlmm {
gpio-reserved-ranges = <14 4>;
@@ -382,7 +378,3 @@ &wifi {
qcom,ath10k-calibration-variant = "Lenovo_P11";
status = "okay";
};
-
-&xo_board {
- clock-frequency = <19200000>;
-};
--
2.39.5