diff options
author | Alex Elder <elder@linaro.org> | 2014-04-21 17:11:38 -0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-04-30 14:51:30 -0400 |
commit | e756325206ebf284d00410077ea43eb53de8e9bf (patch) | |
tree | 83a457f304e8f2ec9b3e5f998ff10545bb28c8fc /drivers/clk/bcm/clk-kona-setup.c | |
parent | 4bac65ca7d86b7e219138706e9f687753ccbfee9 (diff) |
clk: bcm281xx: use init_data.name for clock name
Use the init_data.name field to hold the name of a Kona clock rather
than duplicating it.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/bcm/clk-kona-setup.c')
-rw-r--r-- | drivers/clk/bcm/clk-kona-setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/clk/bcm/clk-kona-setup.c b/drivers/clk/bcm/clk-kona-setup.c index 54a06526f64f..9e7a9c11c951 100644 --- a/drivers/clk/bcm/clk-kona-setup.c +++ b/drivers/clk/bcm/clk-kona-setup.c | |||
@@ -64,7 +64,7 @@ static bool peri_clk_data_offsets_valid(struct kona_clk *bcm_clk) | |||
64 | 64 | ||
65 | BUG_ON(bcm_clk->type != bcm_clk_peri); | 65 | BUG_ON(bcm_clk->type != bcm_clk_peri); |
66 | peri = bcm_clk->u.peri; | 66 | peri = bcm_clk->u.peri; |
67 | name = bcm_clk->name; | 67 | name = bcm_clk->init_data.name; |
68 | range = bcm_clk->ccu->range; | 68 | range = bcm_clk->ccu->range; |
69 | 69 | ||
70 | limit = range - sizeof(u32); | 70 | limit = range - sizeof(u32); |
@@ -330,7 +330,7 @@ peri_clk_data_valid(struct kona_clk *bcm_clk) | |||
330 | return false; | 330 | return false; |
331 | 331 | ||
332 | peri = bcm_clk->u.peri; | 332 | peri = bcm_clk->u.peri; |
333 | name = bcm_clk->name; | 333 | name = bcm_clk->init_data.name; |
334 | gate = &peri->gate; | 334 | gate = &peri->gate; |
335 | if (gate_exists(gate) && !gate_valid(gate, "gate", name)) | 335 | if (gate_exists(gate) && !gate_valid(gate, "gate", name)) |
336 | return false; | 336 | return false; |
@@ -631,7 +631,7 @@ struct clk *kona_clk_setup(struct ccu_data *ccu, const char *name, | |||
631 | return NULL; | 631 | return NULL; |
632 | } | 632 | } |
633 | bcm_clk->ccu = ccu; | 633 | bcm_clk->ccu = ccu; |
634 | bcm_clk->name = name; | 634 | bcm_clk->init_data.name = name; |
635 | 635 | ||
636 | init_data = &bcm_clk->init_data; | 636 | init_data = &bcm_clk->init_data; |
637 | init_data->name = name; | 637 | init_data->name = name; |