Merge tag 'asoc-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v4.9

Apart from the cleanups done by Morimoto-san this has very much been a
driver focused release with very little generic change:

 - A big factoring out of the simple-card code to allow it to be shared
   more with the rcar generic card from Kuninori Morimoto.
 - Removal of some operations duplicated on the CODEC level, again by
   Kuninori Morimoto.
 - Lots more machine support for x86 systems.
 - New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663.

6 files changed, 80 insertions, 23 deletions

diff --git a/include/sound/da7219.h b/include/sound/da7219.h
index 02876acdc840..409ef1397fd3 100644
--- a/include/sound/da7219.h
+++ b/include/sound/da7219.h
@@ -34,6 +34,8 @@ enum da7219_mic_amp_in_sel {
 struct da7219_aad_pdata;
 
 struct da7219_pdata {
+        bool wakeup_source;
+
         /* Mic */
         enum da7219_micbias_voltage micbias_lvl;
         enum da7219_mic_amp_in_sel mic_amp_in_sel;
diff --git a/include/sound/l3.h b/include/sound/l3.h
index 423a08f0f1b0..1471da22adad 100644
--- a/include/sound/l3.h
+++ b/include/sound/l3.h
@@ -2,9 +2,15 @@
 #define _L3_H_ 1
 
 struct l3_pins {
-        void (*setdat)(int);
-        void (*setclk)(int);
-        void (*setmode)(int);
+        void (*setdat)(struct l3_pins *, int);
+        void (*setclk)(struct l3_pins *, int);
+        void (*setmode)(struct l3_pins *, int);
+
+        int gpio_data;
+        int gpio_clk;
+        int gpio_mode;
+        int use_gpios;
+
         int data_hold;
         int data_setup;
         int clock_high;
@@ -13,6 +19,9 @@ struct l3_pins {
         int mode_setup;
 };
 
+struct device;
+
 int l3_write(struct l3_pins *adap, u8 addr, u8 *data, int len);
+int l3_set_gpio_ops(struct device *dev, struct l3_pins *adap);
 
 #endif
diff --git a/include/sound/rt5660.h b/include/sound/rt5660.h
new file mode 100644
index 000000000000..065f83a24db6
--- /dev/null
+++ b/include/sound/rt5660.h
@@ -0,0 +1,31 @@
+/*
+ * linux/sound/rt5660.h -- Platform data for RT5660
+ *
+ * Copyright 2016 Realtek Semiconductor Corp.
+ * Author: Oder Chiou <oder_chiou@realtek.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __LINUX_SND_RT5660_H
+#define __LINUX_SND_RT5660_H
+
+enum rt5660_dmic1_data_pin {
+        RT5660_DMIC1_NULL,
+        RT5660_DMIC1_DATA_GPIO2,
+        RT5660_DMIC1_DATA_IN1P,
+};
+
+struct rt5660_platform_data {
+        /* IN1 & IN3 can optionally be differential */
+        bool in1_diff;
+        bool in3_diff;
+        bool use_ldo2;
+        bool poweroff_codec_in_suspend;
+
+        enum rt5660_dmic1_data_pin dmic1_data_pin;
+};
+
+#endif
diff --git a/include/sound/s3c24xx_uda134x.h b/include/sound/s3c24xx_uda134x.h
index 33df4cb909d3..ffaf1f098c8e 100644
--- a/include/sound/s3c24xx_uda134x.h
+++ b/include/sound/s3c24xx_uda134x.h
@@ -7,7 +7,6 @@ struct s3c24xx_uda134x_platform_data {
         int l3_clk;
         int l3_mode;
         int l3_data;
-        void (*power) (int);
         int model;
 };
 
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h
index 86088aed9002..fd6412551145 100644
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
@@ -27,10 +27,45 @@ int asoc_simple_card_parse_daifmt(struct device *dev,
                                   struct device_node *codec,
                                   char *prefix,
                                   unsigned int *retfmt);
+__printf(3, 4)
 int asoc_simple_card_set_dailink_name(struct device *dev,
                                       struct snd_soc_dai_link *dai_link,
                                       const char *fmt, ...);
 int asoc_simple_card_parse_card_name(struct snd_soc_card *card,
                                      char *prefix);
 
+#define asoc_simple_card_parse_clk_cpu(node, dai_link, simple_dai)              \
+        asoc_simple_card_parse_clk(node, dai_link->cpu_of_node, simple_dai)
+#define asoc_simple_card_parse_clk_codec(node, dai_link, simple_dai)            \
+        asoc_simple_card_parse_clk(node, dai_link->codec_of_node, simple_dai)
+int asoc_simple_card_parse_clk(struct device_node *node,
+                               struct device_node *dai_of_node,
+                               struct asoc_simple_dai *simple_dai);
+
+#define asoc_simple_card_parse_cpu(node, dai_link,                              \
+                                   list_name, cells_name, is_single_link)       \
+        asoc_simple_card_parse_dai(node, &dai_link->cpu_of_node,                \
+                &dai_link->cpu_dai_name, list_name, cells_name, is_single_link)
+#define asoc_simple_card_parse_codec(node, dai_link, list_name, cells_name)     \
+        asoc_simple_card_parse_dai(node, &dai_link->codec_of_node,              \
+                &dai_link->codec_dai_name, list_name, cells_name, NULL)
+#define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name)  \
+        asoc_simple_card_parse_dai(node, &dai_link->platform_of_node,           \
+                NULL, list_name, cells_name, NULL)
+int asoc_simple_card_parse_dai(struct device_node *node,
+                                  struct device_node **endpoint_np,
+                                  const char **dai_name,
+                                  const char *list_name,
+                                  const char *cells_name,
+                                  int *is_single_links);
+
+int asoc_simple_card_init_dai(struct snd_soc_dai *dai,
+                              struct asoc_simple_dai *simple_dai);
+
+int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link);
+void asoc_simple_card_canonicalize_cpu(struct snd_soc_dai_link *dai_link,
+                                      int is_single_links);
+
+int asoc_simple_card_clean_reference(struct snd_soc_card *card);
+
 #endif /* __SIMPLE_CARD_CORE_H */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 6144882cc96a..4f1c784e44f6 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -898,14 +898,6 @@ struct snd_soc_codec_driver {
         int (*resume)(struct snd_soc_codec *);
         struct snd_soc_component_driver component_driver;
 
-        /* Default control and setup, added after probe() is run */
-        const struct snd_kcontrol_new *controls;
-        int num_controls;
-        const struct snd_soc_dapm_widget *dapm_widgets;
-        int num_dapm_widgets;
-        const struct snd_soc_dapm_route *dapm_routes;
-        int num_dapm_routes;
-
         /* codec wide operations */
         int (*set_sysclk)(struct snd_soc_codec *codec,
                           int clk_id, int source, unsigned int freq, int dir);
@@ -1547,17 +1539,6 @@ static inline void *snd_soc_platform_get_drvdata(struct snd_soc_platform *platfo
         return snd_soc_component_get_drvdata(&platform->component);
 }
 
-static inline void snd_soc_pcm_set_drvdata(struct snd_soc_pcm_runtime *rtd,
-                void *data)
-{
-        dev_set_drvdata(rtd->dev, data);
-}
-
-static inline void *snd_soc_pcm_get_drvdata(struct snd_soc_pcm_runtime *rtd)
-{
-        return dev_get_drvdata(rtd->dev);
-}
-
 static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card)
 {
         INIT_LIST_HEAD(&card->codec_dev_list);