tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'clk-mvebu-3.18-2' of git://git.infradead.org/linux-mvebu into clk-next

Browse Source 
clock mvebu changes for v3.18 (round 2)

 - armada 370/375
    - Fix SSCG node lookup
This commit is contained in:
Mike Turquette
2014-10-03 16:43:02 -07:00
parent 23c4a3a521 5f093ee76c
commit a66993e05b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/clk/mvebu/common.c
+3 -3
View File
@@ -41,7 +41,7 @@ static struct clk_onecell_data clk_data;
* chosen following the dt convention: using the first known SoC
* compatible with it.
*/
u32 kirkwood_fix_sscg_deviation(struct device_node *np, u32 system_clk)
u32 kirkwood_fix_sscg_deviation(u32 system_clk)
{
struct device_node *sscg_np = NULL;
void __iomem *sscg_map;
@@ -49,7 +49,7 @@ u32 kirkwood_fix_sscg_deviation(struct device_node *np, u32 system_clk)
s32 low_bound, high_bound;
u64 freq_swing_half;
sscg_np = of_find_node_by_name(np, "sscg");
sscg_np = of_find_node_by_name(NULL, "sscg");
if (sscg_np == NULL) {
pr_err("cannot get SSCG register node\n");
return system_clk;
@@ -142,7 +142,7 @@ void __init mvebu_coreclk_setup(struct device_node *np,
if (desc->is_sscg_enabled && desc->fix_sscg_deviation
&& desc->is_sscg_enabled(base))
rate = desc->fix_sscg_deviation(np, rate);
rate = desc->fix_sscg_deviation(rate);
clk_data.clks[1] = clk_register_fixed_rate(NULL, cpuclk_name, NULL,
CLK_IS_ROOT, rate);
drivers/clk/mvebu/common.h
+2 -2
View File
@@ -31,7 +31,7 @@ struct coreclk_soc_desc {
u32 (*get_cpu_freq)(void __iomem *sar);
void (*get_clk_ratio)(void __iomem *sar, int id, int *mult, int *div);
bool (*is_sscg_enabled)(void __iomem *sar);
u32 (*fix_sscg_deviation)(struct device_node *np, u32 system_clk);
u32 (*fix_sscg_deviation)(u32 system_clk);
const struct coreclk_ratio *ratios;
int num_ratios;
};
@@ -53,5 +53,5 @@ void __init mvebu_clk_gating_setup(struct device_node *np,
* This function is shared among the Kirkwood, Armada 370, Armada XP
* and Armada 375 SoC
*/
u32 kirkwood_fix_sscg_deviation(struct device_node *np, u32 system_clk);
u32 kirkwood_fix_sscg_deviation(u32 system_clk);
#endif