Merge remote-tracking branch 'asoc/topic/jz4740' into asoc-next

diff --combined sound/soc/codecs/Kconfig
index 8079963,7015db2..ef03c7a
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -146,13 -146,6 +146,13 @@@ config SND_SOC_WM_HUB
        default y if SND_SOC_WM8993=y || SND_SOC_WM8994=y
        default m if SND_SOC_WM8993=m || SND_SOC_WM8994=m
  
 +config SND_SOC_WM_ADSP
 +      tristate
 +      default y if SND_SOC_WM5102=y
 +      default y if SND_SOC_WM2200=y
 +      default m if SND_SOC_WM5102=m
 +      default m if SND_SOC_WM2200=m
 +
  config SND_SOC_AB8500_CODEC
        tristate
  
@@@ -236,6 -229,7 +236,7 @@@ config SND_SOC_CX2044
        tristate
  
  config SND_SOC_JZ4740_CODEC
+       select REGMAP_MMIO
        tristate
  
  config SND_SOC_L3