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

Commit 862489a2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: gcc: Add support for 12MHz for mclk for 8953"

parents 635d0bf1 90c3e2e0
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
 * Copyright (c) 2015-2018, 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
@@ -1177,6 +1177,7 @@ static struct rcg_clk camss_gp1_clk_src = {
};

static struct clk_freq_tbl ftbl_mclk0_clk_src[] = {
	F(  12000000, gpll6_main_div2,    1,    2,    90),
	F(  24000000, gpll6_main_div2,    1,    2,    45),
	F(  33330000, gpll0_main_div2,   12,    0,     0),
	F(  36610000, gpll6,		  1,    2,    59),
@@ -1199,6 +1200,7 @@ static struct rcg_clk mclk0_clk_src = {
};

static struct clk_freq_tbl ftbl_mclk1_clk_src[] = {
	F(  12000000, gpll6_main_div2,    1,    2,    90),
	F(  24000000, gpll6_main_div2,    1,    2,    45),
	F(  33330000, gpll0_main_div2,   12,    0,     0),
	F(  36610000, gpll6,		  1,    2,    59),
@@ -1221,6 +1223,7 @@ static struct rcg_clk mclk1_clk_src = {
};

static struct clk_freq_tbl ftbl_mclk2_clk_src[] = {
	F(  12000000, gpll6_main_div2,    1,    2,    90),
	F(  24000000, gpll6_main_div2,    1,    2,    45),
	F(  33330000, gpll0_main_div2,   12,    0,     0),
	F(  36610000, gpll6,		  1,    2,    59),
@@ -1243,6 +1246,7 @@ static struct rcg_clk mclk2_clk_src = {
};

static struct clk_freq_tbl ftbl_mclk3_clk_src[] = {
	F(  12000000, gpll6_main_div2,    1,    2,    90),
	F(  24000000, gpll6_main_div2,    1,    2,    45),
	F(  33330000, gpll0_main_div2,   12,    0,     0),
	F(  36610000, gpll6,		  1,    2,    59),