Skip to content

Commit 620f512

Browse files
MarijnS95andersson
authored andcommitted
clk: qcom: Fix sorting of SDX_GCC_65 in Makefile and Kconfig
In order to keep at least the list of `CONFIG_SM_` drivers sorted alphabetically, SDX_GCC_65 should have been moved one line up. This in turn makes it easier and cleaner to add the followup SM_DISPCC_6125 driver in the right place, right before SM_DISPCC_8250. Fixes: d79afa2 ("clk: qcom: Add SDX65 GCC support") Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Link: https://lore.kernel.org/r/20220303131812.302302-2-marijn.suijten@somainline.org
1 parent d1a16e3 commit 620f512

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

drivers/clk/qcom/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,13 +574,6 @@ config SDX_GCC_55
574574
Say Y if you want to use peripheral devices such as UART,
575575
SPI, I2C, USB, SD/UFS, PCIe etc.
576576

577-
config SM_CAMCC_8250
578-
tristate "SM8250 Camera Clock Controller"
579-
select SM_GCC_8250
580-
help
581-
Support for the camera clock controller on SM8250 devices.
582-
Say Y if you want to support camera devices and camera functionality.
583-
584577
config SDX_GCC_65
585578
tristate "SDX65 Global Clock Controller"
586579
select QCOM_GDSC
@@ -589,6 +582,13 @@ config SDX_GCC_65
589582
Say Y if you want to use peripheral devices such as UART,
590583
SPI, I2C, USB, SD/UFS, PCIe etc.
591584

585+
config SM_CAMCC_8250
586+
tristate "SM8250 Camera Clock Controller"
587+
select SM_GCC_8250
588+
help
589+
Support for the camera clock controller on SM8250 devices.
590+
Say Y if you want to support camera devices and camera functionality.
591+
592592
config SM_DISPCC_8250
593593
tristate "SM8150 and SM8250 Display Clock Controller"
594594
depends on SM_GCC_8150 || SM_GCC_8250

drivers/clk/qcom/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ obj-$(CONFIG_SDM_GPUCC_845) += gpucc-sdm845.o
8484
obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o
8585
obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o
8686
obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o
87-
obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o
8887
obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o
88+
obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o
8989
obj-$(CONFIG_SM_DISPCC_6350) += dispcc-sm6350.o
9090
obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o
9191
obj-$(CONFIG_SM_GCC_6115) += gcc-sm6115.o

0 commit comments

Comments
 (0)