Commit cb8dbfe8 authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Stephen Boyd
Browse files

clk: mmp2: Constify some strings 



All the parent clock names for the muxes are constant. Add const.

Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
Link: https://lkml.kernel.org/r/20200309194254.29009-3-lkundrak@v3.sk


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent b3296386

drivers/clk/mmp/clk-mix.c

+1 −1
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ const struct clk_ops mmp_clk_mix_ops = { 


struct clk *mmp_clk_register_mix(struct device *dev,

					const char *name,

					const char **parent_names,

					const char * const *parent_names,

					u8 num_parents,

					unsigned long flags,

					struct mmp_clk_mix_config *config,

drivers/clk/mmp/clk-of-mmp2.c

+7 −6
Original line number Diff line number Diff line
@@ -127,16 +127,16 @@ static void mmp2_pll_init(struct mmp2_clk_unit *pxa_unit) 
static DEFINE_SPINLOCK(uart0_lock);

static DEFINE_SPINLOCK(uart1_lock);

static DEFINE_SPINLOCK(uart2_lock);

static const char *uart_parent_names[] = {"uart_pll", "vctcxo"};

static const char * const uart_parent_names[] = {"uart_pll", "vctcxo"};



static DEFINE_SPINLOCK(ssp0_lock);

static DEFINE_SPINLOCK(ssp1_lock);

static DEFINE_SPINLOCK(ssp2_lock);

static DEFINE_SPINLOCK(ssp3_lock);

static const char *ssp_parent_names[] = {"vctcxo_4", "vctcxo_2", "vctcxo", "pll1_16"};

static const char * const ssp_parent_names[] = {"vctcxo_4", "vctcxo_2", "vctcxo", "pll1_16"};



static DEFINE_SPINLOCK(timer_lock);

static const char *timer_parent_names[] = {"clk32", "vctcxo_4", "vctcxo_2", "vctcxo"};

static const char * const timer_parent_names[] = {"clk32", "vctcxo_4", "vctcxo_2", "vctcxo"};



static DEFINE_SPINLOCK(reset_lock);
@@ -190,7 +190,7 @@ static void mmp2_apb_periph_clk_init(struct mmp2_clk_unit *pxa_unit) 
}



static DEFINE_SPINLOCK(sdh_lock);

static const char *sdh_parent_names[] = {"pll1_4", "pll2", "usb_pll", "pll1"};

static const char * const sdh_parent_names[] = {"pll1_4", "pll2", "usb_pll", "pll1"};

static struct mmp_clk_mix_config sdh_mix_config = {

	.reg_info = DEFINE_MIX_REG_INFO(4, 10, 2, 8, 32),

};
@@ -201,11 +201,12 @@ static DEFINE_SPINLOCK(usbhsic1_lock); 


static DEFINE_SPINLOCK(disp0_lock);

static DEFINE_SPINLOCK(disp1_lock);

static const char *disp_parent_names[] = {"pll1", "pll1_16", "pll2", "vctcxo"};

static const char * const disp_parent_names[] = {"pll1", "pll1_16", "pll2", "vctcxo"};



static DEFINE_SPINLOCK(ccic0_lock);

static DEFINE_SPINLOCK(ccic1_lock);

static const char *ccic_parent_names[] = {"pll1_2", "pll1_16", "vctcxo"};

static const char * const ccic_parent_names[] = {"pll1_2", "pll1_16", "vctcxo"};



static struct mmp_clk_mix_config ccic0_mix_config = {

	.reg_info = DEFINE_MIX_REG_INFO(4, 17, 2, 6, 32),

};

drivers/clk/mmp/clk.h

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct mmp_clk_mix { 
extern const struct clk_ops mmp_clk_mix_ops;

extern struct clk *mmp_clk_register_mix(struct device *dev,

					const char *name,

					const char **parent_names,

					const char * const *parent_names,

					u8 num_parents,

					unsigned long flags,

					struct mmp_clk_mix_config *config,
@@ -193,7 +193,7 @@ void mmp_register_gate_clks(struct mmp_clk_unit *unit, 
struct mmp_param_mux_clk {

	unsigned int id;

	char *name;

	const char **parent_name;

	const char * const *parent_name;

	u8 num_parents;

	unsigned long flags;

	unsigned long offset;

CRA Git | Maintained and supported by SUSTech CRA and CCSE