Merge tag 'asoc-v3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Merge window fixes for v3.19

A smattering of driver specific fixes here, some more cleanup of the
Exynos7 and Intel ACPI support plus a fix for register cache sync on the
pcm512x driver which has been lurking for a while.

6 files changed, 20 insertions, 7 deletions

diff --git a/sound/soc/atmel/atmel_ssc_dai.c b/sound/soc/atmel/atmel_ssc_dai.c
index b1cc2a4a7fc0..99ff35e2a25d 100644
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
@@ -267,7 +267,7 @@ static void atmel_ssc_shutdown(struct snd_pcm_substream *substream,
         if (!ssc_p->dir_mask) {
                 if (ssc_p->initialized) {
                         /* Shutdown the SSC clock. */
-                        pr_debug("atmel_ssc_dau: Stopping clock\n");
+                        pr_debug("atmel_ssc_dai: Stopping clock\n");
                         clk_disable(ssc_p->ssc->clk);
 
                         free_irq(ssc_p->ssc->irq, ssc_p);
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 883c5778b309..8349f982a586 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -520,6 +520,8 @@ config SND_SOC_RT5670
 
 config SND_SOC_RT5677
         tristate
+        select REGMAP_I2C
+        select REGMAP_IRQ
 
 config SND_SOC_RT5677_SPI
         tristate
diff --git a/sound/soc/codecs/pcm512x-i2c.c b/sound/soc/codecs/pcm512x-i2c.c
index 4d62230bd378..d0547fa275fc 100644
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
@@ -24,8 +24,13 @@ static int pcm512x_i2c_probe(struct i2c_client *i2c,
                              const struct i2c_device_id *id)
 {
         struct regmap *regmap;
+        struct regmap_config config = pcm512x_regmap;
 
-        regmap = devm_regmap_init_i2c(i2c, &pcm512x_regmap);
+        /* msb needs to be set to enable auto-increment of addresses */
+        config.read_flag_mask = 0x80;
+        config.write_flag_mask = 0x80;
+
+        regmap = devm_regmap_init_i2c(i2c, &config);
         if (IS_ERR(regmap))
                 return PTR_ERR(regmap);
 
diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c
index a7789a8726e3..27141e2df878 100644
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
@@ -2209,6 +2209,10 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec)
         int gpio_state, jack_type = 0;
         unsigned int val;
 
+        if (!gpio_is_valid(rt5645->pdata.hp_det_gpio)) {
+                dev_err(codec->dev, "invalid gpio\n");
+                return -EINVAL;
+        }
         gpio_state = gpio_get_value(rt5645->pdata.hp_det_gpio);
 
         dev_dbg(codec->dev, "gpio = %d(%d)\n", rt5645->pdata.hp_det_gpio,
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 31124aa4434e..3abc29e8a928 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -43,7 +43,7 @@
 #include "sst.h"
 
 struct sst_machines {
-        char codec_id[32];
+        char *codec_id;
         char board[32];
         char machine[32];
         void (*machine_quirk)(void);
@@ -277,16 +277,16 @@ int sst_acpi_probe(struct platform_device *pdev)
         dev_dbg(dev, "ACPI device id: %x\n", dev_id);
 
         plat_dev = platform_device_register_data(dev, mach->pdata->platform, -1, NULL, 0);
-        if (plat_dev == NULL) {
+        if (IS_ERR(plat_dev)) {
                 dev_err(dev, "Failed to create machine device: %s\n", mach->pdata->platform);
-                return -ENODEV;
+                return PTR_ERR(plat_dev);
         }
 
         /* Create platform device for sst machine driver */
         mdev = platform_device_register_data(dev, mach->machine, -1, NULL, 0);
-        if (mdev == NULL) {
+        if (IS_ERR(mdev)) {
                 dev_err(dev, "Failed to create machine device: %s\n", mach->machine);
-                return -ENODEV;
+                return PTR_ERR(mdev);
         }
 
         ret = sst_alloc_drv_context(&ctx, dev, dev_id);
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index c7aafcd95de3..eca17dc01ef7 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1261,6 +1261,8 @@ static int samsung_i2s_probe(struct platform_device *pdev)
                         ret = -ENOMEM;
                         goto err;
                 }
+
+                sec_dai->variant_regs = pri_dai->variant_regs;
                 sec_dai->dma_playback.dma_addr = regs_base + I2STXDS;
                 sec_dai->dma_playback.ch_name = "tx-sec";