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

Commit 84df5356 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-qcom-audio-fixes' into clk-next 

* clk-qcom-audio-fixes:
  clk: qcom: msm8916: add 12.288 MHz support to codec dig clk
  clk: qcom: msm8916: fix mnd_width for codec_digcodec
  clk: qcom: msm8916: Fix i2s clk rates required for mclk
parents 082ea2ef c8282391

drivers/clk/qcom/gcc-msm8916.c

+10 −3
Original line number Diff line number Diff line
@@ -1259,20 +1259,25 @@ static struct clk_branch gcc_ultaudio_ahbfabric_ixfabric_lpm_clk = { 
};



static const struct freq_tbl ftbl_gcc_ultaudio_lpaif_i2s_clk[] = {

	F(128000, P_XO, 10, 1, 15),

	F(256000, P_XO, 5, 1, 15),

	F(384000, P_XO, 5, 1, 10),

	F(512000, P_XO, 5, 2, 15),

	F(576000, P_XO, 5, 3, 20),

	F(705600, P_GPLL1, 16, 1, 80),

	F(768000, P_XO, 5, 1, 5),

	F(800000, P_XO, 5, 5, 24),

	F(1024000, P_GPLL1, 14, 1, 63),

	F(1024000, P_XO, 5, 4, 15),

	F(1152000, P_XO, 1, 3, 50),

	F(1411200, P_GPLL1, 16, 1, 40),

	F(1536000, P_XO, 1, 2, 25),

	F(1600000, P_XO, 12, 0, 0),

	F(2048000, P_GPLL1, 9, 1, 49),

	F(1728000, P_XO, 5, 9, 20),

	F(2048000, P_XO, 5, 8, 15),

	F(2304000, P_XO, 5, 3, 5),

	F(2400000, P_XO, 8, 0, 0),

	F(2822400, P_GPLL1, 16, 1, 20),

	F(3072000, P_GPLL1, 14, 1, 21),

	F(3072000, P_XO, 5, 4, 5),

	F(4096000, P_GPLL1, 9, 2, 49),

	F(4800000, P_XO, 4, 0, 0),

	F(5644800, P_GPLL1, 16, 1, 10),
@@ -1431,6 +1436,7 @@ static struct clk_branch gcc_ultaudio_stc_xo_clk = { 


static const struct freq_tbl ftbl_codec_clk[] = {

	F(9600000, P_XO, 2, 0, 0),

	F(12288000, P_XO, 1, 16, 25),

	F(19200000, P_XO, 1, 0, 0),

	F(11289600, P_EXT_MCLK, 1, 0, 0),

	{ }
@@ -1438,6 +1444,7 @@ static const struct freq_tbl ftbl_codec_clk[] = { 


static struct clk_rcg2 codec_digcodec_clk_src = {

	.cmd_rcgr = 0x1c09c,

	.mnd_width = 8,

	.hid_width = 5,

	.parent_map = gcc_xo_gpll1_emclk_sleep_map,

	.freq_tbl = ftbl_codec_clk,