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

Commit 4abb1b40 authored by Gabriel FERNANDEZ's avatar Gabriel FERNANDEZ Committed by Mike Turquette
Browse files

clk: st: use static const for stm_fs tables 



converts stm_fs tables into static const

Signed-off-by: default avatarGabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 0268099c

drivers/clk/st/clkgen-fsyn.c

+17 −17
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ struct stm_fs { 
	unsigned long nsdiv;

};



static struct stm_fs fs216c65_rtbl[] = {

static const struct stm_fs fs216c65_rtbl[] = {

	{ .mdiv = 0x1f, .pe = 0x0,	.sdiv = 0x7,	.nsdiv = 0 },	/* 312.5 Khz */

	{ .mdiv = 0x17, .pe = 0x25ed,	.sdiv = 0x1,	.nsdiv = 0 },	/* 27    MHz */

	{ .mdiv = 0x1a, .pe = 0x7b36,	.sdiv = 0x2,	.nsdiv = 1 },	/* 36.87 MHz */
@@ -49,13 +49,13 @@ static struct stm_fs fs216c65_rtbl[] = { 
	{ .mdiv = 0x11, .pe = 0x1c72,	.sdiv = 0x1,	.nsdiv = 1 },	/* 108   MHz */

};



static struct stm_fs fs432c65_rtbl[] = {

static const struct stm_fs fs432c65_rtbl[] = {

	{ .mdiv = 0x1f, .pe = 0x0,	.sdiv = 0x7,	.nsdiv = 0 },	/* 625   Khz */

	{ .mdiv = 0x11, .pe = 0x1c72,	.sdiv = 0x2,	.nsdiv = 1 },	/* 108   MHz */

	{ .mdiv = 0x19, .pe = 0x121a,	.sdiv = 0x0,	.nsdiv = 1 },	/* 297   MHz */

};



static struct stm_fs fs660c32_rtbl[] = {

static const struct stm_fs fs660c32_rtbl[] = {

	{ .mdiv = 0x01, .pe = 0x2aaa,	.sdiv = 0x8,	.nsdiv = 0 },	/* 600   KHz */

	{ .mdiv = 0x02, .pe = 0x3d33,	.sdiv = 0x0,	.nsdiv = 0 },	/* 148.5 Mhz */

	{ .mdiv = 0x13, .pe = 0x5bcc,	.sdiv = 0x0,	.nsdiv = 1 },	/* 297   Mhz */
@@ -82,9 +82,9 @@ struct clkgen_quadfs_data { 
	struct clkgen_field nsdiv[QUADFS_MAX_CHAN];



	const struct clk_ops *pll_ops;

	struct stm_fs *rtbl;

	const struct stm_fs *rtbl;

	u8 rtbl_cnt;

	int  (*get_rate)(unsigned long , struct stm_fs *,

	int  (*get_rate)(unsigned long , const struct stm_fs *,

			unsigned long *);

};
@@ -94,11 +94,11 @@ static const struct clk_ops st_quadfs_fs216c65_ops; 
static const struct clk_ops st_quadfs_fs432c65_ops;

static const struct clk_ops st_quadfs_fs660c32_ops;



static int clk_fs216c65_get_rate(unsigned long, struct stm_fs *,

static int clk_fs216c65_get_rate(unsigned long, const struct stm_fs *,

		unsigned long *);

static int clk_fs432c65_get_rate(unsigned long, struct stm_fs *,

static int clk_fs432c65_get_rate(unsigned long, const struct stm_fs *,

		unsigned long *);

static int clk_fs660c32_dig_get_rate(unsigned long, struct stm_fs *,

static int clk_fs660c32_dig_get_rate(unsigned long, const struct stm_fs *,

		unsigned long *);

/*

 * Values for all of the standalone instances of this clock
@@ -106,7 +106,7 @@ static int clk_fs660c32_dig_get_rate(unsigned long, struct stm_fs *, 
 * that the individual channel standby control bits (nsb) are in the

 * first register along with the PLL control bits.

 */

static struct clkgen_quadfs_data st_fs216c65_416 = {

static const struct clkgen_quadfs_data st_fs216c65_416 = {

	/* 416 specific */

	.npda	= CLKGEN_FIELD(0x0, 0x1, 14),

	.nsb	= { CLKGEN_FIELD(0x0, 0x1, 10),
@@ -143,7 +143,7 @@ static struct clkgen_quadfs_data st_fs216c65_416 = { 
	.get_rate	= clk_fs216c65_get_rate,

};



static struct clkgen_quadfs_data st_fs432c65_416 = {

static const struct clkgen_quadfs_data st_fs432c65_416 = {

	.npda	= CLKGEN_FIELD(0x0, 0x1, 14),

	.nsb	= { CLKGEN_FIELD(0x0, 0x1, 10),

		    CLKGEN_FIELD(0x0, 0x1, 11),
@@ -179,7 +179,7 @@ static struct clkgen_quadfs_data st_fs432c65_416 = { 
	.get_rate	= clk_fs432c65_get_rate,

};



static struct clkgen_quadfs_data st_fs660c32_E_416 = {

static const struct clkgen_quadfs_data st_fs660c32_E_416 = {

	.npda	= CLKGEN_FIELD(0x0, 0x1, 14),

	.nsb	= { CLKGEN_FIELD(0x0, 0x1, 10),

		    CLKGEN_FIELD(0x0, 0x1, 11),
@@ -215,7 +215,7 @@ static struct clkgen_quadfs_data st_fs660c32_E_416 = { 
	.get_rate	= clk_fs660c32_dig_get_rate,

};



static struct clkgen_quadfs_data st_fs660c32_F_416 = {

static const struct clkgen_quadfs_data st_fs660c32_F_416 = {

	.npda	= CLKGEN_FIELD(0x0, 0x1, 14),

	.nsb	= { CLKGEN_FIELD(0x0, 0x1, 10),

		    CLKGEN_FIELD(0x0, 0x1, 11),
@@ -650,7 +650,7 @@ static int quadfs_fsynth_is_enabled(struct clk_hw *hw) 


#define P15			(uint64_t)(1 << 15)



static int clk_fs216c65_get_rate(unsigned long input, struct stm_fs *fs,

static int clk_fs216c65_get_rate(unsigned long input, const struct stm_fs *fs,

		unsigned long *rate)

{

	uint64_t res;
@@ -670,7 +670,7 @@ static int clk_fs216c65_get_rate(unsigned long input, struct stm_fs *fs, 
	return 0;

}



static int clk_fs432c65_get_rate(unsigned long input, struct stm_fs *fs,

static int clk_fs432c65_get_rate(unsigned long input, const struct stm_fs *fs,

		unsigned long *rate)

{

	uint64_t res;
@@ -693,7 +693,7 @@ static int clk_fs432c65_get_rate(unsigned long input, struct stm_fs *fs, 
#define P20		(uint64_t)(1 << 20)



static int clk_fs660c32_dig_get_rate(unsigned long input,

				struct stm_fs *fs, unsigned long *rate)

				const struct stm_fs *fs, unsigned long *rate)

{

	unsigned long s = (1 << fs->sdiv);

	unsigned long ns;
@@ -749,7 +749,7 @@ static long quadfs_find_best_rate(struct clk_hw *hw, unsigned long drate, 
{

	struct st_clk_quadfs_fsynth *fs = to_quadfs_fsynth(hw);

	int (*clk_fs_get_rate)(unsigned long ,

				struct stm_fs *, unsigned long *);

				const struct stm_fs *, unsigned long *);

	struct stm_fs prev_params;

	unsigned long prev_rate, rate = 0;

	unsigned long diff_rate, prev_diff_rate = ~0;
@@ -793,7 +793,7 @@ static unsigned long quadfs_recalc_rate(struct clk_hw *hw, 
	unsigned long rate = 0;

	struct stm_fs params;

	int (*clk_fs_get_rate)(unsigned long ,

				struct stm_fs *, unsigned long *);

				const struct stm_fs *, unsigned long *);



	clk_fs_get_rate = fs->data->get_rate;