Skip to content

Rework OMAP4+ HDMI audio support

Jyri Sarha alsa-devel linux-fbdev linux-omap 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 32 repliesIn review

Changes since v7 from the cover letter

- Squash:
- "OMAPDSS: omapdss.h: Remove audio_state member of struct omap_dss_device"
- into "OMAPDSS: Remove all references to obsolete HDMI audio callbacks"

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19OMAPDSS: hdmi_wp: Protect reserved bits in hdmi_wp_audio_config_format()drivers/video/fbdev/omap2/dss/hdmi_wp.c+6 -20 replies
2/19OMAPDSS: hdmi5_core: Initialize mandatory sample_order parameterdrivers/video/fbdev/omap2/dss/hdmi5_core.c+3 -00 replies
3/19OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum valuedrivers/video/fbdev/omap2/dss/hdmi.h+2 -10 replies
4/19OMAPDSS: hdmi: Remove most of OMAP[45]_DSS_HDMI_AUDIO ifdefsdrivers/video/fbdev/omap2/dss/hdmi.h drivers/video/fbdev/omap2/dss/hdmi4_core.c drivers/video/fbdev/omap2/dss/hdmi4_core.h +4 more+1 -210 replies
5/19OMAPDSS: hdmi4_core: Remove unused hdmi4_audio_get_dma_port()drivers/video/fbdev/omap2/dss/hdmi4_core.c drivers/video/fbdev/omap2/dss/hdmi4_core.h+0 -110 replies
6/19OMAPDSS: hdmi_wp: Add function for getting audio dma addressdrivers/video/fbdev/omap2/dss/hdmi.h drivers/video/fbdev/omap2/dss/hdmi_wp.c+8 -00 replies
7/19OMAPDSS: hdmi: Make hdmi structure publicdrivers/video/fbdev/omap2/dss/hdmi.h drivers/video/fbdev/omap2/dss/hdmi4.c drivers/video/fbdev/omap2/dss/hdmi5.c+31 -410 replies
8/19OMAPDSS: hdmi: Add pdev pointer for audio_pdev in HDMI DRV datadrivers/video/fbdev/omap2/dss/hdmi.h+2 -00 replies
9/19ASoC: omap-hdmi-audio: Add platform device for OMAP HDMI audio supportinclude/sound/omap-hdmi-audio.h sound/soc/omap/Kconfig sound/soc/omap/Makefile +1 more+467 -03 replies
10/19OMAPDSS: Kconfig: Remove HDMI audio booleans from Kconfigdrivers/video/fbdev/omap2/dss/Kconfig+0 -70 replies
11/19OMAPDSS: hdmi: Make hdmi_mode_has_audio() more user friedlydrivers/video/fbdev/omap2/dss/hdmi.h+2 -24 replies
12/19OMAPDSS: hdmi.h: Add members to hdmi drvdata for audio implementationdrivers/video/fbdev/omap2/dss/hdmi.h+2 -00 replies
13/19OMAPDSS: hdmi4: Remove callbacks for the old ASoC DAI driverdrivers/video/fbdev/omap2/dss/hdmi4.c+0 -1130 replies
14/19OMAPDSS: hdmi4: Register ASoC platform device for omap hdmi audiodrivers/video/fbdev/omap2/dss/hdmi4.c+125 -00 replies
15/19OMAPDSS: hdmi5: Remove callbacks for the old ASoC DAI driverdrivers/video/fbdev/omap2/dss/hdmi5.c+0 -1130 replies
16/19OMAPDSS: hdmi5: Register ASoC platform device for omap hdmi audiodrivers/video/fbdev/omap2/dss/hdmi5.c+125 -00 replies
17/19ASoC: omap: Remove obsolete HDMI audio code and Kconfig optionssound/soc/omap/Kconfig sound/soc/omap/Makefile sound/soc/omap/omap-hdmi-card.c +2 more+0 -5060 replies
18/19OMAPDSS: Remove all references to obsolete HDMI audio callbacksdrivers/video/fbdev/omap2/displays-new/connector-hdmi.c drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c include/video/omapdss.h+0 -1950 replies
19/19OMAPDSS: hdmi5: Change hdmi_wp idlemode to to no_idle for audio playbackdrivers/video/fbdev/omap2/dss/hdmi.h drivers/video/fbdev/omap2/dss/hdmi5.c+8 -00 replies

Reviews trailers per patch

None of the 19 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchMark Brown
SeriesR-b
1/19
2/19
3/19
4/19
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19
13/19
14/19
15/19
16/19
17/19
18/19
19/19

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v1 thread

Cover letter [PATCH v7.1 00/19] Rework OMAP4+ HDMI audio support

The patches are based on:
git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git for-next

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

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.

Changes since v7:
- Squash:
- "OMAPDSS: omapdss.h: Remove audio_state member of struct omap_dss_device"
- into "OMAPDSS: Remove all references to obsolete HDMI audio callbacks"

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"

Jyri Sarha (19):
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: 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

 .../fbdev/omap2/displays-new/connector-hdmi.c      |   99 -----
 .../fbdev/omap2/displays-new/encoder-tpd12s015.c   |   56 ---
 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.h                         |   38 --
 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
Signature · 1 line
1.7.9.5