diff options
| author | Mark Brown <broonie@kernel.org> | 2021-02-08 15:01:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-02-08 15:01:45 +0000 |
| commit | c88eb1b5167bd0ae9e9b3585cd3c25092eabd92b (patch) | |
| tree | abbac76405410877c771a8b403344b867b11a034 /include/sound | |
| parent | 3bf48ea4f2dd404d4bfe4e4ded136df7843c21b0 (diff) | |
| parent | d5e16dc5fdad09d7b3133b6aaea7848bfb518e04 (diff) | |
| download | linux-stable-c88eb1b5167bd0ae9e9b3585cd3c25092eabd92b.tar.gz linux-stable-c88eb1b5167bd0ae9e9b3585cd3c25092eabd92b.tar.bz2 linux-stable-c88eb1b5167bd0ae9e9b3585cd3c25092eabd92b.zip | |
Merge series "Add HDMI support for Intel KeemBay I2S" from Sia Jee Heng <jee.heng.sia@intel.com>:
The below patch series are to support Audio over HDMI.
The modification in this patch series shall allow I2S driver
to playback standard PCM format and IEC958 encoded format to
the ADV7511 HDMI chip.
ALSA IEC958 plugin will be used to compose the IEC958 format.
Existing hdmi-codec driver only support standard pcm format.
Support of IEC958 encoded format passdown from ALSA IEC958 plugin
is needed so that the IEC958 encoded data can be streamed to the
HDMI chip.
Sia Jee Heng (4):
ASoC: codec: hdmi-codec: Support IEC958 encoded PCM format
drm: bridge: adv7511: Support I2S IEC958 encoded PCM format
dt-bindings: sound: Intel, Keembay-i2s: Add hdmi-i2s compatible string
ASoC: Intel: KMB: Support IEC958 encoded PCM format
.../bindings/sound/intel,keembay-i2s.yaml | 1 +
drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 +
.../gpu/drm/bridge/adv7511/adv7511_audio.c | 6 ++
include/sound/hdmi-codec.h | 5 ++
sound/soc/codecs/hdmi-codec.c | 4 +-
sound/soc/intel/keembay/kmb_platform.c | 73 ++++++++++++++++++-
sound/soc/intel/keembay/kmb_platform.h | 1 +
7 files changed, 89 insertions(+), 2 deletions(-)
base-commit: 2557c711b87cd42bb22be9ca6ff3fce038624f30
--
2.18.0
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/hdmi-codec.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h index b55970859a13..4b3a1d374b90 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -34,6 +34,11 @@ struct hdmi_codec_daifmt { unsigned int frame_clk_inv:1; unsigned int bit_clk_master:1; unsigned int frame_clk_master:1; + /* bit_fmt could be standard PCM format or + * IEC958 encoded format. ALSA IEC958 plugin will pass + * IEC958_SUBFRAME format to the underneath driver. + */ + snd_pcm_format_t bit_fmt; }; /* |