From: Mark Brown <broonie@kernel.org>
Date: Thu, 4 Apr 2019 08:07:34 +0000 (+0700)
Subject: Merge branch 'asoc-5.1' into asoc-5.2
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=072cb68a43663eacae7fe84dcbfd1a81dc692185;p=linux.git

Merge branch 'asoc-5.1' into asoc-5.2
---

072cb68a43663eacae7fe84dcbfd1a81dc692185
diff --cc sound/soc/codecs/tlv320aic32x4-i2c.c
index d8bede5c1f384,22c3a6bc0b6c4..6d54cbf70a0bf
--- a/sound/soc/codecs/tlv320aic32x4-i2c.c
+++ b/sound/soc/codecs/tlv320aic32x4-i2c.c
@@@ -1,8 -1,9 +1,8 @@@
 -/*
 - * linux/sound/soc/codecs/tlv320aic32x4-i2c.c
 +/* SPDX-License-Identifier: GPL-2.0
   *
 - * Copyright 2011 NW Digital Radio
 + * Copyright 2011-2019 NW Digital Radio
   *
-  * Author: Jeremy McDermond <nh6z@nh6z.net>
+  * Author: Annaliese McDermond <nh6z@nh6z.net>
   *
   * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
   *
diff --cc sound/soc/codecs/tlv320aic32x4-spi.c
index a72a61c4d785d,aa5b7ba0254bc..a22e7700bfc8a
--- a/sound/soc/codecs/tlv320aic32x4-spi.c
+++ b/sound/soc/codecs/tlv320aic32x4-spi.c
@@@ -1,8 -1,9 +1,8 @@@
 -/*
 - * linux/sound/soc/codecs/tlv320aic32x4-spi.c
 +/* SPDX-License-Identifier: GPL-2.0
   *
 - * Copyright 2011 NW Digital Radio
 + * Copyright 2011-2019 NW Digital Radio
   *
-  * Author: Jeremy McDermond <nh6z@nh6z.net>
+  * Author: Annaliese McDermond <nh6z@nh6z.net>
   *
   * Based on sound/soc/codecs/wm8974 and TI driver for kernel 2.6.27.
   *
diff --cc sound/soc/generic/audio-graph-card.c
index 8114b5ea9319f,69bc4848d7876..ec7e673ba475f
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
@@@ -20,6 -20,39 +20,8 @@@
  #include <linux/string.h>
  #include <sound/simple_card_utils.h>
  
+ #define DPCM_SELECTABLE 1
+ 
 -struct graph_priv {
 -	struct snd_soc_card snd_card;
 -	struct graph_dai_props {
 -		struct asoc_simple_dai *cpu_dai;
 -		struct asoc_simple_dai *codec_dai;
 -		struct snd_soc_dai_link_component codecs; /* single codec */
 -		struct snd_soc_dai_link_component platforms;
 -		struct asoc_simple_card_data adata;
 -		struct snd_soc_codec_conf *codec_conf;
 -		unsigned int mclk_fs;
 -	} *dai_props;
 -	struct asoc_simple_jack hp_jack;
 -	struct asoc_simple_jack mic_jack;
 -	struct snd_soc_dai_link *dai_link;
 -	struct asoc_simple_dai *dais;
 -	struct snd_soc_codec_conf *codec_conf;
 -	struct gpio_desc *pa_gpio;
 -};
 -
 -struct link_info {
 -	int dais; /* number of dai  */
 -	int link; /* number of link */
 -	int conf; /* number of codec_conf */
 -	int cpu;  /* turn for CPU / Codec */
 -};
 -
 -#define graph_priv_to_card(priv) (&(priv)->snd_card)
 -#define graph_priv_to_props(priv, i) ((priv)->dai_props + (i))
 -#define graph_priv_to_dev(priv) (graph_priv_to_card(priv)->dev)
 -#define graph_priv_to_link(priv, i) (graph_priv_to_card(priv)->dai_link + (i))
 -
  #define PREFIX	"audio-graph-card,"
  
  static int graph_outdrv_event(struct snd_soc_dapm_widget *w,
@@@ -414,7 -441,8 +416,8 @@@ static int graph_for_each_link(struct a
  	struct device_node *codec_ep;
  	struct device_node *codec_port;
  	struct device_node *codec_port_old = NULL;
 -	struct asoc_simple_card_data adata;
 +	struct asoc_simple_data adata;
+ 	uintptr_t dpcm_selectable = (uintptr_t)of_device_get_match_data(dev);
  	int rc, ret;
  
  	/* loop for all listed CPU port */
diff --cc sound/soc/generic/simple-card.c
index dd9ac60d61f14,34de32efc4c4d..335ead0cbb8a3
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@@ -15,6 -16,38 +16,8 @@@
  #include <sound/soc-dai.h>
  #include <sound/soc.h>
  
+ #define DPCM_SELECTABLE 1
+ 
 -struct simple_priv {
 -	struct snd_soc_card snd_card;
 -	struct simple_dai_props {
 -		struct asoc_simple_dai *cpu_dai;
 -		struct asoc_simple_dai *codec_dai;
 -		struct snd_soc_dai_link_component codecs; /* single codec */
 -		struct snd_soc_dai_link_component platforms;
 -		struct asoc_simple_card_data adata;
 -		struct snd_soc_codec_conf *codec_conf;
 -		unsigned int mclk_fs;
 -	} *dai_props;
 -	struct asoc_simple_jack hp_jack;
 -	struct asoc_simple_jack mic_jack;
 -	struct snd_soc_dai_link *dai_link;
 -	struct asoc_simple_dai *dais;
 -	struct snd_soc_codec_conf *codec_conf;
 -};
 -
 -struct link_info {
 -	int dais; /* number of dai  */
 -	int link; /* number of link */
 -	int conf; /* number of codec_conf */
 -	int cpu;  /* turn for CPU / Codec */
 -};
 -
 -#define simple_priv_to_card(priv) (&(priv)->snd_card)
 -#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))
 -#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev)
 -#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i))
 -
  #define DAI	"sound-dai"
  #define CELL	"#sound-dai-cells"
  #define PREFIX	"simple-audio-card,"