SM8550 is one of the platforms where board-level clocks (XO, sleep)
definitions are 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/qcs8550-aim300.dtsi | 8 --------
arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 8 --------
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 8 --------
arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 8 --------
arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 8 --------
arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 8 --------
arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 ++
7 files changed, 2 insertions(+), 48 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi b/arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi
index e6ac529e6b7216ac4b9e10900c5ddc9a06c9011c..9f1f99f892f5f92ba0e44bd9cc3daeb2916387b2 100644
--- a/arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi
@@ -366,10 +366,6 @@ &pm8550b_eusb2_repeater {
vdd3-supply = <&vreg_l5b_3p1>;
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&ufs_mem_hc {
reset-gpios = <&tlmm 210 GPIO_ACTIVE_LOW>;
vcc-supply = <&vreg_l17b_2p5>;
@@ -399,7 +395,3 @@ &usb_dp_qmpphy {
vdda-phy-supply = <&vreg_l3e_1p2>;
vdda-pll-supply = <&vreg_l3f_0p88>;
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index 29bc1ddfc7b25f203c9f3b530610e45c44ae4fb2..656c2b1facd656736495d103b7aa57708d6ad38b 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -1171,10 +1171,6 @@ &sdhc_2 {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&swr0 {
status = "okay";
@@ -1367,7 +1363,3 @@ &usb_dp_qmpphy {
&usb_dp_qmpphy_out {
remote-endpoint = <&pmic_glink_ss_in>;
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 5648ab60ba4c4bfaf5baa289969898277ee57cef..0e04ca10d04cefe197bc3278675809f73d61b65a 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -824,10 +824,6 @@ &sdhc_2 {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&swr0 {
status = "okay";
@@ -971,7 +967,3 @@ &usb_dp_qmpphy {
&usb_dp_qmpphy_out {
remote-endpoint = <&pmic_glink_ss_in>;
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 3a6cb279130489168f8d20a6e27808647debdb41..63b5f4be6fe91af799104d1384624b0a4dc592fe 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -1004,10 +1004,6 @@ &remoteproc_mpss {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&swr0 {
status = "okay";
@@ -1229,7 +1225,3 @@ &usb_dp_qmpphy {
&usb_dp_qmpphy_out {
remote-endpoint = <&redriver_ss_in>;
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts b/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
index e8383faac576a2f401fff74231a764712c832291..9d319a0c89be4b67ff4f2934b5526ce2ab5734cc 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts
@@ -564,10 +564,6 @@ &remoteproc_mpss {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&tlmm {
gpio-reserved-ranges = <36 4>, <50 2>;
};
@@ -587,7 +583,3 @@ &ufs_mem_phy {
vdda-pll-supply = <&vreg_l3e_1p2>;
status = "okay";
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
index d90dc7b37c4a74cbfb03c929646fda3381413084..0e03ab2ac2eed716712833195ae56f5689a577cb 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts
@@ -721,10 +721,6 @@ &sdhc_2 {
status = "okay";
};
-&sleep_clk {
- clock-frequency = <32764>;
-};
-
&tlmm {
gpio-reserved-ranges = <32 8>;
};
@@ -759,7 +755,3 @@ &usb_dp_qmpphy {
&usb_dp_qmpphy_out {
remote-endpoint = <&pmic_glink_ss_in>;
};
-
-&xo_board {
- clock-frequency = <76800000>;
-};
diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index e7774d32fb6d2288748ecec00bf525b2b3c40fbb..e6dccb199d7fb4c4a15294c3f22eb842e4c32ce6 100644
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -36,11 +36,13 @@ clocks {
xo_board: xo-board {
compatible = "fixed-clock";
#clock-cells = <0>;
+ clock-frequency = <76800000>;
};
sleep_clk: sleep-clk {
compatible = "fixed-clock";
#clock-cells = <0>;
+ clock-frequency = <32764>;
};
bi_tcxo_div2: bi-tcxo-div2-clk {
--
2.39.5