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

Commit c8f4f2ec authored by Taniya Das's avatar Taniya Das Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: gcc: use the holi specific vdd file 



Update to use the holi specific voltage corner file for GCC clock
driver. Also add the ufs/pcie ref clocks and the cdiv clock for disp
gpll0 clock.

Change-Id: I9dfe60e301a1678574f238a36edfebaa8e4bfe5c
Signed-off-by: default avatarTaniya Das <tdas@codeaurora.org>
parent c65a75e3

drivers/clk/qcom/gcc-holi.c

+47 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "clk-regmap-mux.h"

#include "clk-regmap-divider.h"

#include "reset.h"

#include "vdd-level.h"

#include "vdd-level-holi.h"



static DEFINE_VDD_REGULATORS(vdd_cx, VDD_NUM, 1, vdd_corner);

static DEFINE_VDD_REGULATORS(vdd_mx, VDD_NUM, 1, vdd_corner);
@@ -2905,6 +2905,19 @@ static struct clk_branch gcc_disp_ahb_clk = { 
	},

};



static struct clk_regmap_div gcc_disp_gpll0_clk_src = {

	.reg = 0x17058,

	.shift = 0,

	.width = 2,

	.clkr.hw.init = &(struct clk_init_data) {

		.name = "gcc_disp_gpll0_clk_src",

		.parent_names =

			(const char *[]){ "gpll0" },

		.num_parents = 1,

		.ops = &clk_regmap_div_ops,

	},

};



static struct clk_branch gcc_disp_gpll0_div_clk_src = {

	.halt_check = BRANCH_HALT_DELAY,

	.clkr = {
@@ -2913,7 +2926,7 @@ static struct clk_branch gcc_disp_gpll0_div_clk_src = { 
		.hw.init = &(struct clk_init_data){

			.name = "gcc_disp_gpll0_div_clk_src",

			.parent_data = &(const struct clk_parent_data){

				.hw = &gpll0.clkr.hw,

				.hw = &gcc_disp_gpll0_clk_src.clkr.hw,

			},

			.num_parents = 1,

			.flags = CLK_SET_RATE_PARENT,
@@ -3905,6 +3918,32 @@ static struct clk_branch gcc_usb30_prim_sleep_clk = { 
	},

};



static struct clk_branch gcc_ufs_mem_clkref_clk = {

	.halt_reg = 0x8c000,

	.halt_check = BRANCH_HALT,

	.clkr = {

		.enable_reg = 0x8c000,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_ufs_mem_clkref_clk",

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_rx5_pcie_clkref_en_clk = {

	.halt_reg = 0x8c00c,

	.halt_check = BRANCH_HALT,

	.clkr = {

		.enable_reg = 0x8c00c,

		.enable_mask = BIT(0),

		.hw.init = &(struct clk_init_data){

			.name = "gcc_rx5_pcie_clkref_en_clk",

			.ops = &clk_branch2_ops,

		},

	},

};



static struct clk_branch gcc_usb3_prim_clkref_clk = {

	.halt_reg = 0x8c010,

	.halt_check = BRANCH_HALT,
@@ -4152,6 +4191,7 @@ static struct clk_regmap *gcc_holi_clocks[] = { 
	[GCC_CPUSS_AHB_POSTDIV_CLK_SRC] = &gcc_cpuss_ahb_postdiv_clk_src.clkr,

	[GCC_CPUSS_GNOC_CLK] = &gcc_cpuss_gnoc_clk.clkr,

	[GCC_DISP_AHB_CLK] = &gcc_disp_ahb_clk.clkr,

	[GCC_DISP_GPLL0_CLK_SRC] = &gcc_disp_gpll0_clk_src.clkr,

	[GCC_DISP_GPLL0_DIV_CLK_SRC] = &gcc_disp_gpll0_div_clk_src.clkr,

	[GCC_DISP_HF_AXI_CLK] = &gcc_disp_hf_axi_clk.clkr,

	[GCC_DISP_SLEEP_CLK] = &gcc_disp_sleep_clk.clkr,
@@ -4256,6 +4296,8 @@ static struct clk_regmap *gcc_holi_clocks[] = { 
	[GCC_VIDEO_VENUS_CLK_SRC] = &gcc_video_venus_clk_src.clkr,

	[GCC_VIDEO_VENUS_CTL_CLK] = &gcc_video_venus_ctl_clk.clkr,

	[GCC_VIDEO_XO_CLK] = &gcc_video_xo_clk.clkr,

	[GCC_UFS_MEM_CLKREF_CLK] = &gcc_ufs_mem_clkref_clk.clkr,

	[GCC_RX5_PCIE_CLKREF_EN_CLK] = &gcc_rx5_pcie_clkref_en_clk.clkr,

	[GPLL0] = &gpll0.clkr,

	[GPLL0_OUT_EVEN] = &gpll0_out_even.clkr,

	[GPLL0_OUT_ODD] = &gpll0_out_odd.clkr,
@@ -4363,6 +4405,9 @@ static int gcc_holi_probe(struct platform_device *pdev) 
	if (IS_ERR(regmap))

		return PTR_ERR(regmap);



	/* GCC_DISP_GPLL0_CDIVR__CLK_DIV */

	regmap_update_bits(regmap, 0x17058, 0x1, 0x1);



	clk_fabia_pll_configure(&gpll10, regmap, &gpll10_config);

	clk_fabia_pll_configure(&gpll11, regmap, &gpll11_config);

	clk_fabia_pll_configure(&gpll8, regmap, &gpll8_config);