Merge "clk: qcom: clk-aop-qmp: Fix issue with registering the clock provider" (97f1b758) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/clk/qcom/clk-aop-qmp.c

+38 −12

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2017, The Linux Foundation. All rights reserved.
		* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
		*/

		#define pr_fmt(fmt) "%s: " fmt, __func__
		@@ -129,6 +129,12 @@ static int clk_aop_qmp_prepare(struct clk_hw *hw)
		struct clk_aop_qmp *clk = to_aop_qmp_clk(hw);

		mutex_lock(&clk_aop_lock);
		/*
		* Return early if the clock has been enabled already. This
		* is to avoid issues with sending duplicate enable requests.
		*/
		if (clk->enabled)
		goto err;

		if (clk->level)
		rate = clk->level;
		@@ -167,6 +173,9 @@ static void clk_aop_qmp_unprepare(struct clk_hw *hw)

		mutex_lock(&clk_aop_lock);

		if (!clk->enabled)
		goto err;

		rate = clk->disable_state;

		snprintf(mbox_msg, MAX_LEN, "{class: %s, res: %s, val: %ld}",
		@@ -213,9 +222,10 @@ static struct clk_hw *aop_qmp_clk_hws[] = {
		};

		static int qmp_update_client(struct clk_hw hw, struct device dev,
		struct mbox_chan *mbox)
		struct mbox_chan **mbox)
		{
		struct clk_aop_qmp *clk_aop = to_aop_qmp_clk(hw);
		int ret;

		/* Use mailbox client with blocking mode */
		clk_aop->cl.dev = dev;
		@@ -223,17 +233,19 @@ static int qmp_update_client(struct clk_hw hw, struct device dev,
		clk_aop->cl.tx_tout = MBOX_TOUT_MS;
		clk_aop->cl.knows_txdone = false;

		if (mbox) {
		clk_aop->mbox = mbox;
		if (*mbox) {
		clk_aop->mbox = *mbox;
		return 0;
		}

		/* Allocate mailbox channel */
		mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
		if (IS_ERR(clk_aop->mbox) && PTR_ERR(clk_aop->mbox) != -EPROBE_DEFER) {
		dev_err(dev, "Failed to get mailbox channel %pK %ld\n",
		mbox, PTR_ERR(mbox));
		return PTR_ERR(clk_aop->mbox);
		*mbox = clk_aop->mbox = mbox_request_channel(&clk_aop->cl, 0);
		if (IS_ERR(clk_aop->mbox)) {
		ret = PTR_ERR(clk_aop->mbox);
		if (ret != -EPROBE_DEFER)
		dev_err(dev, "Failed to get mailbox channel, ret %d\n",
		ret);
		return ret;
		}

		return 0;
		@@ -244,6 +256,7 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
		struct clk *clk = NULL;
		struct device_node *np = pdev->dev.of_node;
		struct mbox_chan *mbox = NULL;
		struct clk_onecell_data *clk_data;
		int num_clks = ARRAY_SIZE(aop_qmp_clk_hws);
		int ret = 0, i = 0;

		@@ -251,14 +264,25 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
		* Allocate mbox channel for the first clock client. The same channel
		* would be used for the rest of the clock clients.
		*/
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
		if (ret < 0)
		return ret;

		clk_data = devm_kzalloc(&pdev->dev, sizeof(*clk_data), GFP_KERNEL);
		if (!clk_data)
		return -ENOMEM;

		clk_data->clks = devm_kcalloc(&pdev->dev, num_clks,
		sizeof(*clk_data->clks), GFP_KERNEL);
		if (!clk_data->clks)
		return -ENOMEM;

		clk_data->clk_num = num_clks;

		for (i = 1; i < num_clks; i++) {
		if (!aop_qmp_clk_hws[i])
		continue;
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, mbox);
		ret = qmp_update_client(aop_qmp_clk_hws[i], &pdev->dev, &mbox);
		if (ret < 0) {
		dev_err(&pdev->dev, "Failed to update QMP client %d\n",
		ret);
		@@ -277,14 +301,16 @@ static int aop_qmp_clk_probe(struct platform_device *pdev)
		for (i = 0; i < num_clks; i++) {
		if (!aop_qmp_clk_hws[i])
		continue;

		clk = devm_clk_register(&pdev->dev, aop_qmp_clk_hws[i]);
		if (IS_ERR(clk)) {
		ret = PTR_ERR(clk);
		goto fail;
		}
		clk_data->clks[i] = clk;
		}

		ret = of_clk_add_provider(np, of_clk_src_simple_get, clk);
		ret = of_clk_add_provider(np, of_clk_src_onecell_get, clk_data);
		if (ret) {
		dev_err(&pdev->dev, "Failed to register clock provider\n");
		goto fail;