| Message ID | 20220226200911.230030-2-marijn.suijten@somainline.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2,1/3] clk: qcom: Fix sorting of SDX_GCC_65 in Makefile and Kconfig | expand |
On Sun, 27 Feb 2022 at 02:38, Marijn Suijten <marijn.suijten@somainline.org> wrote: > > 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: d79afa201328 ("clk: qcom: Add SDX65 GCC support") > Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/clk/qcom/Kconfig | 14 +++++++------- > drivers/clk/qcom/Makefile | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig > index f5b54bfc992f..161b257da9ca 100644 > --- a/drivers/clk/qcom/Kconfig > +++ b/drivers/clk/qcom/Kconfig > @@ -574,13 +574,6 @@ config SDX_GCC_55 > Say Y if you want to use peripheral devices such as UART, > SPI, I2C, USB, SD/UFS, PCIe etc. > > -config SM_CAMCC_8250 > - tristate "SM8250 Camera Clock Controller" > - select SM_GCC_8250 > - help > - Support for the camera clock controller on SM8250 devices. > - Say Y if you want to support camera devices and camera functionality. > - > config SDX_GCC_65 > tristate "SDX65 Global Clock Controller" > select QCOM_GDSC > @@ -589,6 +582,13 @@ config SDX_GCC_65 > Say Y if you want to use peripheral devices such as UART, > SPI, I2C, USB, SD/UFS, PCIe etc. > > +config SM_CAMCC_8250 > + tristate "SM8250 Camera Clock Controller" > + select SM_GCC_8250 > + help > + Support for the camera clock controller on SM8250 devices. > + Say Y if you want to support camera devices and camera functionality. > + > config SM_DISPCC_8250 > tristate "SM8150 and SM8250 Display Clock Controller" > depends on SM_GCC_8150 || SM_GCC_8250 > diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile > index d96d6793fc7d..3e4eb843b8d2 100644 > --- a/drivers/clk/qcom/Makefile > +++ b/drivers/clk/qcom/Makefile > @@ -84,8 +84,8 @@ obj-$(CONFIG_SDM_GPUCC_845) += gpucc-sdm845.o > obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o > obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o > obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o > -obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o > obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o > +obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o > obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o > obj-$(CONFIG_SM_GCC_6115) += gcc-sm6115.o > obj-$(CONFIG_SM_GCC_6125) += gcc-sm6125.o > -- > 2.35.1 >
diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig index f5b54bfc992f..161b257da9ca 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -574,13 +574,6 @@ config SDX_GCC_55 Say Y if you want to use peripheral devices such as UART, SPI, I2C, USB, SD/UFS, PCIe etc. -config SM_CAMCC_8250 - tristate "SM8250 Camera Clock Controller" - select SM_GCC_8250 - help - Support for the camera clock controller on SM8250 devices. - Say Y if you want to support camera devices and camera functionality. - config SDX_GCC_65 tristate "SDX65 Global Clock Controller" select QCOM_GDSC @@ -589,6 +582,13 @@ config SDX_GCC_65 Say Y if you want to use peripheral devices such as UART, SPI, I2C, USB, SD/UFS, PCIe etc. +config SM_CAMCC_8250 + tristate "SM8250 Camera Clock Controller" + select SM_GCC_8250 + help + Support for the camera clock controller on SM8250 devices. + Say Y if you want to support camera devices and camera functionality. + config SM_DISPCC_8250 tristate "SM8150 and SM8250 Display Clock Controller" depends on SM_GCC_8150 || SM_GCC_8250 diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile index d96d6793fc7d..3e4eb843b8d2 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -84,8 +84,8 @@ obj-$(CONFIG_SDM_GPUCC_845) += gpucc-sdm845.o obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o obj-$(CONFIG_SDX_GCC_55) += gcc-sdx55.o -obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o obj-$(CONFIG_SDX_GCC_65) += gcc-sdx65.o +obj-$(CONFIG_SM_CAMCC_8250) += camcc-sm8250.o obj-$(CONFIG_SM_DISPCC_8250) += dispcc-sm8250.o obj-$(CONFIG_SM_GCC_6115) += gcc-sm6115.o obj-$(CONFIG_SM_GCC_6125) += gcc-sm6125.o
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: d79afa201328 ("clk: qcom: Add SDX65 GCC support") Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> --- drivers/clk/qcom/Kconfig | 14 +++++++------- drivers/clk/qcom/Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)