These drivers will be deprecated and removed in favour of CCF. Signed-off-by: Casey Connolly <[email protected]> --- drivers/clk/qcom/Makefile | 31 ++++++--------------------- drivers/clk/qcom/basic/Makefile | 28 ++++++++++++++++++++++++ drivers/clk/qcom/{ => basic}/clock-apq8016.c | 0 drivers/clk/qcom/{ => basic}/clock-apq8096.c | 0 drivers/clk/qcom/{ => basic}/clock-ipq4019.c | 0 drivers/clk/qcom/{ => basic}/clock-ipq5424.c | 0 drivers/clk/qcom/{ => basic}/clock-ipq9574.c | 0 drivers/clk/qcom/{ => basic}/clock-milos.c | 0 drivers/clk/qcom/{ => basic}/clock-qcm2290.c | 0 drivers/clk/qcom/{ => basic}/clock-qcom.c | 0 drivers/clk/qcom/{ => basic}/clock-qcom.h | 0 drivers/clk/qcom/{ => basic}/clock-qcs404.c | 0 drivers/clk/qcom/{ => basic}/clock-qcs615.c | 0 drivers/clk/qcom/{ => basic}/clock-qcs8300.c | 0 drivers/clk/qcom/{ => basic}/clock-sa8775p.c | 0 drivers/clk/qcom/{ => basic}/clock-sc7280.c | 0 drivers/clk/qcom/{ => basic}/clock-sdm845.c | 0 drivers/clk/qcom/{ => basic}/clock-sm6115.c | 0 drivers/clk/qcom/{ => basic}/clock-sm6125.c | 0 drivers/clk/qcom/{ => basic}/clock-sm6350.c | 0 drivers/clk/qcom/{ => basic}/clock-sm7150.c | 0 drivers/clk/qcom/{ => basic}/clock-sm8150.c | 0 drivers/clk/qcom/{ => basic}/clock-sm8250.c | 0 drivers/clk/qcom/{ => basic}/clock-sm8550.c | 0 drivers/clk/qcom/{ => basic}/clock-sm8650.c | 0 drivers/clk/qcom/{ => basic}/clock-x1e80100.c | 0 26 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index 1adca029b110..71b0bf7f44a7 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -1,28 +1,9 @@ # SPDX-License-Identifier: GPL-2.0+ # -# (C) Copyright 2023 Linaro +# (C) Copyright 2026 Linaro -obj-y += clock-qcom.o -obj-$(CONFIG_CLK_QCOM_SDM845) += clock-sdm845.o -obj-$(CONFIG_CLK_QCOM_APQ8016) += clock-apq8016.o -obj-$(CONFIG_CLK_QCOM_APQ8096) += clock-apq8096.o -obj-$(CONFIG_CLK_QCOM_IPQ4019) += clock-ipq4019.o -obj-$(CONFIG_CLK_QCOM_IPQ5424) += clock-ipq5424.o -obj-$(CONFIG_CLK_QCOM_IPQ9574) += clock-ipq9574.o -obj-$(CONFIG_CLK_QCOM_MILOS) += clock-milos.o -obj-$(CONFIG_CLK_QCOM_QCM2290) += clock-qcm2290.o -obj-$(CONFIG_CLK_QCOM_QCS404) += clock-qcs404.o -obj-$(CONFIG_CLK_QCOM_QCS8300) += clock-qcs8300.o -obj-$(CONFIG_CLK_QCOM_QCS615) += clock-qcs615.o -obj-$(CONFIG_CLK_QCOM_SA8775P) += clock-sa8775p.o -obj-$(CONFIG_CLK_QCOM_SC7180) += clock-sc7180.o -obj-$(CONFIG_CLK_QCOM_SC7280) += clock-sc7280.o -obj-$(CONFIG_CLK_QCOM_SM6115) += clock-sm6115.o -obj-$(CONFIG_CLK_QCOM_SM6125) += clock-sm6125.o -obj-$(CONFIG_CLK_QCOM_SM6350) += clock-sm6350.o -obj-$(CONFIG_CLK_QCOM_SM7150) += clock-sm7150.o -obj-$(CONFIG_CLK_QCOM_SM8150) += clock-sm8150.o -obj-$(CONFIG_CLK_QCOM_SM8250) += clock-sm8250.o -obj-$(CONFIG_CLK_QCOM_SM8550) += clock-sm8550.o -obj-$(CONFIG_CLK_QCOM_SM8650) += clock-sm8650.o -obj-$(CONFIG_CLK_QCOM_X1E80100) += clock-x1e80100.o +ifndef CONFIG_CLK_CCF_FULL +obj-y += basic/ +else +obj-y += ccf/ +endif diff --git a/drivers/clk/qcom/basic/Makefile b/drivers/clk/qcom/basic/Makefile new file mode 100644 index 000000000000..1adca029b110 --- /dev/null +++ b/drivers/clk/qcom/basic/Makefile @@ -0,0 +1,28 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# (C) Copyright 2023 Linaro + +obj-y += clock-qcom.o +obj-$(CONFIG_CLK_QCOM_SDM845) += clock-sdm845.o +obj-$(CONFIG_CLK_QCOM_APQ8016) += clock-apq8016.o +obj-$(CONFIG_CLK_QCOM_APQ8096) += clock-apq8096.o +obj-$(CONFIG_CLK_QCOM_IPQ4019) += clock-ipq4019.o +obj-$(CONFIG_CLK_QCOM_IPQ5424) += clock-ipq5424.o +obj-$(CONFIG_CLK_QCOM_IPQ9574) += clock-ipq9574.o +obj-$(CONFIG_CLK_QCOM_MILOS) += clock-milos.o +obj-$(CONFIG_CLK_QCOM_QCM2290) += clock-qcm2290.o +obj-$(CONFIG_CLK_QCOM_QCS404) += clock-qcs404.o +obj-$(CONFIG_CLK_QCOM_QCS8300) += clock-qcs8300.o +obj-$(CONFIG_CLK_QCOM_QCS615) += clock-qcs615.o +obj-$(CONFIG_CLK_QCOM_SA8775P) += clock-sa8775p.o +obj-$(CONFIG_CLK_QCOM_SC7180) += clock-sc7180.o +obj-$(CONFIG_CLK_QCOM_SC7280) += clock-sc7280.o +obj-$(CONFIG_CLK_QCOM_SM6115) += clock-sm6115.o +obj-$(CONFIG_CLK_QCOM_SM6125) += clock-sm6125.o +obj-$(CONFIG_CLK_QCOM_SM6350) += clock-sm6350.o +obj-$(CONFIG_CLK_QCOM_SM7150) += clock-sm7150.o +obj-$(CONFIG_CLK_QCOM_SM8150) += clock-sm8150.o +obj-$(CONFIG_CLK_QCOM_SM8250) += clock-sm8250.o +obj-$(CONFIG_CLK_QCOM_SM8550) += clock-sm8550.o +obj-$(CONFIG_CLK_QCOM_SM8650) += clock-sm8650.o +obj-$(CONFIG_CLK_QCOM_X1E80100) += clock-x1e80100.o diff --git a/drivers/clk/qcom/clock-apq8016.c b/drivers/clk/qcom/basic/clock-apq8016.c similarity index 100% rename from drivers/clk/qcom/clock-apq8016.c rename to drivers/clk/qcom/basic/clock-apq8016.c diff --git a/drivers/clk/qcom/clock-apq8096.c b/drivers/clk/qcom/basic/clock-apq8096.c similarity index 100% rename from drivers/clk/qcom/clock-apq8096.c rename to drivers/clk/qcom/basic/clock-apq8096.c diff --git a/drivers/clk/qcom/clock-ipq4019.c b/drivers/clk/qcom/basic/clock-ipq4019.c similarity index 100% rename from drivers/clk/qcom/clock-ipq4019.c rename to drivers/clk/qcom/basic/clock-ipq4019.c diff --git a/drivers/clk/qcom/clock-ipq5424.c b/drivers/clk/qcom/basic/clock-ipq5424.c similarity index 100% rename from drivers/clk/qcom/clock-ipq5424.c rename to drivers/clk/qcom/basic/clock-ipq5424.c diff --git a/drivers/clk/qcom/clock-ipq9574.c b/drivers/clk/qcom/basic/clock-ipq9574.c similarity index 100% rename from drivers/clk/qcom/clock-ipq9574.c rename to drivers/clk/qcom/basic/clock-ipq9574.c diff --git a/drivers/clk/qcom/clock-milos.c b/drivers/clk/qcom/basic/clock-milos.c similarity index 100% rename from drivers/clk/qcom/clock-milos.c rename to drivers/clk/qcom/basic/clock-milos.c diff --git a/drivers/clk/qcom/clock-qcm2290.c b/drivers/clk/qcom/basic/clock-qcm2290.c similarity index 100% rename from drivers/clk/qcom/clock-qcm2290.c rename to drivers/clk/qcom/basic/clock-qcm2290.c diff --git a/drivers/clk/qcom/clock-qcom.c b/drivers/clk/qcom/basic/clock-qcom.c similarity index 100% rename from drivers/clk/qcom/clock-qcom.c rename to drivers/clk/qcom/basic/clock-qcom.c diff --git a/drivers/clk/qcom/clock-qcom.h b/drivers/clk/qcom/basic/clock-qcom.h similarity index 100% rename from drivers/clk/qcom/clock-qcom.h rename to drivers/clk/qcom/basic/clock-qcom.h diff --git a/drivers/clk/qcom/clock-qcs404.c b/drivers/clk/qcom/basic/clock-qcs404.c similarity index 100% rename from drivers/clk/qcom/clock-qcs404.c rename to drivers/clk/qcom/basic/clock-qcs404.c diff --git a/drivers/clk/qcom/clock-qcs615.c b/drivers/clk/qcom/basic/clock-qcs615.c similarity index 100% rename from drivers/clk/qcom/clock-qcs615.c rename to drivers/clk/qcom/basic/clock-qcs615.c diff --git a/drivers/clk/qcom/clock-qcs8300.c b/drivers/clk/qcom/basic/clock-qcs8300.c similarity index 100% rename from drivers/clk/qcom/clock-qcs8300.c rename to drivers/clk/qcom/basic/clock-qcs8300.c diff --git a/drivers/clk/qcom/clock-sa8775p.c b/drivers/clk/qcom/basic/clock-sa8775p.c similarity index 100% rename from drivers/clk/qcom/clock-sa8775p.c rename to drivers/clk/qcom/basic/clock-sa8775p.c diff --git a/drivers/clk/qcom/clock-sc7280.c b/drivers/clk/qcom/basic/clock-sc7280.c similarity index 100% rename from drivers/clk/qcom/clock-sc7280.c rename to drivers/clk/qcom/basic/clock-sc7280.c diff --git a/drivers/clk/qcom/clock-sdm845.c b/drivers/clk/qcom/basic/clock-sdm845.c similarity index 100% rename from drivers/clk/qcom/clock-sdm845.c rename to drivers/clk/qcom/basic/clock-sdm845.c diff --git a/drivers/clk/qcom/clock-sm6115.c b/drivers/clk/qcom/basic/clock-sm6115.c similarity index 100% rename from drivers/clk/qcom/clock-sm6115.c rename to drivers/clk/qcom/basic/clock-sm6115.c diff --git a/drivers/clk/qcom/clock-sm6125.c b/drivers/clk/qcom/basic/clock-sm6125.c similarity index 100% rename from drivers/clk/qcom/clock-sm6125.c rename to drivers/clk/qcom/basic/clock-sm6125.c diff --git a/drivers/clk/qcom/clock-sm6350.c b/drivers/clk/qcom/basic/clock-sm6350.c similarity index 100% rename from drivers/clk/qcom/clock-sm6350.c rename to drivers/clk/qcom/basic/clock-sm6350.c diff --git a/drivers/clk/qcom/clock-sm7150.c b/drivers/clk/qcom/basic/clock-sm7150.c similarity index 100% rename from drivers/clk/qcom/clock-sm7150.c rename to drivers/clk/qcom/basic/clock-sm7150.c diff --git a/drivers/clk/qcom/clock-sm8150.c b/drivers/clk/qcom/basic/clock-sm8150.c similarity index 100% rename from drivers/clk/qcom/clock-sm8150.c rename to drivers/clk/qcom/basic/clock-sm8150.c diff --git a/drivers/clk/qcom/clock-sm8250.c b/drivers/clk/qcom/basic/clock-sm8250.c similarity index 100% rename from drivers/clk/qcom/clock-sm8250.c rename to drivers/clk/qcom/basic/clock-sm8250.c diff --git a/drivers/clk/qcom/clock-sm8550.c b/drivers/clk/qcom/basic/clock-sm8550.c similarity index 100% rename from drivers/clk/qcom/clock-sm8550.c rename to drivers/clk/qcom/basic/clock-sm8550.c diff --git a/drivers/clk/qcom/clock-sm8650.c b/drivers/clk/qcom/basic/clock-sm8650.c similarity index 100% rename from drivers/clk/qcom/clock-sm8650.c rename to drivers/clk/qcom/basic/clock-sm8650.c diff --git a/drivers/clk/qcom/clock-x1e80100.c b/drivers/clk/qcom/basic/clock-x1e80100.c similarity index 100% rename from drivers/clk/qcom/clock-x1e80100.c rename to drivers/clk/qcom/basic/clock-x1e80100.c -- 2.55.0
