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

Commit 10135941 authored by Pushkar Joshi's avatar Pushkar Joshi Committed by Gerrit - the friendly Code Review server
Browse files

clk: qcom: clock-mmss-8994: Support multiple parents for byte/pixel clocks 



Add additional parents for the pixel and byte clocks as these can now
switch between those. Also export the sources for the byte and pixel
clocks so that clients can switch between the parents for the relevant
RCGs.

Change-Id: If2c7fe4f12c6ad5a15f13acf71d6dc296b57b665
Signed-off-by: default avatarPushkar Joshi <pushkarj@codeaurora.org>
parent afccab5c

drivers/clk/qcom/clock-mmss-8994.c

+42 −2
Original line number Diff line number Diff line
@@ -720,18 +720,28 @@ static struct rcg_clk mdp_clk_src = { 
};



DEFINE_EXT_CLK(ext_pclk0_clk_src, NULL);

DEFINE_EXT_CLK(ext_pclk1_clk_src, NULL);

static struct clk_freq_tbl ftbl_pclk0_clk_src[] = {

	{

		.div_src_val = BVAL(10, 8, dsi0phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_pclk0_clk_src.c,

		.freq_hz = 0,

	},

	{

		.div_src_val = BVAL(10, 8, dsi1phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_pclk1_clk_src.c,

		.freq_hz = 0,

	},

	F_END

};



static struct rcg_clk pclk0_clk_src = {

	.cmd_rcgr_reg = PCLK0_CMD_RCGR,

	.set_rate = set_rate_mnd,

	.current_freq = ftbl_pclk0_clk_src,

	.freq_tbl = ftbl_pclk0_clk_src,

	.base = &virt_base,

	.c = {

		.dbg_name = "pclk0_clk_src",
@@ -744,19 +754,27 @@ static struct rcg_clk pclk0_clk_src = { 
	},

};



DEFINE_EXT_CLK(ext_pclk1_clk_src, NULL);

static struct clk_freq_tbl ftbl_pclk1_clk_src[] = {

	{

		.div_src_val = BVAL(10, 8, dsi0phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_pclk0_clk_src.c,

		.freq_hz = 0,

	},

	{

		.div_src_val = BVAL(10, 8, dsi1phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_pclk1_clk_src.c,

		.freq_hz = 0,

	},

	F_END

};



static struct rcg_clk pclk1_clk_src = {

	.cmd_rcgr_reg = PCLK1_CMD_RCGR,

	.set_rate = set_rate_mnd,

	.current_freq = ftbl_pclk1_clk_src,

	.freq_tbl = ftbl_pclk1_clk_src,

	.base = &virt_base,

	.c = {

		.dbg_name = "pclk1_clk_src",
@@ -1100,17 +1118,27 @@ static struct rcg_clk csi1phytimer_clk_src = { 
};



DEFINE_EXT_CLK(ext_byte0_clk_src, NULL);

DEFINE_EXT_CLK(ext_byte1_clk_src, NULL);

static struct clk_freq_tbl ftbl_byte0_clk_src[] = {

	{

		.div_src_val = BVAL(10, 8, dsi0phypll_mm_source_val),

		.src_clk = &ext_byte0_clk_src.c,

		.freq_hz = 0,

	},

	{

		.div_src_val = BVAL(10, 8, dsi1phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_byte1_clk_src.c,

		.freq_hz = 0,

	},

	F_END

};



static struct rcg_clk byte0_clk_src = {

	.cmd_rcgr_reg = BYTE0_CMD_RCGR,

	.set_rate = set_rate_hid,

	.current_freq = ftbl_byte0_clk_src,

	.freq_tbl = ftbl_byte0_clk_src,

	.base = &virt_base,

	.c = {

		.dbg_name = "byte0_clk_src",
@@ -1123,18 +1151,26 @@ static struct rcg_clk byte0_clk_src = { 
	},

};



DEFINE_EXT_CLK(ext_byte1_clk_src, NULL);

static struct clk_freq_tbl ftbl_byte1_clk_src[] = {

	{

		.div_src_val = BVAL(10, 8, dsi0phypll_mm_source_val),

		.src_clk = &ext_byte0_clk_src.c,

		.freq_hz = 0,

	},

	{

		.div_src_val = BVAL(10, 8, dsi1phypll_mm_source_val)

				| BVAL(4, 0, 0),

		.src_clk = &ext_byte1_clk_src.c,

		.freq_hz = 0,

	},

	F_END

};



static struct rcg_clk byte1_clk_src = {

	.cmd_rcgr_reg = BYTE1_CMD_RCGR,

	.set_rate = set_rate_hid,

	.current_freq = ftbl_byte1_clk_src,

	.freq_tbl = ftbl_byte1_clk_src,

	.base = &virt_base,

	.c = {

		.dbg_name = "byte1_clk_src",
@@ -2397,6 +2433,8 @@ static struct clk_lookup msm_clocks_mmss_8994[] = { 
	CLK_LIST(csi2phytimer_clk_src),

	CLK_LIST(pclk0_clk_src),

	CLK_LIST(pclk1_clk_src),

	CLK_LIST(ext_pclk0_clk_src),

	CLK_LIST(ext_pclk1_clk_src),

	CLK_LIST(fd_core_clk_src),

	CLK_LIST(mdp_clk_src),

	CLK_LIST(ocmemnoc_clk_src),
@@ -2413,6 +2451,8 @@ static struct clk_lookup msm_clocks_mmss_8994[] = { 
	CLK_LIST(csi1phytimer_clk_src),

	CLK_LIST(byte0_clk_src),

	CLK_LIST(byte1_clk_src),

	CLK_LIST(ext_byte0_clk_src),

	CLK_LIST(ext_byte1_clk_src),

	CLK_LIST(esc0_clk_src),

	CLK_LIST(esc1_clk_src),

	CLK_LIST(extpclk_clk_src),

include/dt-bindings/clock/msm-clocks-8994.h

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -319,6 +319,10 @@ 
#define clk_esc0_clk_src 0xb41d7c38

#define clk_esc1_clk_src 0x3b0afa42

#define clk_extpclk_clk_src 0xb2c31abd

#define clk_ext_byte0_clk_src 0xfb32f31e

#define clk_ext_byte1_clk_src 0x585ef6d4

#define clk_ext_pclk0_clk_src 0x087c1612

#define clk_ext_pclk1_clk_src 0x8067c5a3

#define clk_hdmi_clk_src 0xb40aeea9

#define clk_hdmi_20nm_vco_clk 0xacaed5e6

#define clk_vsync_clk_src 0xecb43940