Commit 3338fe50 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'renesas-clk-for-v5.13-tag2' of... 

Merge tag 'renesas-clk-for-v5.13-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into clk-renesas

Pull Renesas clk driver updates from Geert Uytterhoeven:

 - Spelling fixes
 - Zero init clk_init_data

* tag 'renesas-clk-for-v5.13-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers:
  clk: renesas: Zero init clk_init_data
  clk: renesas: Couple of spelling fixes
parents 60c325a7 f2fb4fe6

drivers/clk/renesas/clk-div6.c

+1 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct clk * __init cpg_div6_register(const char *name, 
				      struct raw_notifier_head *notifiers)

{

	unsigned int valid_parents;

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct div6_clock *clock;

	struct clk *clk;

	unsigned int i;
@@ -267,7 +267,6 @@ struct clk * __init cpg_div6_register(const char *name, 
	/* Register the clock. */

	init.name = name;

	init.ops = &cpg_div6_clock_ops;

	init.flags = 0;

	init.parent_names = parent_names;

	init.num_parents = valid_parents;

drivers/clk/renesas/clk-mstp.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static struct clk * __init cpg_mstp_clock_register(const char *name, 
	const char *parent_name, unsigned int index,

	struct mstp_clock_group *group)

{

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct mstp_clock *clock;

	struct clk *clk;

drivers/clk/renesas/r9a06g032-clocks.c

+6 −6
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { 
	/*

	 * These are not hardware clocks, but are needed to handle the special

	 * case where we have a 'selector bit' that doesn't just change the

	 * parent for a clock, but also the gate it's suposed to use.

	 * parent for a clock, but also the gate it's supposed to use.

	 */

	{

		.index = R9A06G032_UART_GROUP_012,
@@ -311,7 +311,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { 


struct r9a06g032_priv {

	struct clk_onecell_data data;

	spinlock_t lock; /* protects concurent access to gates */

	spinlock_t lock; /* protects concurrent access to gates */

	void __iomem *reg;

};
@@ -504,7 +504,7 @@ r9a06g032_register_gate(struct r9a06g032_priv *clocks, 
{

	struct clk *clk;

	struct r9a06g032_clk_gate *g;

	struct clk_init_data init;

	struct clk_init_data init = {};



	g = kzalloc(sizeof(*g), GFP_KERNEL);

	if (!g)
@@ -674,7 +674,7 @@ r9a06g032_register_div(struct r9a06g032_priv *clocks, 
{

	struct r9a06g032_clk_div *div;

	struct clk *clk;

	struct clk_init_data init;

	struct clk_init_data init = {};

	unsigned int i;



	div = kzalloc(sizeof(*div), GFP_KERNEL);
@@ -758,7 +758,7 @@ r9a06g032_register_bitsel(struct r9a06g032_priv *clocks, 
{

	struct clk *clk;

	struct r9a06g032_clk_bitsel *g;

	struct clk_init_data init;

	struct clk_init_data init = {};

	const char *names[2];



	/* allocate the gate */
@@ -849,7 +849,7 @@ r9a06g032_register_dualgate(struct r9a06g032_priv *clocks, 
{

	struct r9a06g032_clk_dualgate *g;

	struct clk *clk;

	struct clk_init_data init;

	struct clk_init_data init = {};



	/* allocate the gate */

	g = kzalloc(sizeof(*g), GFP_KERNEL);

drivers/clk/renesas/rcar-cpg-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ struct clk * __init cpg_sd_clk_register(const char *name, 
	void __iomem *base, unsigned int offset, const char *parent_name,

	struct raw_notifier_head *notifiers, bool skip_first)

{

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct sd_clock *clock;

	struct clk *clk;

	u32 val;

drivers/clk/renesas/rcar-gen2-cpg.c

+1 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct clk * __init cpg_z_clk_register(const char *name, 
					      const char *parent_name,

					      void __iomem *base)

{

	struct clk_init_data init;

	struct clk_init_data init = {};

	struct cpg_z_clk *zclk;

	struct clk *clk;
@@ -147,7 +147,6 @@ static struct clk * __init cpg_z_clk_register(const char *name, 


	init.name = name;

	init.ops = &cpg_z_clk_ops;

	init.flags = 0;

	init.parent_names = &parent_name;

	init.num_parents = 1;