Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43184630 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: codecs: CSR access requires AHB clock from bolero 1.1"

parents b9e82730 1a58793f

asoc/codecs/bolero/bolero-cdc.c

+22 −14
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ static int __bolero_reg_read(struct bolero_priv *priv, 
	if (priv->macro_params[VA_MACRO].dev)

		pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);



	if (priv->version < BOLERO_VERSION_2_0) {

		/* Request Clk before register access */

		ret = bolero_clk_rsc_request_clock(priv->macro_params[macro_id].dev,

				priv->macro_params[macro_id].default_clk_id,
@@ -111,13 +112,16 @@ static int __bolero_reg_read(struct bolero_priv *priv, 
				true);

		if (ret < 0) {

			dev_err_ratelimited(priv->dev,

			"%s: Failed to enable clock, ret:%d\n", __func__, ret);

				"%s: Failed to enable clock, ret:%d\n",

				__func__, ret);

			goto err;

		}

	}



	bolero_ahb_read_device(

		priv->macro_params[macro_id].io_base, reg, val);



	if (priv->version < BOLERO_VERSION_2_0)

		bolero_clk_rsc_request_clock(priv->macro_params[macro_id].dev,

				priv->macro_params[macro_id].default_clk_id,

				priv->macro_params[macro_id].clk_id_req,
@@ -148,6 +152,7 @@ static int __bolero_reg_write(struct bolero_priv *priv, 
	if (priv->macro_params[VA_MACRO].dev)

		pm_runtime_get_sync(priv->macro_params[VA_MACRO].dev);



	if (priv->version < BOLERO_VERSION_2_0) {

		/* Request Clk before register access */

		ret = bolero_clk_rsc_request_clock(priv->macro_params[macro_id].dev,

				priv->macro_params[macro_id].default_clk_id,
@@ -155,13 +160,16 @@ static int __bolero_reg_write(struct bolero_priv *priv, 
				true);

		if (ret < 0) {

			dev_err_ratelimited(priv->dev,

			"%s: Failed to enable clock, ret:%d\n", __func__, ret);

				"%s: Failed to enable clock, ret:%d\n",

				__func__, ret);

			goto err;

		}

	}



	bolero_ahb_write_device(

			priv->macro_params[macro_id].io_base, reg, val);



	if (priv->version < BOLERO_VERSION_2_0)

		bolero_clk_rsc_request_clock(priv->macro_params[macro_id].dev,

				priv->macro_params[macro_id].default_clk_id,

				priv->macro_params[macro_id].clk_id_req,