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

Commit 62034372 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: qcs405: Add machine driver changes for new swr master" into audio-drivers.lnx.3.0

parents e38aed40 a1f21ebf

asoc/qcs405.c

+9 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "codecs/msm-cdc-pinctrl.h"

#include "codecs/wcd9335.h"

#include "codecs/wsa881x.h"

#include <dt-bindings/sound/audio-codec-port-types.h>



#define DRV_NAME "qcs405-asoc-snd"
@@ -7098,8 +7099,12 @@ static struct snd_soc_card *populate_snd_card_dailinks(struct device *dev) 


static int msm_wsa881x_init(struct snd_soc_component *component)

{

	u8 spkleft_ports[WSA881X_MAX_SWR_PORTS] = {100, 101, 102, 106};

	u8 spkright_ports[WSA881X_MAX_SWR_PORTS] = {103, 104, 105, 107};

	u8 spkleft_ports[WSA881X_MAX_SWR_PORTS] = {0, 1, 2, 3};

	u8 spkright_ports[WSA881X_MAX_SWR_PORTS] = {0, 1, 2, 3};

	u8 spkleft_port_types[WSA881X_MAX_SWR_PORTS] = {SPKR_L, SPKR_L_COMP,

							SPKR_L_BOOST, SPKR_L_VI};

	u8 spkright_port_types[WSA881X_MAX_SWR_PORTS] = {SPKR_R, SPKR_R_COMP,

							SPKR_R_BOOST, SPKR_R_VI};

	unsigned int ch_rate[WSA881X_MAX_SWR_PORTS] = {2400, 600, 300, 1200};

	unsigned int ch_mask[WSA881X_MAX_SWR_PORTS] = {0x1, 0xF, 0x3, 0x3};

	struct snd_soc_codec *codec = snd_soc_component_to_codec(component);
@@ -7119,7 +7124,7 @@ static int msm_wsa881x_init(struct snd_soc_component *component) 
			__func__, codec->component.name);

		wsa881x_set_channel_map(codec, &spkleft_ports[0],

				WSA881X_MAX_SWR_PORTS, &ch_mask[0],

				&ch_rate[0]);

				&ch_rate[0], &spkleft_port_types[0]);

		if (dapm->component) {

			snd_soc_dapm_ignore_suspend(dapm, "SpkrLeft IN");

			snd_soc_dapm_ignore_suspend(dapm, "SpkrLeft SPKR");
@@ -7129,7 +7134,7 @@ static int msm_wsa881x_init(struct snd_soc_component *component) 
			__func__, codec->component.name);

		wsa881x_set_channel_map(codec, &spkright_ports[0],

				WSA881X_MAX_SWR_PORTS, &ch_mask[0],

				&ch_rate[0]);

				&ch_rate[0], &spkright_port_types[0]);

		if (dapm->component) {

			snd_soc_dapm_ignore_suspend(dapm, "SpkrRight IN");

			snd_soc_dapm_ignore_suspend(dapm, "SpkrRight SPKR");