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

ASoC: Updates for v4.6

The main thing in terms of the core this time around has been some
additional framework work for dynamic topologies (though we *still*
don't appear to have a stable ABI for the topology code, it's probably
worth considering if this will ever happen...).  Otherwise the work has
almost all been in the drivers:

 - HDMI support for Sky Lake, along with other fixes and enhancements
   for the Intel drivers.
 - Lots of improvements to the Renesas drivers.
 - Capture support for Qualcomm drivers.
 - Support for TI DaVinci DRA7xxx devices.
 - New machine drivers for Freescale systems with Cirrus CODECs,
   Mediatek systems with RT5650 CODECs.
 - New CPU drivers for Allwinner S/PDIF controllers
 - New CODEC drivers for Maxim MAX9867 and MAX98926 and Realtek RT5514.

1 files changed, 11 insertions, 9 deletions

diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 06d72828e5bc..6f9b388ec5a8 100644
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -27,7 +27,7 @@ static int rsnd_ssiu_init(struct rsnd_mod *mod,
                           struct rsnd_priv *priv)
 {
         struct rsnd_dai *rdai = rsnd_io_to_rdai(io);
-        u32 multi_ssi_slaves = rsnd_ssi_multi_slaves(io);
+        u32 multi_ssi_slaves = rsnd_ssi_multi_slaves_runtime(io);
         int use_busif = rsnd_ssi_use_busif(io);
         int id = rsnd_mod_id(mod);
         u32 mask1, val1;
@@ -105,7 +105,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
         if (ret < 0)
                 return ret;
 
-        if (rsnd_get_slot_width(io) >= 6) {
+        if (rsnd_runtime_is_ssi_tdm(io)) {
                 /*
                  * TDM Extend Mode
                  * see
@@ -115,13 +115,14 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
         }
 
         if (rsnd_ssi_use_busif(io)) {
-                u32 val = rsnd_get_dalign(mod, io);
-
                 rsnd_mod_write(mod, SSI_BUSIF_ADINR,
                                rsnd_get_adinr_bit(mod, io) |
-                               rsnd_get_adinr_chan(mod, io));
+                               (rsnd_io_is_play(io) ?
+                                rsnd_runtime_channel_after_ctu(io) :
+                                rsnd_runtime_channel_original(io)));
                 rsnd_mod_write(mod, SSI_BUSIF_MODE,  1);
-                rsnd_mod_write(mod, SSI_BUSIF_DALIGN, val);
+                rsnd_mod_write(mod, SSI_BUSIF_DALIGN,
+                               rsnd_get_dalign(mod, io));
         }
 
         return 0;
@@ -136,7 +137,7 @@ static int rsnd_ssiu_start_gen2(struct rsnd_mod *mod,
 
         rsnd_mod_write(mod, SSI_CTRL, 0x1);
 
-        if (rsnd_ssi_multi_slaves(io))
+        if (rsnd_ssi_multi_slaves_runtime(io))
                 rsnd_mod_write(mod, SSI_CONTROL, 0x1);
 
         return 0;
@@ -151,7 +152,7 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod,
 
         rsnd_mod_write(mod, SSI_CTRL, 0);
 
-        if (rsnd_ssi_multi_slaves(io))
+        if (rsnd_ssi_multi_slaves_runtime(io))
                 rsnd_mod_write(mod, SSI_CONTROL, 0);
 
         return 0;
@@ -206,7 +207,8 @@ int rsnd_ssiu_probe(struct rsnd_priv *priv)
 
         for_each_rsnd_ssiu(ssiu, priv, i) {
                 ret = rsnd_mod_init(priv, rsnd_mod_get(ssiu),
-                                    ops, NULL, RSND_MOD_SSIU, i);
+                                    ops, NULL, rsnd_mod_get_status,
+                                    RSND_MOD_SSIU, i);
                 if (ret)
                         return ret;
         }