drm/i2c: adv7511: Add Audio support.

This patch adds support to Audio for both adv7511 and adv7533 bridge
chips. Content of this patch is has copied from [1].

[1] https://github.com/analogdevicesinc/linux/blob/xcomm_zynq/drivers/gpu/drm/i2c/adv7511_audio.c

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
[Srinivas Kandagatla] Adapted to new adv7511 bridge driver.
Signed-off-by: Archit Taneja <architt@codeaurora.org>

diff --git a/drivers/gpu/drm/i2c/Makefile b/drivers/gpu/drm/i2c/Makefile
index 2c72eb584ab7c628254ecfec90d5de70773fab4e..46cc9fb18367207519c840d27ff29d68cc78a00c 100644 (file)
--- a/drivers/gpu/drm/i2c/Makefile
+++ b/drivers/gpu/drm/i2c/Makefile
@@ -1,6 +1,6 @@
 ccflags-y := -Iinclude/drm
 
-obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o
+obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o adv7511_audio.o
 
 ch7006-y := ch7006_drv.o ch7006_mode.o
 obj-$(CONFIG_DRM_I2C_CH7006) += ch7006.o

diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c
index 6ae648ae0df6ad57a04939cad1c1f44f05d817c1..bbcda466184b3e31917afdd1bb02a0e775b65631 100644 (file)
--- a/drivers/gpu/drm/i2c/adv7511.c
+++ b/drivers/gpu/drm/i2c/adv7511.c
@@ -1345,6 +1345,8 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id)
                }
        }
 
+       adv7511_audio_init(dev);
+
        return 0;
 
 err_i2c_unregister_cec:
