OSDN Git Service

Merge "ASoC: msmcobalt: Update machine driver to support 32 bit format"
authorLinux Build Service Account <lnxbuild@localhost>
Fri, 7 Oct 2016 02:45:47 +0000 (19:45 -0700)
committerGerrit - the friendly Code Review server <code-review@localhost>
Fri, 7 Oct 2016 02:45:47 +0000 (19:45 -0700)
1  2 
sound/soc/msm/msmcobalt.c

@@@ -397,15 -270,9 +398,15 @@@ static char const *ch_text[] = {"Two", 
  static char const *usb_sample_rate_text[] = {"KHZ_8", "KHZ_11P025",
                                        "KHZ_16", "KHZ_22P05",
                                        "KHZ_32", "KHZ_44P1", "KHZ_48",
-                                       "KHZ_96", "KHZ_192"};
+                                       "KHZ_96", "KHZ_192", "KHZ_384"};
  static char const *ext_disp_sample_rate_text[] = {"KHZ_48", "KHZ_96",
                                                  "KHZ_192"};
 +static char const *tdm_ch_text[] = {"One", "Two", "Three", "Four",
 +                                  "Five", "Six", "Seven", "Eight"};
 +static char const *tdm_bit_format_text[] = {"S16_LE", "S24_LE", "S32_LE"};
 +static char const *tdm_sample_rate_text[] = {"KHZ_8", "KHZ_16", "KHZ_32",
 +                                           "KHZ_44P1", "KHZ_48", "KHZ_96",
 +                                           "KHZ_192", "KHZ_352P8", "KHZ_384"};
  static const char *const auxpcm_rate_text[] = {"KHZ_8", "KHZ_16"};
  static char const *mi2s_rate_text[] = {"KHZ_8", "KHZ_16",
                                      "KHZ_32", "KHZ_44P1", "KHZ_48",