diff options
| author | Mike Turquette | 2014-05-13 01:55:33 +0200 |
|---|---|---|
| committer | Mike Turquette | 2014-05-13 01:55:33 +0200 |
| commit | e07b2b59c98b79a116254ce61afa76d4702ea6c5 (patch) | |
| tree | c1f66b8929e976e8537ae16f6f5b59eb03d96306 /drivers/clk | |
| parent | clk: sunxi: Implement MMC phase control (diff) | |
| parent | clk: shmobile: clk-mstp: change to using clock-indices (diff) | |
| download | kernel-qcow2-linux-e07b2b59c98b79a116254ce61afa76d4702ea6c5.tar.gz kernel-qcow2-linux-e07b2b59c98b79a116254ce61afa76d4702ea6c5.tar.xz kernel-qcow2-linux-e07b2b59c98b79a116254ce61afa76d4702ea6c5.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/shmobile/clk-mstp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/clk/shmobile/clk-mstp.c b/drivers/clk/shmobile/clk-mstp.c index 2e5810c88d11..1f6324e29a80 100644 --- a/drivers/clk/shmobile/clk-mstp.c +++ b/drivers/clk/shmobile/clk-mstp.c @@ -156,6 +156,7 @@ cpg_mstp_clock_register(const char *name, const char *parent_name, static void __init cpg_mstp_clocks_init(struct device_node *np) { struct mstp_clock_group *group; + const char *idxname; struct clk **clks; unsigned int i; @@ -184,6 +185,11 @@ static void __init cpg_mstp_clocks_init(struct device_node *np) for (i = 0; i < MSTP_MAX_CLOCKS; ++i) clks[i] = ERR_PTR(-ENOENT); + if (of_find_property(np, "clock-indices", &i)) + idxname = "clock-indices"; + else + idxname = "renesas,clock-indices"; + for (i = 0; i < MSTP_MAX_CLOCKS; ++i) { const char *parent_name; const char *name; @@ -197,8 +203,7 @@ static void __init cpg_mstp_clocks_init(struct device_node *np) continue; parent_name = of_clk_get_parent_name(np, i); - ret = of_property_read_u32_index(np, "renesas,clock-indices", i, - &clkidx); + ret = of_property_read_u32_index(np, idxname, i, &clkidx); if (parent_name == NULL || ret < 0) break; |