Skip to content

Rework OMAP4+ HDMI audio support

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

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest16 of 19 patches 12 repliesIn review

16 of 19 patches are in this archive. The cover letter announces 19.

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/19ASoC: omap-pcm: Move omap-pcm under include/soundinclude/sound/omap-pcm.h sound/soc/davinci/davinci-mcasp.c sound/soc/omap/omap-dmic.c +4 more+35 -350 replies
2/19OMAPDSS: hdmi-common: Add hdmi_dss_audio_from_hw_params()drivers/video/fbdev/omap2/dss/hdmi.h drivers/video/fbdev/omap2/dss/hdmi_common.c+121 -10 replies
3/19OMAPDSS: hdmi4: Remove callbacks for an external ASoC DAI driverdrivers/video/fbdev/omap2/dss/hdmi4.c+0 -1130 replies
4/19OMAPDSS: hdmi4: Integrated ASoC DAI component driver implementationDocumentation/devicetree/bindings/video/ti,omap4-dss.txt drivers/video/fbdev/omap2/dss/hdmi4.c+203 -00 replies
6/19OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum valuedrivers/video/fbdev/omap2/dss/hdmi.h+2 -10 replies
8/19OMAPDSS: hdmi5: Remove callbacks for an external ASoC DAI driverdrivers/video/fbdev/omap2/dss/hdmi5.c+0 -1130 replies
9/19OMAPDSS: hdmi5: Integrated ASoC DAI component driver implementationDocumentation/devicetree/bindings/video/ti,omap5-dss.txt drivers/video/fbdev/omap2/dss/hdmi5.c+203 -00 replies
10/19OMAPDSS: Kconfig: Add depencies and help section to OMAP5_DSS_HDMI_AUDIOdrivers/video/fbdev/omap2/dss/Kconfig+8 -10 replies
11/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 -5061 reply
12/19OMAPDSS: Remove obsolete audio codedrivers/video/fbdev/omap2/displays-new/connector-hdmi.c drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c include/video/omapdss.h+0 -1860 replies
14/19ARM: omap4-panda-common.dtsi: Add HDMI audio nodesarch/arm/boot/dts/omap4-panda-common.dtsi+20 -12 replies
15/19ARM: omap5.dtsi: Add audio related parameters to hdmi nodearch/arm/boot/dts/omap5.dtsi+2 -00 replies
16/19ARM: omap5-uevm.dts: Add hdmi audio related nodesarch/arm/boot/dts/omap5-uevm.dts+19 -00 replies
17/19ARM: omap2plus_defconfig: Build DSS HDMI support for OMAP4 in kernelarch/arm/configs/omap2plus_defconfig+4 -40 replies
18/19ARM: omap2plus_defconfig: Enable OMAP5 HDMI supportarch/arm/configs/omap2plus_defconfig+2 -00 replies
19/19ARM: omap2plus_defconfig: Enable OMAP4+ HDMI audio supportarch/arm/configs/omap2plus_defconfig+6 -40 replies

Reviews trailers per patch

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

PatchMark BrownTony Lindgren
SeriesA-b
1/19
2/19
3/19
4/19
6/19
8/19
9/19
10/19
11/19A-b
12/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 00/19] Rework OMAP4+ HDMI audio support

Since RFC version of the patch set:
- Split callbacks removal patch away from "Integrated ASoC DAI component driver implementation" patches for easier reading

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 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.

The new implementation also uses simple-audio-card for a machine driver instead of having its own HW specific machine driver.

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

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/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 +-
 sound/soc/omap/omap-hdmi-card.c                    |   87 -----
 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
 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
Signature · 1 line
1.7.9.5