Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar

ASoC: Updates for v4.4

Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones.  Highlights include:

 - Updates to the topology userspace interface
 - Big updates to the Renesas support from Morimoto-san
 - Most of the support for Intel Sky Lake systems.
 - New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
   Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
   S/PDIF.

diff --combined sound/soc/sh/rcar/gen.c
index 916b38d,76da762..edcf4cc
--- 1/sound/soc/sh/rcar/gen.c
--- 2/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@@ -22,13 -22,15 +22,15 @@@
  #include "rsnd.h"
  
  struct rsnd_gen {
-       void __iomem *base[RSND_BASE_MAX];
- 
        struct rsnd_gen_ops *ops;
  
+       /* RSND_BASE_MAX base */
+       void __iomem *base[RSND_BASE_MAX];
+       phys_addr_t res[RSND_BASE_MAX];
        struct regmap *regmap[RSND_BASE_MAX];
+ 
+       /* RSND_REG_MAX base */
        struct regmap_field *regs[RSND_REG_MAX];
-       phys_addr_t res[RSND_REG_MAX];
  };
  
  #define rsnd_priv_to_gen(p)   ((struct rsnd_gen *)(p)->gen)
@@@ -79,11 -81,11 +81,11 @@@ u32 rsnd_read(struct rsnd_priv *priv
        if (!rsnd_is_accessible_reg(priv, gen, reg))
                return 0;
  
+       regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
+ 
        dev_dbg(dev, "r %s[%d] - %4d : %08x\n",
                rsnd_mod_name(mod), rsnd_mod_id(mod), reg, val);
  
-       regmap_fields_read(gen->regs[reg], rsnd_mod_id(mod), &val);
- 
        return val;
  }
  
@@@ -182,6 -184,7 +184,7 @@@ static int _rsnd_gen_regmap_init(struc
        if (IS_ERR(regmap))
                return PTR_ERR(regmap);
  
+       /* RSND_BASE_MAX base */
        gen->base[reg_id] = base;
        gen->regmap[reg_id] = regmap;
        gen->res[reg_id] = res->start;
@@@ -198,6 -201,7 +201,7 @@@
                if (IS_ERR(regs))
                        return PTR_ERR(regs);
  
+               /* RSND_REG_MAX base */
                gen->regs[conf[i].idx] = regs;
        }
  
@@@ -231,7 -235,7 +235,7 @@@ static int rsnd_gen2_probe(struct platf
                RSND_GEN_S_REG(SCU_SYS_STATUS0, 0x1c8),
                RSND_GEN_S_REG(SCU_SYS_INT_EN0, 0x1cc),
                RSND_GEN_S_REG(SCU_SYS_STATUS1, 0x1d0),
 -              RSND_GEN_S_REG(SCU_SYS_INT_EN1, 0x1c4),
 +              RSND_GEN_S_REG(SCU_SYS_INT_EN1, 0x1d4),
                RSND_GEN_M_REG(SRC_SWRSR,       0x200,  0x40),
                RSND_GEN_M_REG(SRC_SRCIR,       0x204,  0x40),
                RSND_GEN_M_REG(SRC_ADINR,       0x214,  0x40),