Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic...

diff --combined include/sound/soc.h
index 9ffa28514fa76556941acb8d4c05e45eea2b673b,884e728b09d9a57e8a56ac8ea224b3f873cb81c3,a76622d7bb2fdfd24fa804a8e292409d9dd41327,884e728b09d9a57e8a56ac8ea224b3f873cb81c3,884e728b09d9a57e8a56ac8ea224b3f873cb81c3,884e728b09d9a57e8a56ac8ea224b3f873cb81c3..470f20887b617d795b4bee60183cf6ec4ec84816
--- 1/include/sound/soc.h
--- 2/include/sound/soc.h
--- 3/include/sound/soc.h
--- 4/include/sound/soc.h
--- 5/include/sound/soc.h
--- 6/include/sound/soc.h
+++ b/include/sound/soc.h
@@@@@@@ -226,18 -226,6 -226,6 -226,6 -226,6 -226,6 +226,18 @@@@@@@
        .info = snd_soc_info_volsw, \
        .get = xhandler_get, .put = xhandler_put, \
        .private_value = SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert, 0) }
 +++++#define SOC_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \
 +++++                           xhandler_get, xhandler_put, tlv_array) \
 +++++{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\
 +++++  .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
 +++++           SNDRV_CTL_ELEM_ACCESS_READWRITE,\
 +++++  .tlv.p = (tlv_array), \
 +++++  .info = snd_soc_info_volsw_range, \
 +++++  .get = xhandler_get, .put = xhandler_put, \
 +++++  .private_value = (unsigned long)&(struct soc_mixer_control) \
 +++++          {.reg = xreg, .rreg = xreg, .shift = xshift, \
 +++++           .rshift = xshift, .min = xmin, .max = xmax, \
 +++++           .platform_max = xmax, .invert = xinvert} }
      #define SOC_DOUBLE_EXT_TLV(xname, xreg, shift_left, shift_right, xmax, xinvert,\
         xhandler_get, xhandler_put, tlv_array) \
      { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
@@@@@@@ -1613,6 -1601,6 -1601,8 -1601,6 -1601,6 -1601,6 +1613,8 @@@@@@@ int snd_soc_of_parse_card_name(struct s
      int snd_soc_of_parse_audio_simple_widgets(struct snd_soc_card *card,
                                          const char *propname);
      int snd_soc_of_parse_tdm_slot(struct device_node *np,
++ +++                        unsigned int *tx_mask,
++ +++                        unsigned int *rx_mask,
                              unsigned int *slots,
                              unsigned int *slot_width);
      void snd_soc_of_parse_audio_prefix(struct snd_soc_card *card,