--- v1
+++ v7
@@ -1,88 +1,80 @@
-Since RFC version of the patch set:
-- Split callbacks removal patch away from "Integrated ASoC DAI
- component driver implementation" patches for easier reading
+The patches are based on:
+git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git for-next
-This set of patches fixes OMAP4+ HDMI audio. The structure of the
-implementatin looks a bit different than before. Instead of creating a
-driver specific API for a separate ASoC component driver to connect
-to, this implementation integrates an the component driver into the
-HDMI driver.
+The base, the patches, and couple of additional not-to-be-merged
+omap2plus_defconfig patches can be found here:
+https://github.com/jsarha/linux.git omap-hdmi-audio
-The idea is to use an existing ASoC component driver API instead of
-creating a new custom API for each HDMI IP and to avoid splitting the
-driver to half for separate video and audio parts connected with the
-API.
+It would make the most sense to get these in trough fbdev tree. So it
+would be nice to get acked-bys (if the patches are Ok) for ASoC side
+changes from appropriate maintainers.
-The new implementation also uses simple-audio-card for a machine
-driver instead of having its own HW specific machine driver.
+Changes since v6:
+- "ASoC: omap-hdmi-audio: Add platform device for OMAP HDMI audio support"
+ - Fix Kconfig help text
+ - Remove #include <sound/simple_card.h>
+ - Use snd-soc-dummy codec instead of hdmi-audio-codec
+- Add: OMAPDSS: hdmi_wp: Protect reserved bits in hdmi_wp_audio_config_format()
+- Add: OMAPDSS: hdmi5_core: Initialize mandatory sample_order parameter
+- Add: "OMAPDSS: omapdss.h: Remove audio_state member of struct omap_dss_device"
+- "OMAPDSS: hdmi4: Register ASoC platform device for omap hdmi audio"
+ - Register "omap-hdmi-audio" with PLATFORM_DEVID_AUTO
+- "OMAPDSS: hdmi5: Register ASoC platform device for omap hdmi audio"
+ - Register "omap-hdmi-audio" with PLATFORM_DEVID_AUTO
+- Add: "OMAPDSS: hdmi5: Change hdmi_wp idlemode to to no_idle for audio playback"
-The patches are based on 3.15-rc2 merged with
-git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
-and
-git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git work/dss-dt-omap5
+Jyri Sarha (20):
+ OMAPDSS: hdmi_wp: Protect reserved bits in
+ hdmi_wp_audio_config_format()
+ OMAPDSS: hdmi5_core: Initialize mandatory sample_order parameter
+ OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value
+ OMAPDSS: hdmi: Remove most of OMAP[45]_DSS_HDMI_AUDIO ifdefs
+ OMAPDSS: hdmi4_core: Remove unused hdmi4_audio_get_dma_port()
+ OMAPDSS: omapdss.h: Remove audio_state member of struct
+ omap_dss_device
+ OMAPDSS: hdmi_wp: Add function for getting audio dma address
+ OMAPDSS: hdmi: Make hdmi structure public
+ OMAPDSS: hdmi: Add pdev pointer for audio_pdev in HDMI DRV data
+ ASoC: omap-hdmi-audio: Add platform device for OMAP HDMI audio
+ support
+ OMAPDSS: Kconfig: Remove HDMI audio booleans from Kconfig
+ OMAPDSS: hdmi: Make hdmi_mode_has_audio() more user friedly
+ OMAPDSS: hdmi.h: Add members to hdmi drvdata for audio implementation
+ OMAPDSS: hdmi4: Remove callbacks for the old ASoC DAI driver
+ OMAPDSS: hdmi4: Register ASoC platform device for omap hdmi audio
+ OMAPDSS: hdmi5: Remove callbacks for the old ASoC DAI driver
+ OMAPDSS: hdmi5: Register ASoC platform device for omap hdmi audio
+ ASoC: omap: Remove obsolete HDMI audio code and Kconfig options
+ OMAPDSS: Remove all references to obsolete HDMI audio callbacks
+ OMAPDSS: hdmi5: Change hdmi_wp idlemode to to no_idle for audio
+ playback
-Everything is pushed here here:
-git://git.ti.com/~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree.git omap-hdmi-audio
-
-Best regards,
-Jyri
-
-Jyri Sarha (19):
- ASoC: omap-pcm: Move omap-pcm under include/sound
- OMAPDSS: hdmi-common: Add hdmi_dss_audio_from_hw_params()
- OMAPDSS: hdmi4: Remove callbacks for an external ASoC DAI driver
- OMAPDSS: hdmi4: Integrated ASoC DAI component driver implementation
- OMAPDSS: Kconfig: Add depencies and help section to
- OMAP4_DSS_HDMI_AUDIO
- OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value
- OMAPDSS: hdmi5_core: Fix compilation with OMAP5_DSS_HDMI_AUDIO
- OMAPDSS: hdmi5: Remove callbacks for an external ASoC DAI driver
- OMAPDSS: hdmi5: Integrated ASoC DAI component driver implementation
- OMAPDSS: Kconfig: Add depencies and help section to
- OMAP5_DSS_HDMI_AUDIO
- ASoC: omap: Remove obsolete HDMI audio code and Kconfig options
- OMAPDSS: Remove obsolete audio code
- ARM: omap4.dtsi: Add audio related parametes to hdmi node
- ARM: omap4-panda-common.dtsi: Add HDMI audio nodes
- ARM: omap5.dtsi: Add audio related parameters to hdmi node
- ARM: omap5-uevm.dts: Add hdmi audio related nodes
- ARM: omap2plus_defconfig: Build DSS HDMI support for OMAP4 in kernel
- ARM: omap2plus_defconfig: Enable OMAP5 HDMI support
- ARM: omap2plus_defconfig: Enable OMAP4+ HDMI audio support
-
- .../devicetree/bindings/video/ti,omap4-dss.txt | 4 +
- .../devicetree/bindings/video/ti,omap5-dss.txt | 4 +
- arch/arm/boot/dts/omap4-panda-common.dtsi | 21 +-
- arch/arm/boot/dts/omap4.dtsi | 2 +
- arch/arm/boot/dts/omap5-uevm.dts | 19 +
- arch/arm/boot/dts/omap5.dtsi | 2 +
- arch/arm/configs/omap2plus_defconfig | 20 +-
- .../fbdev/omap2/displays-new/connector-hdmi.c | 99 ------
+ .../fbdev/omap2/displays-new/connector-hdmi.c | 99 -----
.../fbdev/omap2/displays-new/encoder-tpd12s015.c | 56 ---
- drivers/video/fbdev/omap2/dss/Kconfig | 19 +-
- drivers/video/fbdev/omap2/dss/hdmi.h | 8 +-
- drivers/video/fbdev/omap2/dss/hdmi4.c | 216 ++++++++----
- drivers/video/fbdev/omap2/dss/hdmi5.c | 216 ++++++++----
- drivers/video/fbdev/omap2/dss/hdmi5_core.c | 2 +-
- drivers/video/fbdev/omap2/dss/hdmi_common.c | 117 ++++++-
- include/sound/omap-pcm.h | 30 ++
- include/video/omapdss.h | 31 --
- sound/soc/davinci/davinci-mcasp.c | 2 +-
- sound/soc/omap/Kconfig | 13 -
- sound/soc/omap/Makefile | 4 -
- sound/soc/omap/omap-dmic.c | 2 +-
+ drivers/video/fbdev/omap2/dss/Kconfig | 7 -
+ drivers/video/fbdev/omap2/dss/hdmi.h | 38 +-
+ drivers/video/fbdev/omap2/dss/hdmi4.c | 269 +++++++------
+ drivers/video/fbdev/omap2/dss/hdmi4_core.c | 14 -
+ drivers/video/fbdev/omap2/dss/hdmi4_core.h | 4 -
+ drivers/video/fbdev/omap2/dss/hdmi5.c | 265 ++++++-------
+ drivers/video/fbdev/omap2/dss/hdmi5_core.c | 9 +-
+ drivers/video/fbdev/omap2/dss/hdmi5_core.h | 2 -
+ drivers/video/fbdev/omap2/dss/hdmi_common.c | 2 -
+ drivers/video/fbdev/omap2/dss/hdmi_wp.c | 16 +-
+ include/sound/omap-hdmi-audio.h | 43 +++
+ include/video/omapdss.h | 40 --
+ sound/soc/omap/Kconfig | 26 +-
+ sound/soc/omap/Makefile | 6 +-
+ sound/soc/omap/omap-hdmi-audio.c | 407 ++++++++++++++++++++
sound/soc/omap/omap-hdmi-card.c | 87 -----
- sound/soc/omap/omap-hdmi.c | 364 --------------------
+ sound/soc/omap/omap-hdmi.c | 364 -----------------
sound/soc/omap/omap-hdmi.h | 38 --
- sound/soc/omap/omap-mcbsp.c | 2 +-
- sound/soc/omap/omap-mcpdm.c | 2 +-
- sound/soc/omap/omap-pcm.h | 30 --
- 27 files changed, 540 insertions(+), 870 deletions(-)
- create mode 100644 include/sound/omap-pcm.h
+ 20 files changed, 781 insertions(+), 1011 deletions(-)
+ create mode 100644 include/sound/omap-hdmi-audio.h
+ create mode 100644 sound/soc/omap/omap-hdmi-audio.c
delete mode 100644 sound/soc/omap/omap-hdmi-card.c
delete mode 100644 sound/soc/omap/omap-hdmi.c
delete mode 100644 sound/soc/omap/omap-hdmi.h
- delete mode 100644 sound/soc/omap/omap-pcm.h
--
1.7.9.5