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

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
...@@ -216,7 +216,7 @@ struct clk * __init cpg_div6_register(const char *name, ...@@ -216,7 +216,7 @@ struct clk * __init cpg_div6_register(const char *name,
struct raw_notifier_head *notifiers) struct raw_notifier_head *notifiers)
{ {
unsigned int valid_parents; unsigned int valid_parents;
struct clk_init_data init; struct clk_init_data init = {};
struct div6_clock *clock; struct div6_clock *clock;
struct clk *clk; struct clk *clk;
unsigned int i; unsigned int i;
...@@ -267,7 +267,6 @@ struct clk * __init cpg_div6_register(const char *name, ...@@ -267,7 +267,6 @@ struct clk * __init cpg_div6_register(const char *name,
/* Register the clock. */ /* Register the clock. */
init.name = name; init.name = name;
init.ops = &cpg_div6_clock_ops; init.ops = &cpg_div6_clock_ops;
init.flags = 0;
init.parent_names = parent_names; init.parent_names = parent_names;
init.num_parents = valid_parents; init.num_parents = valid_parents;
......
...@@ -150,7 +150,7 @@ static struct clk * __init cpg_mstp_clock_register(const char *name, ...@@ -150,7 +150,7 @@ static struct clk * __init cpg_mstp_clock_register(const char *name,
const char *parent_name, unsigned int index, const char *parent_name, unsigned int index,
struct mstp_clock_group *group) struct mstp_clock_group *group)
{ {
struct clk_init_data init; struct clk_init_data init = {};
struct mstp_clock *clock; struct mstp_clock *clock;
struct clk *clk; struct clk *clk;
......
...@@ -279,7 +279,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { ...@@ -279,7 +279,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = {
/* /*
* These are not hardware clocks, but are needed to handle the special * 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 * 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, .index = R9A06G032_UART_GROUP_012,
...@@ -311,7 +311,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { ...@@ -311,7 +311,7 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = {
struct r9a06g032_priv { struct r9a06g032_priv {
struct clk_onecell_data data; struct clk_onecell_data data;
spinlock_t lock; /* protects concurent access to gates */ spinlock_t lock; /* protects concurrent access to gates */
void __iomem *reg; void __iomem *reg;
}; };
...@@ -504,7 +504,7 @@ r9a06g032_register_gate(struct r9a06g032_priv *clocks, ...@@ -504,7 +504,7 @@ r9a06g032_register_gate(struct r9a06g032_priv *clocks,
{ {
struct clk *clk; struct clk *clk;
struct r9a06g032_clk_gate *g; struct r9a06g032_clk_gate *g;
struct clk_init_data init; struct clk_init_data init = {};
g = kzalloc(sizeof(*g), GFP_KERNEL); g = kzalloc(sizeof(*g), GFP_KERNEL);
if (!g) if (!g)
...@@ -674,7 +674,7 @@ r9a06g032_register_div(struct r9a06g032_priv *clocks, ...@@ -674,7 +674,7 @@ r9a06g032_register_div(struct r9a06g032_priv *clocks,
{ {
struct r9a06g032_clk_div *div; struct r9a06g032_clk_div *div;
struct clk *clk; struct clk *clk;
struct clk_init_data init; struct clk_init_data init = {};
unsigned int i; unsigned int i;
div = kzalloc(sizeof(*div), GFP_KERNEL); div = kzalloc(sizeof(*div), GFP_KERNEL);
...@@ -758,7 +758,7 @@ r9a06g032_register_bitsel(struct r9a06g032_priv *clocks, ...@@ -758,7 +758,7 @@ r9a06g032_register_bitsel(struct r9a06g032_priv *clocks,
{ {
struct clk *clk; struct clk *clk;
struct r9a06g032_clk_bitsel *g; struct r9a06g032_clk_bitsel *g;
struct clk_init_data init; struct clk_init_data init = {};
const char *names[2]; const char *names[2];
/* allocate the gate */ /* allocate the gate */
...@@ -849,7 +849,7 @@ r9a06g032_register_dualgate(struct r9a06g032_priv *clocks, ...@@ -849,7 +849,7 @@ r9a06g032_register_dualgate(struct r9a06g032_priv *clocks,
{ {
struct r9a06g032_clk_dualgate *g; struct r9a06g032_clk_dualgate *g;
struct clk *clk; struct clk *clk;
struct clk_init_data init; struct clk_init_data init = {};
/* allocate the gate */ /* allocate the gate */
g = kzalloc(sizeof(*g), GFP_KERNEL); g = kzalloc(sizeof(*g), GFP_KERNEL);
......
...@@ -226,7 +226,7 @@ struct clk * __init cpg_sd_clk_register(const char *name, ...@@ -226,7 +226,7 @@ struct clk * __init cpg_sd_clk_register(const char *name,
void __iomem *base, unsigned int offset, const char *parent_name, void __iomem *base, unsigned int offset, const char *parent_name,
struct raw_notifier_head *notifiers, bool skip_first) struct raw_notifier_head *notifiers, bool skip_first)
{ {
struct clk_init_data init; struct clk_init_data init = {};
struct sd_clock *clock; struct sd_clock *clock;
struct clk *clk; struct clk *clk;
u32 val; u32 val;
......
...@@ -137,7 +137,7 @@ static struct clk * __init cpg_z_clk_register(const char *name, ...@@ -137,7 +137,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
const char *parent_name, const char *parent_name,
void __iomem *base) void __iomem *base)
{ {
struct clk_init_data init; struct clk_init_data init = {};
struct cpg_z_clk *zclk; struct cpg_z_clk *zclk;
struct clk *clk; struct clk *clk;
...@@ -147,7 +147,6 @@ static struct clk * __init cpg_z_clk_register(const char *name, ...@@ -147,7 +147,6 @@ static struct clk * __init cpg_z_clk_register(const char *name,
init.name = name; init.name = name;
init.ops = &cpg_z_clk_ops; init.ops = &cpg_z_clk_ops;
init.flags = 0;
init.parent_names = &parent_name; init.parent_names = &parent_name;
init.num_parents = 1; init.num_parents = 1;
......
...@@ -143,7 +143,7 @@ static struct clk * __init cpg_z_clk_register(const char *name, ...@@ -143,7 +143,7 @@ static struct clk * __init cpg_z_clk_register(const char *name,
unsigned int div, unsigned int div,
unsigned int offset) unsigned int offset)
{ {
struct clk_init_data init; struct clk_init_data init = {};
struct cpg_z_clk *zclk; struct cpg_z_clk *zclk;
struct clk *clk; struct clk *clk;
......
...@@ -144,7 +144,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) ...@@ -144,7 +144,7 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct usb2_clock_sel_priv *priv; struct usb2_clock_sel_priv *priv;
struct clk *clk; struct clk *clk;
struct clk_init_data init; struct clk_init_data init = {};
int ret; int ret;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
...@@ -188,9 +188,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev) ...@@ -188,9 +188,6 @@ static int rcar_usb2_clock_sel_probe(struct platform_device *pdev)
init.name = "rcar_usb2_clock_sel"; init.name = "rcar_usb2_clock_sel";
init.ops = &usb2_clock_sel_clock_ops; init.ops = &usb2_clock_sel_clock_ops;
init.flags = 0;
init.parent_names = NULL;
init.num_parents = 0;
priv->hw.init = &init; priv->hw.init = &init;
clk = clk_register(NULL, &priv->hw); clk = clk_register(NULL, &priv->hw);
......
...@@ -408,7 +408,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod, ...@@ -408,7 +408,7 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
struct mstp_clock *clock = NULL; struct mstp_clock *clock = NULL;
struct device *dev = priv->dev; struct device *dev = priv->dev;
unsigned int id = mod->id; unsigned int id = mod->id;
struct clk_init_data init; struct clk_init_data init = {};
struct clk *parent, *clk; struct clk *parent, *clk;
const char *parent_name; const char *parent_name;
unsigned int i; unsigned int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment