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

2 files changed, 102 insertions, 0 deletions

diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
new file mode 100644
index 000000000000..fc3a481ad91e
--- /dev/null
+++ b/include/sound/hdmi-codec.h
@@ -0,0 +1,100 @@
+/*
+ * hdmi-codec.h - HDMI Codec driver API
+ *
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Author: Jyri Sarha <jsarha@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef __HDMI_CODEC_H__
+#define __HDMI_CODEC_H__
+
+#include <linux/hdmi.h>
+#include <drm/drm_edid.h>
+#include <sound/asoundef.h>
+#include <uapi/sound/asound.h>
+
+/*
+ * Protocol between ASoC cpu-dai and HDMI-encoder
+ */
+struct hdmi_codec_daifmt {
+        enum {
+                HDMI_I2S,
+                HDMI_RIGHT_J,
+                HDMI_LEFT_J,
+                HDMI_DSP_A,
+                HDMI_DSP_B,
+                HDMI_AC97,
+                HDMI_SPDIF,
+        } fmt;
+        int bit_clk_inv:1;
+        int frame_clk_inv:1;
+        int bit_clk_master:1;
+        int frame_clk_master:1;
+};
+
+/*
+ * HDMI audio parameters
+ */
+struct hdmi_codec_params {
+        struct hdmi_audio_infoframe cea;
+        struct snd_aes_iec958 iec;
+        int sample_rate;
+        int sample_width;
+        int channels;
+};
+
+struct hdmi_codec_ops {
+        /*
+         * Called when ASoC starts an audio stream setup.
+         * Optional
+         */
+        int (*audio_startup)(struct device *dev);
+
+        /*
+         * Configures HDMI-encoder for audio stream.
+         * Mandatory
+         */
+        int (*hw_params)(struct device *dev,
+                         struct hdmi_codec_daifmt *fmt,
+                         struct hdmi_codec_params *hparms);
+
+        /*
+         * Shuts down the audio stream.
+         * Mandatory
+         */
+        void (*audio_shutdown)(struct device *dev);
+
+        /*
+         * Mute/unmute HDMI audio stream.
+         * Optional
+         */
+        int (*digital_mute)(struct device *dev, bool enable);
+
+        /*
+         * Provides EDID-Like-Data from connected HDMI device.
+         * Optional
+         */
+        int (*get_eld)(struct device *dev, uint8_t *buf, size_t len);
+};
+
+/* HDMI codec initalization data */
+struct hdmi_codec_pdata {
+        const struct hdmi_codec_ops *ops;
+        uint i2s:1;
+        uint spdif:1;
+        int max_i2s_channels;
+};
+
+#define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"
+
+#endif /* __HDMI_CODEC_H__ */
diff --git a/include/sound/pcm_iec958.h b/include/sound/pcm_iec958.h
index 0eed397aca8e..36f023acb201 100644
--- a/include/sound/pcm_iec958.h
+++ b/include/sound/pcm_iec958.h
@@ -6,4 +6,6 @@
 int snd_pcm_create_iec958_consumer(struct snd_pcm_runtime *runtime, u8 *cs,
         size_t len);
 
+int snd_pcm_create_iec958_consumer_hw_params(struct snd_pcm_hw_params *params,
+                                             u8 *cs, size_t len);
 #endif