Merge d48f0b5e1e335ed11a380feed353ed913ae8596e on remote branch (38a23b55) · Commits · e / devices / android_kernel_fairphone_FP5

asoc/codecs/bolero/bolero-cdc.c

+7 −1

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

		#include <linux/of_platform.h>
		@@ -702,6 +702,7 @@ int bolero_register_macro(struct device *dev, u16 macro_id,
		priv->macro_params[macro_id].reg_wake_irq =
		ops->reg_wake_irq;
		}
		mutex_lock(&priv->macro_lock);
		priv->num_dais += ops->num_dais;
		priv->num_macros_registered++;
		priv->macros_supported[macro_id] = true;
		@@ -712,6 +713,7 @@ int bolero_register_macro(struct device *dev, u16 macro_id,
		ret = bolero_copy_dais_from_macro(priv);
		if (ret < 0) {
		dev_err(dev, "%s: copy_dais failed\n", __func__);
		mutex_unlock(&priv->macro_lock);
		return ret;
		}
		if (priv->macros_supported[TX_MACRO] == false) {
		@@ -724,9 +726,11 @@ int bolero_register_macro(struct device *dev, u16 macro_id,
		priv->bolero_dais, priv->num_dais);
		if (ret < 0) {
		dev_err(dev, "%s: register codec failed\n", __func__);
		mutex_unlock(&priv->macro_lock);
		return ret;
		}
		}
		mutex_unlock(&priv->macro_lock);
		return 0;
		}
		EXPORT_SYMBOL(bolero_register_macro);
		@@ -1395,6 +1399,7 @@ static int bolero_probe(struct platform_device *pdev)
		priv->core_audio_vote_count = 0;

		dev_set_drvdata(&pdev->dev, priv);
		mutex_init(&priv->macro_lock);
		mutex_init(&priv->io_lock);
		mutex_init(&priv->clk_lock);
		mutex_init(&priv->vote_lock);
		@@ -1435,6 +1440,7 @@ static int bolero_remove(struct platform_device *pdev)
		return -EINVAL;

		of_platform_depopulate(&pdev->dev);
		mutex_destroy(&priv->macro_lock);
		mutex_destroy(&priv->io_lock);
		mutex_destroy(&priv->clk_lock);
		mutex_destroy(&priv->vote_lock);

asoc/codecs/bolero/internal.h

+2 −1

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

		#ifndef _BOLERO_INTERNAL_H
		@@ -28,6 +28,7 @@ struct bolero_priv {
		struct device *dev;
		struct snd_soc_component *component;
		struct regmap *regmap;
		struct mutex macro_lock;
		struct mutex io_lock;
		struct mutex clk_lock;
		struct mutex vote_lock;

asoc/codecs/wcd9xxx-core.c

+5 −2

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

		#include <linux/kernel.h>
		@@ -1200,9 +1200,12 @@ static int wcd9xxx_i2c_probe(struct i2c_client *client,
		wcd9xxx_set_intf_type(WCD9XXX_INTERFACE_TYPE_I2C);

		return ret;
		} else {
		ret = -EINVAL;
		pr_err("%s: I2C probe in wrong state, ret %d\n", __func__, ret);
		goto fail;
		}

		pr_err("%s: I2C probe in wrong state\n", __func__);


		err_device_init: