Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95f9eaf5 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Add GPU clock driver for SM6150"

parents 676add95 dcf1d44e

drivers/clk/qcom/Kconfig

+36 −0
Original line number Diff line number Diff line
@@ -683,6 +683,42 @@ config SM_DEBUGCC_YUPIK 
	  Say Y if you want to support the debug clocks such as clock measurement

	  functionality.



config SM_GCC_6150

	tristate "SM6150 Global Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

	  Say Y if you want to use peripheral devices such as UART, SPI, I2C,

	  USB, UFS, SD/eMMC, PCIe, etc.



config SM_CAMCC_6150

	tristate "SM6150 Camera Clock Controller"

	select SM_GCC_6150

	help

	  Support for the camera clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

	  Say Y if you want to support camera devices and functionality such as

	  capturing pictures.



config SM_DISPCC_6150

	tristate "SM6150 Display Clock Controller"

	select SM_GCC_6150

	help

	  Support for the display clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

	  Say Y if you want to support display devices and functionality such as

	  splash pictures.



config SM_GPUCC_6150

	tristate "SM6150 Graphics Clock Controller"

	select SM_GCC_6150

	help

	  Support for the graphics clock controller on Qualcomm Technologies, Inc.

	  sm6150 devices.

	  Say Y if you want to support graphics controller devices and

	  functionality such as 3D graphics.



endif



config VIRTIO_CLK

drivers/clk/qcom/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ obj-$(CONFIG_SDX_DEBUGCC_LEMUR) += debugcc-sdxlemur.o 
obj-$(CONFIG_SDX_DEBUGCC_NIGHTJAR) += debugcc-sdxnightjar.o

obj-$(CONFIG_SDX_GCC_LEMUR) += gcc-sdxlemur.o

obj-$(CONFIG_SDX_GCC_NIGHTJAR) += gcc-sdxnightjar.o

obj-$(CONFIG_SM_CAMCC_6150) += camcc-sm6150.o

obj-$(CONFIG_SM_CAMCC_8150) += camcc-sm8150.o

obj-$(CONFIG_SM_CAMCC_SHIMA) += camcc-shima.o

obj-$(CONFIG_SM_CAMCC_YUPIK) += camcc-yupik.o
@@ -78,14 +79,17 @@ obj-$(CONFIG_SM_DEBUGCC_8150) += debugcc-sm8150.o 
obj-$(CONFIG_SM_DEBUGCC_HOLI) += debugcc-holi.o

obj-$(CONFIG_SM_DEBUGCC_SHIMA) += debugcc-shima.o

obj-$(CONFIG_SM_DEBUGCC_YUPIK) += debugcc-yupik.o

obj-$(CONFIG_SM_DISPCC_6150) += dispcc-sm6150.o

obj-$(CONFIG_SM_DISPCC_8150) += dispcc-sm8150.o

obj-$(CONFIG_SM_DISPCC_HOLI) += dispcc-holi.o

obj-$(CONFIG_SM_DISPCC_SHIMA) += dispcc-shima.o

obj-$(CONFIG_SM_DISPCC_YUPIK) += dispcc-yupik.o

obj-$(CONFIG_SM_GCC_6150) += gcc-sm6150.o

obj-$(CONFIG_SM_GCC_8150) += gcc-sm8150.o

obj-$(CONFIG_SM_GCC_HOLI) += gcc-holi.o

obj-$(CONFIG_SM_GCC_SHIMA) += gcc-shima.o

obj-$(CONFIG_SM_GCC_YUPIK) += gcc-yupik.o

obj-$(CONFIG_SM_GPUCC_6150) += gpucc-sm6150.o

obj-$(CONFIG_SM_GPUCC_8150) += gpucc-sm8150.o

obj-$(CONFIG_SM_GPUCC_HOLI) += gpucc-holi.o

obj-$(CONFIG_SM_GPUCC_SHIMA) += gpucc-shima.o

drivers/clk/qcom/camcc-sm6150.c

0 → 100644
+1790 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/clk/qcom/clk-rpmh.c

+19 −0
Original line number Diff line number Diff line
@@ -445,6 +445,24 @@ static const struct clk_rpmh_desc clk_rpmh_sm8150 = { 
	.num_clks = ARRAY_SIZE(sm8150_rpmh_clocks),

};



static struct clk_hw *sm6150_rpmh_clocks[] = {

	[RPMH_CXO_CLK]		= &sm8150_bi_tcxo.hw,

	[RPMH_CXO_CLK_A]	= &sm8150_bi_tcxo_ao.hw,

	[RPMH_LN_BB_CLK2]	= &sm8150_ln_bb_clk2.hw,

	[RPMH_LN_BB_CLK2_A]	= &sm8150_ln_bb_clk2_ao.hw,

	[RPMH_LN_BB_CLK3]	= &sm8150_ln_bb_clk3.hw,

	[RPMH_LN_BB_CLK3_A]	= &sm8150_ln_bb_clk3_ao.hw,

	[RPMH_RF_CLK1]		= &sm8150_rf_clk1.hw,

	[RPMH_RF_CLK1_A]	= &sm8150_rf_clk1_ao.hw,

	[RPMH_RF_CLK2]		= &sm8150_rf_clk2.hw,

	[RPMH_RF_CLK2_A]	= &sm8150_rf_clk2_ao.hw,

};



static const struct clk_rpmh_desc clk_rpmh_sm6150 = {

	.clks = sm6150_rpmh_clocks,

	.num_clks = ARRAY_SIZE(sm6150_rpmh_clocks),

};



DEFINE_CLK_RPMH_ARC(lahaina, bi_tcxo, bi_tcxo_ao, "xo.lvl", 0x3, 2);

DEFINE_CLK_RPMH_VRM_OPT(lahaina, div_clk1, div_clk1_ao, "divclka1", 2);

DEFINE_CLK_RPMH_VRM(lahaina, ln_bb_clk1, ln_bb_clk1_ao, "lnbclka1", 2);
@@ -651,6 +669,7 @@ static const struct of_device_id clk_rpmh_match_table[] = { 
	{ .compatible = "qcom,sdm845-rpmh-clk", .data = &clk_rpmh_sdm845},

	{ .compatible = "qcom,kona-rpmh-clk", .data = &clk_rpmh_kona},

	{ .compatible = "qcom,sm8150-rpmh-clk", .data = &clk_rpmh_sm8150},

	{ .compatible = "qcom,sm6150-rpmh-clk", .data = &clk_rpmh_sm6150},

	{ .compatible = "qcom,lahaina-rpmh-clk", .data = &clk_rpmh_lahaina},

	{ .compatible = "qcom,shima-rpmh-clk", .data = &clk_rpmh_shima},

	{ .compatible = "qcom,sdxlemur-rpmh-clk", .data = &clk_rpmh_sdxlemur},

drivers/clk/qcom/dispcc-sm6150.c

0 → 100644
+937 −0

File added.

Preview size limit exceeded, changes collapsed.