@@ -1359,6 +1361,7 @@ static int adv7511_remove(struct i2c_client *i2c)
 {
        struct adv7511 *adv7511 = i2c_get_clientdata(i2c);
 
+       adv7511_audio_exit(&i2c->dev);
        i2c_unregister_device(adv7511->i2c_cec);
        i2c_unregister_device(adv7511->i2c_edid);
 

diff --git a/drivers/gpu/drm/i2c/adv7511.h b/drivers/gpu/drm/i2c/adv7511.h
index cbd57f34881e4e2304fbb421f51956d2707f755a..e9008bf69caa068822356ae4145d7c8f775f0507 100644 (file)
--- a/drivers/gpu/drm/i2c/adv7511.h
+++ b/drivers/gpu/drm/i2c/adv7511.h
@@ -18,6 +18,9 @@ struct adv7511;
 int adv7511_packet_enable(struct adv7511 *adv7511, unsigned int packet);
 int adv7511_packet_disable(struct adv7511 *adv7511, unsigned int packet);
 
+int adv7511_audio_init(struct device *dev);
+void adv7511_audio_exit(struct device *dev);
+
 #define ADV7511_REG_CHIP_REVISION              0x00
 #define ADV7511_REG_N0                         0x01
 #define ADV7511_REG_N1                         0x02
@@ -254,6 +257,8 @@ struct adv7511 {
        struct drm_display_mode curr_mode;
 
        unsigned int f_tmds;
+       unsigned int f_audio;
+       unsigned int audio_source;
 
        unsigned int current_edid_segment;
        uint8_t edid_buf[256];

diff --git a/drivers/gpu/drm/i2c/adv7511_audio.c b/drivers/gpu/drm/i2c/adv7511_audio.c
new file mode 100644 (file)
index 0000000..1f73547
--- /dev/null
+++ b/drivers/gpu/drm/i2c/adv7511_audio.c
@@ -0,0 +1,311 @@
+/*
+ * Analog Devices ADV7511 HDMI transmitter driver
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/pm.h>
+#include <linux/i2c.h>
+#include <linux/spi/spi.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/initval.h>
+#include <sound/tlv.h>
+
+#include "adv7511.h"
+
+static const struct snd_soc_dapm_widget adv7511_dapm_widgets[] = {
+       SND_SOC_DAPM_OUTPUT("TMDS"),
+       SND_SOC_DAPM_AIF_IN("AIFIN", "Playback", 0, SND_SOC_NOPM, 0, 0),
+};
+
+static const struct snd_soc_dapm_route adv7511_routes[] = {
+       { "TMDS", NULL, "AIFIN" },
+};
+
+static void adv7511_calc_cts_n(unsigned int f_tmds, unsigned int fs,
+                              unsigned int *cts, unsigned int *n)
+{
+       switch (fs) {
+       case 32000:
+               *n = 4096;
+               break;
+       case 44100:
+               *n = 6272;
+               break;
+       case 48000:
+               *n = 6144;
+               break;
+       }
+
+       *cts = ((f_tmds * *n) / (128 * fs)) * 1000;
+}
+
+static int adv7511_update_cts_n(struct adv7511 *adv7511)
+{
+       unsigned int cts = 0;
+       unsigned int n = 0;
+
+       adv7511_calc_cts_n(adv7511->f_tmds, adv7511->f_audio, &cts, &n);
+
+       regmap_write(adv7511->regmap, ADV7511_REG_N0, (n >> 16) & 0xf);
+       regmap_write(adv7511->regmap, ADV7511_REG_N1, (n >> 8) & 0xff);
+       regmap_write(adv7511->regmap, ADV7511_REG_N2, n & 0xff);
+
+       regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL0,
+                    (cts >> 16) & 0xf);
+       regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL1,
+                    (cts >> 8) & 0xff);
+       regmap_write(adv7511->regmap, ADV7511_REG_CTS_MANUAL2,
+                    cts & 0xff);
+
+       return 0;
+}
+
+static int adv7511_hw_params(struct snd_pcm_substream *substream,
+                            struct snd_pcm_hw_params *params,
+                            struct snd_soc_dai *dai)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_codec *codec = rtd->codec;
+       struct adv7511 *adv7511 = snd_soc_codec_get_drvdata(codec);
+       unsigned int rate;
+       unsigned int len;
+       switch (params_rate(params)) {
+       case 32000:
+               rate = ADV7511_SAMPLE_FREQ_32000;
+               break;
+       case 44100:
+               rate = ADV7511_SAMPLE_FREQ_44100;
+               break;
+       case 48000:
+               rate = ADV7511_SAMPLE_FREQ_48000;
+               break;
+       case 88200:
+               rate = ADV7511_SAMPLE_FREQ_88200;
+               break;
+       case 96000:
+               rate = ADV7511_SAMPLE_FREQ_96000;
+               break;
+       case 176400:
+               rate = ADV7511_SAMPLE_FREQ_176400;
+               break;
+       case 192000:
+               rate = ADV7511_SAMPLE_FREQ_192000;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       switch (params_format(params)) {
+       case SNDRV_PCM_FORMAT_S16_LE:
+               len = ADV7511_I2S_SAMPLE_LEN_16;
+               break;
+       case SNDRV_PCM_FORMAT_S18_3LE:
+               len = ADV7511_I2S_SAMPLE_LEN_18;
+               break;
+       case SNDRV_PCM_FORMAT_S20_3LE:
+               len = ADV7511_I2S_SAMPLE_LEN_20;
+               break;
+       case SNDRV_PCM_FORMAT_S24_LE:
+               len = ADV7511_I2S_SAMPLE_LEN_24;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       adv7511->f_audio = params_rate(params);
+
+       adv7511_update_cts_n(adv7511);
+
+       regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CFG3,
+                          ADV7511_AUDIO_CFG3_LEN_MASK, len);
+       regmap_update_bits(adv7511->regmap, ADV7511_REG_I2C_FREQ_ID_CFG,
+                          ADV7511_I2C_FREQ_ID_CFG_RATE_MASK, rate << 4);
+       regmap_write(adv7511->regmap, 0x73, 0x1);
+
+       return 0;
+}
+
+static int adv7511_set_dai_fmt(struct snd_soc_dai *codec_dai,
+                              unsigned int fmt)
+{
+       struct snd_soc_codec *codec = codec_dai->codec;
+       struct adv7511 *adv7511 = snd_soc_codec_get_drvdata(codec);
+       unsigned int audio_source, i2s_format = 0;
+       unsigned int invert_clock;
+
+       switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
+       case SND_SOC_DAIFMT_I2S:
+               audio_source = ADV7511_AUDIO_SOURCE_I2S;
+               i2s_format = ADV7511_I2S_FORMAT_I2S;
+               break;
+       case SND_SOC_DAIFMT_RIGHT_J:
+               audio_source = ADV7511_AUDIO_SOURCE_I2S;
+               i2s_format = ADV7511_I2S_FORMAT_RIGHT_J;
+               break;
+       case SND_SOC_DAIFMT_LEFT_J:
+               audio_source = ADV7511_AUDIO_SOURCE_I2S;
+               i2s_format = ADV7511_I2S_FORMAT_LEFT_J;
+               break;
+//     case SND_SOC_DAIFMT_SPDIF:
+//             audio_source = ADV7511_AUDIO_SOURCE_SPDIF;
+//             break;
+       default:
+               return -EINVAL;
+       }
+
+       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+       case SND_SOC_DAIFMT_CBS_CFS:
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
+       case SND_SOC_DAIFMT_NB_NF:
+               invert_clock = 0;
+               break;
+       case SND_SOC_DAIFMT_IB_NF:
+               invert_clock = 1;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_SOURCE, 0x70,
+                          audio_source << 4);
+       regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG, BIT(6),
+                          invert_clock << 6);
+       regmap_update_bits(adv7511->regmap, ADV7511_REG_I2S_CONFIG, 0x03,
+                          i2s_format);
+
+       adv7511->audio_source = audio_source;
+
+       return 0;
+}
+
+static int adv7511_set_bias_level(struct snd_soc_codec *codec,
+                                 enum snd_soc_bias_level level)
+{
+       struct adv7511 *adv7511 = snd_soc_codec_get_drvdata(codec);
+
+       switch (level) {
+       case SND_SOC_BIAS_ON:
+               switch (adv7511->audio_source) {
+               case ADV7511_AUDIO_SOURCE_I2S:
+                       break;
+               case ADV7511_AUDIO_SOURCE_SPDIF:
+                       regmap_update_bits(adv7511->regmap,
+                                          ADV7511_REG_AUDIO_CONFIG, BIT(7),
+                                          BIT(7));
+                       break;
+               }
+               break;
+       case SND_SOC_BIAS_PREPARE:
+               if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
+                       adv7511_packet_enable(adv7511,
+                                       ADV7511_PACKET_ENABLE_AUDIO_SAMPLE);
+                       adv7511_packet_enable(adv7511,
+                                       ADV7511_PACKET_ENABLE_AUDIO_INFOFRAME);
+                       adv7511_packet_enable(adv7511,
+                                       ADV7511_PACKET_ENABLE_N_CTS);
+               } else {
+                       adv7511_packet_disable(adv7511,
+                                       ADV7511_PACKET_ENABLE_AUDIO_SAMPLE);
+                       adv7511_packet_disable(adv7511,
+                                       ADV7511_PACKET_ENABLE_AUDIO_INFOFRAME);
+                       adv7511_packet_disable(adv7511,
+                                       ADV7511_PACKET_ENABLE_N_CTS);
+               }
+               break;
+       case SND_SOC_BIAS_STANDBY:
+               regmap_update_bits(adv7511->regmap, ADV7511_REG_AUDIO_CONFIG,
+                                  BIT(7), 0);
+               break;
+       case SND_SOC_BIAS_OFF:
+               break;
+       }
+       codec->dapm.bias_level = level;
+       return 0;
+}
+
+#define ADV7511_RATES (SNDRV_PCM_RATE_32000 |\
+               SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
+               SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |\
+               SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000)
+
+#define ADV7511_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S18_3LE |\
+               SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE)
+
+static const struct snd_soc_dai_ops adv7511_dai_ops = {
+       .hw_params      = adv7511_hw_params,
+       /*.set_sysclk   = adv7511_set_dai_sysclk,*/
+       .set_fmt        = adv7511_set_dai_fmt,
+};
+
+static struct snd_soc_dai_driver adv7511_dai = {
+       .name = "adv7511",
+       .playback = {
+               .stream_name = "Playback",
+               .channels_min = 2,
+               .channels_max = 2,
+               .rates = ADV7511_RATES,
+               .formats = ADV7511_FORMATS,
+       },
+       .ops = &adv7511_dai_ops,
+};
+
+static int adv7511_suspend(struct snd_soc_codec *codec)
+{
+       return adv7511_set_bias_level(codec, SND_SOC_BIAS_OFF);
+}
+
+static int adv7511_resume(struct snd_soc_codec *codec)
+{
+       return adv7511_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+}
+
+static int adv7511_probe(struct snd_soc_codec *codec)
+{
+       return adv7511_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+}
+
+static int adv7511_remove(struct snd_soc_codec *codec)
+{
+       adv7511_set_bias_level(codec, SND_SOC_BIAS_OFF);
+       return 0;
+}
+
+static struct snd_soc_codec_driver adv7511_codec_driver = {
+       .probe              = adv7511_probe,
+       .remove             = adv7511_remove,
+       .suspend            = adv7511_suspend,
+       .resume             = adv7511_resume,
+       .set_bias_level     = adv7511_set_bias_level,
+
+       .dapm_widgets       = adv7511_dapm_widgets,
+       .num_dapm_widgets   = ARRAY_SIZE(adv7511_dapm_widgets),
+       .dapm_routes        = adv7511_routes,
+       .num_dapm_routes    = ARRAY_SIZE(adv7511_routes),
+};
+
+int adv7511_audio_init(struct device *dev)
+{
+    return snd_soc_register_codec(dev, &adv7511_codec_driver,
+               &adv7511_dai, 1);
+}
+
+void adv7511_audio_exit(struct device *dev)
+{
+       snd_soc_unregister_codec(dev);
+}