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

Commit 34504581 authored by Asish Bhattacharya's avatar Asish Bhattacharya Committed by Martin Fick
Browse files

audio-lnx: Add snapshot of audio drivers from below commit. 



(1996ec83a45: "ARM: dts: msm: Reduce CNOC bus voting for
        USB slave on SDM845")

This change is to migrate latest snapshot of kernel drivers.

Change-Id: I84669db544773d3ce9d2d5dff0ab6943bd7d8ff9
Signed-off-by: default avatarAsish Bhattacharya <asishb@codeaurora.org>
parent 71ca58e1

asoc/codecs/sdm660_cdc/msm-digital-cdc.c

+1 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/module.h>

#include <linux/init.h>

#include <linux/io.h>
@@ -122,9 +121,7 @@ static void disable_digital_callback(void *flag) 
static int msm_dig_cdc_put_dec_enum(struct snd_kcontrol *kcontrol,

				    struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *w = wlist->widgets[0];

	struct snd_soc_dapm_widget *w = snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int dec_mux, decimator;

asoc/codecs/wcd9335.c

+20 −30
Original line number Diff line number Diff line
@@ -2261,9 +2261,8 @@ static const struct snd_kcontrol_new hph_type_detect_controls[] = { 
static int tasha_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2275,9 +2274,8 @@ static int tasha_vi_feed_mixer_get(struct snd_kcontrol *kcontrol, 
static int tasha_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = tasha_p->wcd9xxx;
@@ -2328,9 +2326,8 @@ static int tasha_vi_feed_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2341,9 +2338,8 @@ static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -2436,9 +2432,8 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -2454,9 +2449,8 @@ static const char *const slim_rx_mux_text[] = { 
static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -8505,9 +8499,8 @@ static const struct snd_kcontrol_new tasha_snd_controls[] = { 
static int tasha_put_dec_enum(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -8565,9 +8558,8 @@ static int tasha_put_dec_enum(struct snd_kcontrol *kcontrol, 
static int tasha_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,

				 struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -8899,9 +8891,8 @@ static int tasha_codec_configure_cpe_input(struct snd_soc_dapm_widget *w, 
static int tasha_codec_aif4_mixer_switch_get(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);
@@ -8918,9 +8909,8 @@ static int tasha_codec_aif4_mixer_switch_get(struct snd_kcontrol *kcontrol, 
static int tasha_codec_aif4_mixer_switch_put(struct snd_kcontrol *kcontrol,

		struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

			dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_dapm_update *update = NULL;

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tasha_priv *tasha_p = snd_soc_codec_get_drvdata(codec);

asoc/codecs/wcd934x/wcd934x.c

+16 −24
Original line number Diff line number Diff line
@@ -1110,9 +1110,8 @@ static int tavil_put_clkmode(struct snd_kcontrol *kcontrol, 
static int tavil_vi_feed_mixer_get(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1124,9 +1123,8 @@ static int tavil_vi_feed_mixer_get(struct snd_kcontrol *kcontrol, 
static int tavil_vi_feed_mixer_put(struct snd_kcontrol *kcontrol,

				   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -1176,9 +1174,8 @@ static int tavil_vi_feed_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1189,9 +1186,8 @@ static int slim_tx_mixer_get(struct snd_kcontrol *kcontrol, 
static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol,

			     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -1271,9 +1267,8 @@ static int slim_tx_mixer_put(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);
@@ -1285,9 +1280,8 @@ static int slim_rx_mux_get(struct snd_kcontrol *kcontrol, 
static int slim_rx_mux_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct tavil_priv *tavil_p = snd_soc_codec_get_drvdata(codec);

	struct wcd9xxx *core = dev_get_drvdata(codec->dev->parent);
@@ -5929,9 +5923,8 @@ static const struct snd_kcontrol_new tavil_snd_controls[] = { 
static int tavil_dec_enum_put(struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;
@@ -5989,9 +5982,8 @@ static int tavil_dec_enum_put(struct snd_kcontrol *kcontrol, 
static int tavil_int_dem_inp_mux_put(struct snd_kcontrol *kcontrol,

				     struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_dapm_widget_list *wlist =

					dapm_kcontrol_get_wlist(kcontrol);

	struct snd_soc_dapm_widget *widget = wlist->widgets[0];

	struct snd_soc_dapm_widget *widget =

		snd_soc_dapm_kcontrol_widget(kcontrol);

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(widget->dapm);

	struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;

	unsigned int val;

asoc/msm-dai-fe.c

+14 −1
Original line number Diff line number Diff line
@@ -2496,8 +2496,21 @@ static struct snd_soc_dai_driver msm_fe_dais[] = { 
			.rate_min =	8000,

			.rate_max = 384000,

		},

		.capture = {

			.stream_name = "MultiMedia16 Capture",

			.aif_name = "MM_UL16",

			.rates = (SNDRV_PCM_RATE_8000_48000|

					SNDRV_PCM_RATE_KNOT),

			.formats = (SNDRV_PCM_FMTBIT_S16_LE |

				    SNDRV_PCM_FMTBIT_S24_LE |

				    SNDRV_PCM_FMTBIT_S24_3LE |

				    SNDRV_PCM_FMTBIT_S32_LE),

			.channels_min = 1,

			.channels_max = 8,

			.rate_min =     8000,

			.rate_max =     48000,

		},

		.ops = &msm_fe_Multimedia_dai_ops,

		.compress_new = snd_soc_new_compress,

		.name = "MultiMedia16",

		.probe = fe_dai_probe,

	},

asoc/msm-pcm-routing-v2.c

+180 −48

File changed.

Preview size limit exceeded, changes collapsed.