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

Commit f69dc374 authored by Matt Wagantall's avatar Matt Wagantall Committed by Stephen Boyd
Browse files

msm: clock-8960: Disable clk_prepare() warnings for CSI clocks 



These clocks are special cases, since the set_rate() functions for
their children internally call clk_enable(). This will cause
warnings to be printed if the parents are not prepared.

This is currently harmless since clk_prepare() and clk_unprepare()
do not do anything yet. Fixing it properly, however, will involve
significant refactoring and moving functionality into the prepare
APIs. Since that phase of development is not complete yet, just
disable the warnings for now.

Change-Id: I3dc8661f9fcf2a84d748f2cf49cbed3f756c44bf
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent fecb9640

arch/arm/mach-msm/clock-8960.c

+6 −0
Original line number Diff line number Diff line
@@ -2689,6 +2689,7 @@ static struct rcg_clk csi0_src_clk = { 
		.ops = &clk_ops_rcg,

		VDD_DIG_FMAX_MAP2(LOW, 86000000, NOMINAL, 178000000),

		CLK_INIT(csi0_src_clk.c),

		.warned = true,

	},

};
@@ -2706,6 +2707,7 @@ static struct branch_clk csi0_clk = { 
		.dbg_name = "csi0_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(csi0_clk.c),

		.warned = true,

	},

};
@@ -2745,6 +2747,7 @@ static struct rcg_clk csi1_src_clk = { 
		.ops = &clk_ops_rcg,

		VDD_DIG_FMAX_MAP2(LOW, 86000000, NOMINAL, 178000000),

		CLK_INIT(csi1_src_clk.c),

		.warned = true,

	},

};
@@ -2762,6 +2765,7 @@ static struct branch_clk csi1_clk = { 
		.dbg_name = "csi1_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(csi1_clk.c),

		.warned = true,

	},

};
@@ -2801,6 +2805,7 @@ static struct rcg_clk csi2_src_clk = { 
		.ops = &clk_ops_rcg,

		VDD_DIG_FMAX_MAP2(LOW, 86000000, NOMINAL, 178000000),

		CLK_INIT(csi2_src_clk.c),

		.warned = true,

	},

};
@@ -2818,6 +2823,7 @@ static struct branch_clk csi2_clk = { 
		.dbg_name = "csi2_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(csi2_clk.c),

		.warned = true,

	},

};