ENGR00311068 ASoC: fsl_hdmi: passthrough can't work for android

Android need driver to export several kcontrol. "Support channels",
"Support Rates", "Support Formats".

Signed-off-by: Shengjiu Wang <b02247@freescale.com>

1 files changed, 101 insertions, 1 deletions

diff --git a/sound/soc/fsl/fsl_hdmi.c b/sound/soc/fsl/fsl_hdmi.c
index fb9e8526b81c..cfa8677e88e7 100644
--- a/sound/soc/fsl/fsl_hdmi.c
+++ b/sound/soc/fsl/fsl_hdmi.c
@@ -1,7 +1,7 @@
 /*
  * ALSA SoC HDMI Audio Layer for Freescale i.MX
  *
- * Copyright (C) 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2011-2014 Freescale Semiconductor, Inc.
  *
  * Some code from patch_hdmi.c
  *  Copyright (c) 2008-2010 Intel Corporation. All rights reserved.
@@ -454,6 +454,82 @@ static int fsl_hdmi_iec_put(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
+static int fsl_hdmi_channels_info(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_info *uinfo)
+{
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_channels();
+
+        uinfo->type  = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = playback_constraint_channels.count;
+
+        return 0;
+}
+
+
+static int fsl_hdmi_channels_get(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_value *uvalue)
+{
+        int i;
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_channels();
+
+        for (i = 0 ; i < playback_constraint_channels.count ; i++)
+                uvalue->value.integer.value[i] = playback_channels[i];
+
+        return 0;
+}
+
+static int fsl_hdmi_rates_info(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_info *uinfo)
+{
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_rates();
+
+        uinfo->type  = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = playback_constraint_rates.count;
+
+        return 0;
+}
+
+static int fsl_hdmi_rates_get(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_value *uvalue)
+{
+        int i;
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_rates();
+
+        for (i = 0 ; i < playback_constraint_rates.count ; i++)
+                uvalue->value.integer.value[i] = playback_rates[i];
+
+        return 0;
+}
+
+static int fsl_hdmi_formats_info(struct snd_kcontrol *kcontrol,
+                             struct snd_ctl_elem_info *uinfo)
+{
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_sample_size();
+
+        uinfo->type  = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = playback_constraint_bits.count;
+
+        return 0;
+}
+
+static int fsl_hdmi_formats_get(struct snd_kcontrol *kcontrol,
+                            struct snd_ctl_elem_value *uvalue)
+{
+        int i;
+        hdmi_get_edid_cfg(&edid_cfg);
+        fsl_hdmi_get_playback_sample_size();
+
+        for (i = 0 ; i < playback_constraint_bits.count ; i++)
+                uvalue->value.integer.value[i] = playback_sample_size[i];
+
+        return 0;
+}
+
 static struct snd_kcontrol_new fsl_hdmi_ctrls[] = {
         /* Status cchanel controller */
         {
@@ -466,6 +542,30 @@ static struct snd_kcontrol_new fsl_hdmi_ctrls[] = {
                 .get = fsl_hdmi_iec_get,
                 .put = fsl_hdmi_iec_put,
         },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "HDMI Support Channels",
+                .access = SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+                .info = fsl_hdmi_channels_info,
+                .get = fsl_hdmi_channels_get,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "HDMI Support Rates",
+                .access = SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+                .info = fsl_hdmi_rates_info,
+                .get = fsl_hdmi_rates_get,
+        },
+        {
+                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+                .name = "HDMI Support Formats",
+                .access = SNDRV_CTL_ELEM_ACCESS_READ |
+                        SNDRV_CTL_ELEM_ACCESS_VOLATILE,
+                .info = fsl_hdmi_formats_info,
+                .get = fsl_hdmi_formats_get,
+        },
 };
 
 static int fsl_hdmi_soc_dai_probe(struct snd_soc_dai *dai)