Commit 9710ee14 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branches 'clk-dt-name', 'clk-ti-of-node' and 'clk-sa' into clk-next 

  - Use updated printk format for OF node names
  - Fix TI code to only search DT subnodes
  - Various static analysis finds

* clk-dt-name:
  clk: Convert to using %pOFn instead of device_node.name

* clk-ti-of-node:
  clk: ti: fix OF child-node lookup

* clk-sa:
  clk: mvebu: armada-37xx-tbg: Switch to clk_get and balance it in probe
  reset: hisilicon: fix potential NULL pointer dereference
  clk: cdce925: release child device nodes
  clk: qcom: clk-branch: Use true and false for boolean values
parents 1affdc35 e665f029 00a461cc 480d99fd

drivers/clk/axs10x/pll_clock.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/clk/bcm/clk-kona-setup.c

+11 −11
Original line number Diff line number Diff line
@@ -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);

}

drivers/clk/clk-asm9260.c

+2 −2
Original line number Diff line number Diff line
@@ -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];

drivers/clk/clk-cdce925.c

+6 −5
Original line number Diff line number Diff line
@@ -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;
@@ -703,6 +703,7 @@ static int cdce925_probe(struct i2c_client *client, 
				0x12 + (i*CDCE925_OFFSET_PLL),

				0x07, value & 0x07);

		}

		of_node_put(np_output);

	}



	/* Register output clock Y1 */
@@ -710,7 +711,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 +728,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;

drivers/clk/clk-fixed-factor.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE