Merge "ASoC: wcd: update handling of invalid cases" (7b792205) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd9330.c

+2 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -3262,7 +3262,7 @@ static int tomtom_codec_enable_dmic(struct snd_soc_dapm_widget *w,

		static int tomtom_codec_config_mad(struct snd_soc_codec *codec)
		{
		int ret;
		int ret = 0;
		const struct firmware *fw;
		struct firmware_cal *hwdep_cal = NULL;
		struct mad_audio_cal *mad_cal;

+6 −1

Original line number	Diff line number	Diff line
		@@ -8123,7 +8123,8 @@ static int tasha_config_compander(struct snd_soc_codec *codec, int interp_n,

		static int tasha_codec_config_mad(struct snd_soc_codec *codec)
		{
		int ret, idx;
		int ret = 0;
		int idx;
		const struct firmware *fw;
		struct firmware_cal *hwdep_cal = NULL;
		struct wcd_mad_audio_cal *mad_cal = NULL;
		@@ -10727,6 +10728,8 @@ static int tasha_hw_params(struct snd_pcm_substream *substream,
		tasha->dai[dai->id].bit_width = 24;
		i2s_bit_mode = 0x00;
		break;
		default:
		return -EINVAL;
		}
		tasha->dai[dai->id].rate = params_rate(params);
		if (tasha->intf_type == WCD9XXX_INTERFACE_TYPE_I2C) {
		@@ -11326,6 +11329,8 @@ static ssize_t tasha_codec_version_read(struct snd_info_entry *entry,
		len = snprintf(buffer, sizeof(buffer), "WCD9335_1_0\n");
		else if (TASHA_IS_1_1(wcd9xxx->version))
		len = snprintf(buffer, sizeof(buffer), "WCD9335_1_1\n");
		else
		snprintf(buffer, sizeof(buffer), "VER_UNDEFINED\n");
		} else if (wcd9xxx->codec_type->id_major == TASHA2P0_MAJOR) {
		len = snprintf(buffer, sizeof(buffer), "WCD9335_2_0\n");
		} else

+8 −0

Original line number	Diff line number	Diff line
		@@ -284,6 +284,8 @@ static void wcd_clsh_set_gain_path(struct snd_soc_codec *codec,
		case CLS_H_LP:
		val = 0x01;
		break;
		default:
		return;
		};
		snd_soc_update_bits(codec, WCD9XXX_HPH_L_EN, 0xC0, (val << 6));
		snd_soc_update_bits(codec, WCD9XXX_HPH_R_EN, 0xC0, (val << 6));
		@@ -320,6 +322,8 @@ static void wcd_clsh_set_hph_mode(struct snd_soc_codec *codec,
		val = 0x04;
		ipeak = DELTA_I_30MA;
		break;
		default:
		return;
		};

		snd_soc_update_bits(codec, WCD9XXX_A_ANA_HPH, 0x0C, val);
		@@ -405,6 +409,8 @@ static void wcd_clsh_state_hph_ear(struct snd_soc_codec *codec,
		else if (clsh_d->state & WCD_CLSH_STATE_HPHR)
		hph_mode = wcd_clsh_get_int_mode(clsh_d,
		WCD_CLSH_STATE_HPHR);
		else
		return;
		if (hph_mode != CLS_AB && !is_native_44_1_active(codec))
		snd_soc_update_bits(codec,
		WCD9XXX_A_CDC_RX0_RX_PATH_CFG0,
		@@ -606,6 +612,8 @@ static void wcd_clsh_state_hph_lo(struct snd_soc_codec *codec,
		else if (clsh_d->state & WCD_CLSH_STATE_HPHR)
		hph_mode = wcd_clsh_get_int_mode(clsh_d,
		WCD_CLSH_STATE_HPHR);
		else
		return;
		dev_dbg(codec->dev, "%s: hph_mode = %d\n", __func__,
		hph_mode);