Merge "asoc: kona: call wsa set channel map for wsa883x" (070556cb) · Commits · e / devices / android_kernel_oneplus_sm7250

asoc/kona.c

+23 −8

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@
		#include "asoc/wcd-mbhc-v2.h"
		#include "codecs/wcd938x/wcd938x-mbhc.h"
		#include "codecs/wsa881x.h"
		#include "codecs/wsa883x/wsa883x.h"
		#include "codecs/wcd938x/wcd938x.h"
		#include "codecs/bolero/bolero-cdc.h"
		#include <dt-bindings/sound/audio-codec-port-types.h>
		@@ -7570,6 +7571,11 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
		if (!strcmp(component->name_prefix, "SpkrLeft")) {
		dev_dbg(component->dev, "%s: setting left ch map to codec %s\n",
		__func__, component->name);
		if (strnstr(component->name, "wsa883x", sizeof(component->name)))
		wsa883x_set_channel_map(component, &spkleft_ports[0],
		WSA881X_MAX_SWR_PORTS, &ch_mask[0],
		&ch_rate[0], &spkleft_port_types[0]);
		else
		wsa881x_set_channel_map(component, &spkleft_ports[0],
		WSA881X_MAX_SWR_PORTS, &ch_mask[0],
		&ch_rate[0], &spkleft_port_types[0]);
		@@ -7580,6 +7586,11 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
		} else if (!strcmp(component->name_prefix, "SpkrRight")) {
		dev_dbg(component->dev, "%s: setting right ch map to codec %s\n",
		__func__, component->name);
		if (strnstr(component->name, "wsa883x", sizeof(component->name)))
		wsa883x_set_channel_map(component, &spkright_ports[0],
		WSA881X_MAX_SWR_PORTS, &ch_mask[0],
		&ch_rate[0], &spkright_port_types[0]);
		else
		wsa881x_set_channel_map(component, &spkright_ports[0],
		WSA881X_MAX_SWR_PORTS, &ch_mask[0],
		&ch_rate[0], &spkright_port_types[0]);
		@@ -7605,6 +7616,10 @@ static int msm_wsa881x_init(struct snd_soc_component *component)
		}
		pdata->codec_root = entry;
		}
		if (strnstr(component->name, "wsa883x", sizeof(component->name)))
		wsa883x_codec_info_create_codec_entry(pdata->codec_root,
		component);
		else
		wsa881x_codec_info_create_codec_entry(pdata->codec_root,
		component);
		err: