Merge "ASoC: wcd9335: Fix alignment issue for Slimbus-I2S bridge" (600d1631) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/codecs/wcd9335.c

+18 −12

Original line number	Diff line number	Diff line
		@@ -4005,19 +4005,13 @@ static void tasha_codec_bridge_mclk_enable(struct snd_soc_codec *codec,
		*/
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_I2S_CLK,
		0x02, 0x02);
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_I2S_CLK,
		0x1, 0x0);
		0x03, 0x02);
		} else {
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_I2S_CLK,
		0x02, 0x00);
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_I2S_CLK,
		0x1, 0x1);
		};
		};
		0x03, 0x01);
		}
		}

		static int tasha_codec_bridge_tx_mclk_supply(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol,
		@@ -11818,6 +11812,12 @@ static int tasha_hw_params(struct snd_pcm_substream *substream,
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_RX_I2S_CTL,
		0x1c, (rx_fs_rate << 2));
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_TX_I2S_CTL,
		0x20, i2s_bit_mode << 5);
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_TX_I2S_CTL,
		0x1c, (rx_fs_rate << 2));
		}
		break;
		case SNDRV_PCM_STREAM_CAPTURE:
		@@ -11936,13 +11936,19 @@ static int tasha_hw_params(struct snd_pcm_substream *substream,
		snd_soc_update_bits(dai->codec,
		WCD9335_DATA_HUB_DATA_HUB_TX_I2S_CTL,
		0x1C, (tx_fs_rate << 2));
		};
		snd_soc_update_bits(codec,
		WCD9335_DATA_HUB_DATA_HUB_RX_I2S_CTL,
		0x20, i2s_bit_mode << 5);
		snd_soc_update_bits(dai->codec,
		WCD9335_DATA_HUB_DATA_HUB_RX_I2S_CTL,
		0x1C, (tx_fs_rate << 2));
		}
		break;
		default:
		pr_err("%s: Invalid stream type %d\n", __func__,
		substream->stream);
		return -EINVAL;
		};
		}
		if (dai->id == AIF4_VIFEED)
		tasha->dai[dai->id].bit_width = 32;