Skip to content

Commit bac4675

Browse files
lumagandersson
authored andcommitted
clk: qcom: drop lcc-mdm9615 in favour of lcc-msm8960
The two LCC drivers, msm8960 and mdm9615 are almost the same. The only difference is the platform clock: msm8960/apq8064 use pxo, while mdm9615 uses cxo. Drop the lcc-mdm9615 in favour of using lcc-msm8960 instead. Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Link: https://lore.kernel.org/r/20230512211727.3445575-6-dmitry.baryshkov@linaro.org Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 6bab5da commit bac4675

4 files changed

Lines changed: 18 additions & 589 deletions

File tree

drivers/clk/qcom/Kconfig

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,11 @@ config MSM_GCC_8960
247247
i2c, USB, SD/eMMC, SATA, PCIe, etc.
248248

249249
config MSM_LCC_8960
250-
tristate "APQ8064/MSM8960 LPASS Clock Controller"
250+
tristate "APQ8064/MSM8960/MDM9650 LPASS Clock Controller"
251251
depends on ARM || COMPILE_TEST
252-
select MSM_GCC_8960
253252
help
254-
Support for the LPASS clock controller on apq8064/msm8960 devices.
253+
Support for the LPASS clock controller on apq8064/msm8960/mdm9650
254+
devices.
255255
Say Y if you want to use audio devices such as i2s, pcm,
256256
SLIMBus, etc.
257257

@@ -271,15 +271,6 @@ config MDM_GCC_9615
271271
Say Y if you want to use peripheral devices such as UART, SPI,
272272
i2c, USB, SD/eMMC, etc.
273273

274-
config MDM_LCC_9615
275-
tristate "MDM9615 LPASS Clock Controller"
276-
depends on ARM || COMPILE_TEST
277-
select MDM_GCC_9615
278-
help
279-
Support for the LPASS clock controller on mdm9615 devices.
280-
Say Y if you want to use audio devices such as i2s, pcm,
281-
SLIMBus, etc.
282-
283274
config MSM_MMCC_8960
284275
tristate "MSM8960 Multimedia Clock Controller"
285276
depends on ARM || COMPILE_TEST

drivers/clk/qcom/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ obj-$(CONFIG_IPQ_GCC_9574) += gcc-ipq9574.o
3232
obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
3333
obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o
3434
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
35-
obj-$(CONFIG_MDM_LCC_9615) += lcc-mdm9615.o
3635
obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o
3736
obj-$(CONFIG_MSM_GCC_8909) += gcc-msm8909.o
3837
obj-$(CONFIG_MSM_GCC_8916) += gcc-msm8916.o

0 commit comments

Comments
 (0)