You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
clk: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@kernel.org> Cc: linux-clk@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-renesas-soc@vger.kernel.org Cc: linux-omap@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
This commit is contained in:
committed by
Stephen Boyd
parent
5b394b2ddf
commit
e665f029a2
@@ -301,13 +301,13 @@ static void __init of_axs10x_pll_clk_setup(struct device_node *node)
|
||||
|
||||
ret = clk_hw_register(NULL, &pll_clk->hw);
|
||||
if (ret) {
|
||||
pr_err("failed to register %s clock\n", node->name);
|
||||
pr_err("failed to register %pOFn clock\n", node);
|
||||
goto err_unmap_lock;
|
||||
}
|
||||
|
||||
ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll_clk->hw);
|
||||
if (ret) {
|
||||
pr_err("failed to add hw provider for %s clock\n", node->name);
|
||||
pr_err("failed to add hw provider for %pOFn clock\n", node);
|
||||
goto err_unregister_clk;
|
||||
}
|
||||
|
||||
|
||||
@@ -808,29 +808,29 @@ void __init kona_dt_ccu_setup(struct ccu_data *ccu,
|
||||
|
||||
ret = of_address_to_resource(node, 0, &res);
|
||||
if (ret) {
|
||||
pr_err("%s: no valid CCU registers found for %s\n", __func__,
|
||||
node->name);
|
||||
pr_err("%s: no valid CCU registers found for %pOFn\n", __func__,
|
||||
node);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
range = resource_size(&res);
|
||||
if (range > (resource_size_t)U32_MAX) {
|
||||
pr_err("%s: address range too large for %s\n", __func__,
|
||||
node->name);
|
||||
pr_err("%s: address range too large for %pOFn\n", __func__,
|
||||
node);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
ccu->range = (u32)range;
|
||||
|
||||
if (!ccu_data_valid(ccu)) {
|
||||
pr_err("%s: ccu data not valid for %s\n", __func__, node->name);
|
||||
pr_err("%s: ccu data not valid for %pOFn\n", __func__, node);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
ccu->base = ioremap(res.start, ccu->range);
|
||||
if (!ccu->base) {
|
||||
pr_err("%s: unable to map CCU registers for %s\n", __func__,
|
||||
node->name);
|
||||
pr_err("%s: unable to map CCU registers for %pOFn\n", __func__,
|
||||
node);
|
||||
goto out_err;
|
||||
}
|
||||
ccu->node = of_node_get(node);
|
||||
@@ -848,16 +848,16 @@ void __init kona_dt_ccu_setup(struct ccu_data *ccu,
|
||||
|
||||
ret = of_clk_add_hw_provider(node, of_clk_kona_onecell_get, ccu);
|
||||
if (ret) {
|
||||
pr_err("%s: error adding ccu %s as provider (%d)\n", __func__,
|
||||
node->name, ret);
|
||||
pr_err("%s: error adding ccu %pOFn as provider (%d)\n", __func__,
|
||||
node, ret);
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
if (!kona_ccu_init(ccu))
|
||||
pr_err("Broadcom %s initialization had errors\n", node->name);
|
||||
pr_err("Broadcom %pOFn initialization had errors\n", node);
|
||||
|
||||
return;
|
||||
out_err:
|
||||
kona_ccu_teardown(ccu);
|
||||
pr_err("Broadcom %s setup aborted\n", node->name);
|
||||
pr_err("Broadcom %pOFn setup aborted\n", node);
|
||||
}
|
||||
|
||||
@@ -281,7 +281,7 @@ static void __init asm9260_acc_init(struct device_node *np)
|
||||
|
||||
base = of_io_request_and_map(np, 0, np->name);
|
||||
if (IS_ERR(base))
|
||||
panic("%s: unable to map resource", np->name);
|
||||
panic("%pOFn: unable to map resource", np);
|
||||
|
||||
/* register pll */
|
||||
rate = (ioread32(base + HW_SYSPLLCTRL) & 0xffff) * 1000000;
|
||||
@@ -292,7 +292,7 @@ static void __init asm9260_acc_init(struct device_node *np)
|
||||
ref_clk, 0, rate, accuracy);
|
||||
|
||||
if (IS_ERR(hw))
|
||||
panic("%s: can't register REFCLK. Check DT!", np->name);
|
||||
panic("%pOFn: can't register REFCLK. Check DT!", np);
|
||||
|
||||
for (n = 0; n < ARRAY_SIZE(asm9260_mux_clks); n++) {
|
||||
const struct asm9260_mux_clock *mc = &asm9260_mux_clks[n];
|
||||
|
||||
@@ -669,8 +669,8 @@ static int cdce925_probe(struct i2c_client *client,
|
||||
|
||||
/* Register PLL clocks */
|
||||
for (i = 0; i < data->chip_info->num_plls; ++i) {
|
||||
pll_clk_name[i] = kasprintf(GFP_KERNEL, "%s.pll%d",
|
||||
client->dev.of_node->name, i);
|
||||
pll_clk_name[i] = kasprintf(GFP_KERNEL, "%pOFn.pll%d",
|
||||
client->dev.of_node, i);
|
||||
init.name = pll_clk_name[i];
|
||||
data->pll[i].chip = data;
|
||||
data->pll[i].hw.init = &init;
|
||||
@@ -710,7 +710,7 @@ static int cdce925_probe(struct i2c_client *client,
|
||||
init.flags = 0;
|
||||
init.num_parents = 1;
|
||||
init.parent_names = &parent_name; /* Mux Y1 to input */
|
||||
init.name = kasprintf(GFP_KERNEL, "%s.Y1", client->dev.of_node->name);
|
||||
init.name = kasprintf(GFP_KERNEL, "%pOFn.Y1", client->dev.of_node);
|
||||
data->clk[0].chip = data;
|
||||
data->clk[0].hw.init = &init;
|
||||
data->clk[0].index = 0;
|
||||
@@ -727,8 +727,8 @@ static int cdce925_probe(struct i2c_client *client,
|
||||
init.flags = CLK_SET_RATE_PARENT;
|
||||
init.num_parents = 1;
|
||||
for (i = 1; i < data->chip_info->num_outputs; ++i) {
|
||||
init.name = kasprintf(GFP_KERNEL, "%s.Y%d",
|
||||
client->dev.of_node->name, i+1);
|
||||
init.name = kasprintf(GFP_KERNEL, "%pOFn.Y%d",
|
||||
client->dev.of_node, i+1);
|
||||
data->clk[i].chip = data;
|
||||
data->clk[i].hw.init = &init;
|
||||
data->clk[i].index = i;
|
||||
|
||||
@@ -158,14 +158,14 @@ static struct clk *_of_fixed_factor_clk_setup(struct device_node *node)
|
||||
int ret;
|
||||
|
||||
if (of_property_read_u32(node, "clock-div", &div)) {
|
||||
pr_err("%s Fixed factor clock <%s> must have a clock-div property\n",
|
||||
__func__, node->name);
|
||||
pr_err("%s Fixed factor clock <%pOFn> must have a clock-div property\n",
|
||||
__func__, node);
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
|
||||
if (of_property_read_u32(node, "clock-mult", &mult)) {
|
||||
pr_err("%s Fixed factor clock <%s> must have a clock-mult property\n",
|
||||
__func__, node->name);
|
||||
pr_err("%s Fixed factor clock <%pOFn> must have a clock-mult property\n",
|
||||
__func__, node);
|
||||
return ERR_PTR(-EIO);
|
||||
}
|
||||
|
||||
|
||||
@@ -233,11 +233,11 @@ static int gpio_clk_driver_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(gpiod)) {
|
||||
ret = PTR_ERR(gpiod);
|
||||
if (ret == -EPROBE_DEFER)
|
||||
pr_debug("%s: %s: GPIOs not yet available, retry later\n",
|
||||
node->name, __func__);
|
||||
pr_debug("%pOFn: %s: GPIOs not yet available, retry later\n",
|
||||
node, __func__);
|
||||
else
|
||||
pr_err("%s: %s: Can't get '%s' named GPIO property\n",
|
||||
node->name, __func__,
|
||||
pr_err("%pOFn: %s: Can't get '%s' named GPIO property\n",
|
||||
node, __func__,
|
||||
gpio_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -390,13 +390,13 @@ static void __init of_hsdk_pll_clk_setup(struct device_node *node)
|
||||
|
||||
ret = clk_hw_register(NULL, &pll_clk->hw);
|
||||
if (ret) {
|
||||
pr_err("failed to register %s clock\n", node->name);
|
||||
pr_err("failed to register %pOFn clock\n", node);
|
||||
goto err_unmap_spec_regs;
|
||||
}
|
||||
|
||||
ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll_clk->hw);
|
||||
if (ret) {
|
||||
pr_err("failed to add hw provider for %s clock\n", node->name);
|
||||
pr_err("failed to add hw provider for %pOFn clock\n", node);
|
||||
goto err_unmap_spec_regs;
|
||||
}
|
||||
|
||||
|
||||
@@ -97,8 +97,8 @@ static void __init nomadik_src_init(void)
|
||||
}
|
||||
src_base = of_iomap(np, 0);
|
||||
if (!src_base) {
|
||||
pr_err("%s: must have src parent node with REGS (%s)\n",
|
||||
__func__, np->name);
|
||||
pr_err("%s: must have src parent node with REGS (%pOFn)\n",
|
||||
__func__, np);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -549,7 +549,7 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np)
|
||||
|
||||
ret = of_address_to_resource(clk_np, 0, &res);
|
||||
if (ret) {
|
||||
pr_err("%s: failed to get resource, ret %d\n", clk_np->name,
|
||||
pr_err("%pOFn: failed to get resource, ret %d\n", clk_np,
|
||||
ret);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -195,8 +195,8 @@ static void palmas_clks_get_clk_data(struct platform_device *pdev,
|
||||
prop = PALMAS_EXT_CONTROL_NSLEEP;
|
||||
break;
|
||||
default:
|
||||
dev_warn(&pdev->dev, "%s: Invalid ext control option: %u\n",
|
||||
node->name, prop);
|
||||
dev_warn(&pdev->dev, "%pOFn: Invalid ext control option: %u\n",
|
||||
node, prop);
|
||||
prop = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -945,8 +945,8 @@ static void __init core_mux_init(struct device_node *np)
|
||||
|
||||
rc = of_clk_add_provider(np, of_clk_src_simple_get, clk);
|
||||
if (rc) {
|
||||
pr_err("%s: Couldn't register clk provider for node %s: %d\n",
|
||||
__func__, np->name, rc);
|
||||
pr_err("%s: Couldn't register clk provider for node %pOFn: %d\n",
|
||||
__func__, np, rc);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1199,8 +1199,8 @@ static void __init legacy_pll_init(struct device_node *np, int idx)
|
||||
|
||||
rc = of_clk_add_provider(np, of_clk_src_onecell_get, onecell_data);
|
||||
if (rc) {
|
||||
pr_err("%s: Couldn't register clk provider for node %s: %d\n",
|
||||
__func__, np->name, rc);
|
||||
pr_err("%s: Couldn't register clk provider for node %pOFn: %d\n",
|
||||
__func__, np, rc);
|
||||
goto err_cell;
|
||||
}
|
||||
|
||||
@@ -1360,7 +1360,7 @@ static void __init clockgen_init(struct device_node *np)
|
||||
is_old_ls1021a = true;
|
||||
}
|
||||
if (!clockgen.regs) {
|
||||
pr_err("%s(): %s: of_iomap() failed\n", __func__, np->name);
|
||||
pr_err("%s(): %pOFn: of_iomap() failed\n", __func__, np);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1406,8 +1406,8 @@ static void __init clockgen_init(struct device_node *np)
|
||||
|
||||
ret = of_clk_add_provider(np, clockgen_clk_get, &clockgen);
|
||||
if (ret) {
|
||||
pr_err("%s: Couldn't register clk provider for node %s: %d\n",
|
||||
__func__, np->name, ret);
|
||||
pr_err("%s: Couldn't register clk provider for node %pOFn: %d\n",
|
||||
__func__, np, ret);
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
@@ -132,7 +132,7 @@ static int scmi_clocks_probe(struct scmi_device *sdev)
|
||||
|
||||
count = handle->clk_ops->count_get(handle);
|
||||
if (count < 0) {
|
||||
dev_err(dev, "%s: invalid clock output count\n", np->name);
|
||||
dev_err(dev, "%pOFn: invalid clock output count\n", np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ static int scpi_clk_add(struct device *dev, struct device_node *np,
|
||||
|
||||
count = of_property_count_strings(np, "clock-output-names");
|
||||
if (count < 0) {
|
||||
dev_err(dev, "%s: invalid clock output count\n", np->name);
|
||||
dev_err(dev, "%pOFn: invalid clock output count\n", np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -232,13 +232,13 @@ static int scpi_clk_add(struct device *dev, struct device_node *np,
|
||||
|
||||
if (of_property_read_string_index(np, "clock-output-names",
|
||||
idx, &name)) {
|
||||
dev_err(dev, "invalid clock name @ %s\n", np->name);
|
||||
dev_err(dev, "invalid clock name @ %pOFn\n", np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (of_property_read_u32_index(np, "clock-indices",
|
||||
idx, &val)) {
|
||||
dev_err(dev, "invalid clock index @ %s\n", np->name);
|
||||
dev_err(dev, "invalid clock index @ %pOFn\n", np);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
@@ -1215,8 +1215,8 @@ static int si5351_dt_parse(struct i2c_client *client,
|
||||
/* per clkout properties */
|
||||
for_each_child_of_node(np, child) {
|
||||
if (of_property_read_u32(child, "reg", &num)) {
|
||||
dev_err(&client->dev, "missing reg property of %s\n",
|
||||
child->name);
|
||||
dev_err(&client->dev, "missing reg property of %pOFn\n",
|
||||
child);
|
||||
goto put_child;
|
||||
}
|
||||
|
||||
|
||||
@@ -1433,7 +1433,7 @@ static void __init stm32f4_rcc_init(struct device_node *np)
|
||||
|
||||
base = of_iomap(np, 0);
|
||||
if (!base) {
|
||||
pr_err("%s: unable to map resource\n", np->name);
|
||||
pr_err("%pOFn: unable to map resource\n", np);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1216,7 +1216,7 @@ static void __init stm32h7_rcc_init(struct device_node *np)
|
||||
/* get RCC base @ from DT */
|
||||
base = of_iomap(np, 0);
|
||||
if (!base) {
|
||||
pr_err("%s: unable to map resource", np->name);
|
||||
pr_err("%pOFn: unable to map resource", np);
|
||||
goto err_free_clks;
|
||||
}
|
||||
|
||||
|
||||
@@ -2088,7 +2088,7 @@ static void stm32mp1_rcc_init(struct device_node *np)
|
||||
|
||||
base = of_iomap(np, 0);
|
||||
if (!base) {
|
||||
pr_err("%s: unable to map resource", np->name);
|
||||
pr_err("%pOFn: unable to map resource", np);
|
||||
of_node_put(np);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -54,13 +54,13 @@ static void __init tango4_clkgen_setup(struct device_node *np)
|
||||
const char *parent = of_clk_get_parent_name(np, 0);
|
||||
|
||||
if (!base)
|
||||
panic("%s: invalid address\n", np->name);
|
||||
panic("%pOFn: invalid address\n", np);
|
||||
|
||||
if (readl(base + CPUCLK_DIV) & DIV_BYPASS)
|
||||
panic("%s: unsupported cpuclk setup\n", np->name);
|
||||
panic("%pOFn: unsupported cpuclk setup\n", np);
|
||||
|
||||
if (readl(base + SYSCLK_DIV) & DIV_BYPASS)
|
||||
panic("%s: unsupported sysclk setup\n", np->name);
|
||||
panic("%pOFn: unsupported sysclk setup\n", np);
|
||||
|
||||
writel(0x100, base + CPUCLK_DIV); /* disable frequency ramping */
|
||||
|
||||
@@ -77,9 +77,9 @@ static void __init tango4_clkgen_setup(struct device_node *np)
|
||||
pp[3] = clk_register_fixed_factor(NULL, "sdio_clk", "cd6", 0, 1, 2);
|
||||
|
||||
if (IS_ERR(pp[0]) || IS_ERR(pp[1]) || IS_ERR(pp[2]) || IS_ERR(pp[3]))
|
||||
panic("%s: clk registration failed\n", np->name);
|
||||
panic("%pOFn: clk registration failed\n", np);
|
||||
|
||||
if (of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data))
|
||||
panic("%s: clk provider registration failed\n", np->name);
|
||||
panic("%pOFn: clk provider registration failed\n", np);
|
||||
}
|
||||
CLK_OF_DECLARE(tango4_clkgen, "sigma,tango4-clkgen", tango4_clkgen_setup);
|
||||
|
||||
@@ -245,7 +245,7 @@ static void __init of_psc_clk_init(struct device_node *node, spinlock_t *lock)
|
||||
return;
|
||||
}
|
||||
|
||||
pr_err("%s: error registering clk %s\n", __func__, node->name);
|
||||
pr_err("%s: error registering clk %pOFn\n", __func__, node);
|
||||
|
||||
unmap_domain:
|
||||
iounmap(data->domain_base);
|
||||
|
||||
@@ -219,7 +219,7 @@ static void __init _of_pll_clk_init(struct device_node *node, bool pllctrl)
|
||||
}
|
||||
|
||||
out:
|
||||
pr_err("%s: error initializing pll %s\n", __func__, node->name);
|
||||
pr_err("%s: error initializing pll %pOFn\n", __func__, node);
|
||||
kfree(pll_data);
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user