mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-26 05:34:13 +08:00
Merge branch 'clk-of' into clk-next
* clk-of: clk: Use of_node_name_eq for node name comparisons
This commit is contained in:
commit
2de34ed964
@ -280,7 +280,7 @@ int cpg_mstp_attach_dev(struct generic_pm_domain *unused, struct device *dev)
|
||||
goto found;
|
||||
|
||||
/* BSC on r8a73a4/sh73a0 uses zb_clk instead of an mstp clock */
|
||||
if (!strcmp(clkspec.np->name, "zb_clk"))
|
||||
if (of_node_name_eq(clkspec.np, "zb_clk"))
|
||||
goto found;
|
||||
|
||||
of_node_put(clkspec.np);
|
||||
|
@ -448,7 +448,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
|
||||
char *c;
|
||||
|
||||
if (!(ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT) &&
|
||||
!strcmp(node->name, "clk"))
|
||||
of_node_name_eq(node, "clk"))
|
||||
ti_clk_features.flags |= TI_CLK_CLKCTRL_COMPAT;
|
||||
|
||||
addrp = of_get_address(node, 0, NULL, NULL);
|
||||
|
@ -410,7 +410,7 @@ static void __init of_ti_omap3_dpll_setup(struct device_node *node)
|
||||
|
||||
if ((of_machine_is_compatible("ti,omap3630") ||
|
||||
of_machine_is_compatible("ti,omap36xx")) &&
|
||||
!strcmp(node->name, "dpll5_ck"))
|
||||
of_node_name_eq(node, "dpll5_ck"))
|
||||
of_ti_dpll_setup(node, &omap3_dpll5_ck_ops, &dd);
|
||||
else
|
||||
of_ti_dpll_setup(node, &omap3_dpll_ck_ops, &dd);
|
||||
|
@ -545,21 +545,21 @@ static void u8500_clk_init(struct device_node *np)
|
||||
for_each_child_of_node(np, child) {
|
||||
static struct clk_onecell_data clk_data;
|
||||
|
||||
if (!of_node_cmp(child->name, "prcmu-clock")) {
|
||||
if (of_node_name_eq(child, "prcmu-clock")) {
|
||||
clk_data.clks = prcmu_clk;
|
||||
clk_data.clk_num = ARRAY_SIZE(prcmu_clk);
|
||||
of_clk_add_provider(child, of_clk_src_onecell_get, &clk_data);
|
||||
}
|
||||
if (!of_node_cmp(child->name, "prcc-periph-clock"))
|
||||
if (of_node_name_eq(child, "prcc-periph-clock"))
|
||||
of_clk_add_provider(child, ux500_twocell_get, prcc_pclk);
|
||||
|
||||
if (!of_node_cmp(child->name, "prcc-kernel-clock"))
|
||||
if (of_node_name_eq(child, "prcc-kernel-clock"))
|
||||
of_clk_add_provider(child, ux500_twocell_get, prcc_kclk);
|
||||
|
||||
if (!of_node_cmp(child->name, "rtc32k-clock"))
|
||||
if (of_node_name_eq(child, "rtc32k-clock"))
|
||||
of_clk_add_provider(child, of_clk_src_simple_get, rtc_clk);
|
||||
|
||||
if (!of_node_cmp(child->name, "smp-twd-clock"))
|
||||
if (of_node_name_eq(child, "smp-twd-clock"))
|
||||
of_clk_add_provider(child, of_clk_src_simple_get, twd_clk);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user