]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/kernel-video.git/commit
ASoC: OMAP: ABE: Pick working ABE support from LDC audio branch
authorJyri Sarha <jsarha@ti.com>
Thu, 2 May 2013 13:18:05 +0000 (16:18 +0300)
committerJyri Sarha <jsarha@ti.com>
Mon, 10 Jun 2013 11:31:56 +0000 (14:31 +0300)
commit41b605f2887879d5e428928b197e24ffb44d9b82
tree90c53e5176d5309f913d160e35e016f83a992b51
parent5923e2ed65d2829718c65299bc3d60360295592a
ASoC: OMAP: ABE: Pick working ABE support from LDC audio branch

After this commit the content of sound/soc/omap matches to commit
0769a881 in git://gitorious.org/omap-audio/linux-audio.git with
following exceptions:

These commits not found from LDC tree are not overwritten:
ASoC: omap-abe-core: Call driver_deffered_probe_trigger only if built in
ASoC: OMAP: HDMI: Add support for DT boot
ASoC: HDMI: CPU-DAI: Correct typo
ASoC: OMAP: HDMI: Add config support for OMAP5

These commits from LDC tree are not included:
ASoC: omap: Check regulator enable for DAC on Pandora
ASoC: tlv320aic3x: Convert mic bias to a supply widget
ASoC: omap-pcm: No need to set constraint at open time

This commit is needed to bring the working ABE support from LDC audio
tree to LCPD AV-tree. The history of the old LCPD AV-tree does not
match LDC audio tree history (the "same" commits had different
content) so merge was not possible and this hackish commit was
needed.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
28 files changed:
sound/soc/omap/Kconfig
sound/soc/omap/aess/Makefile
sound/soc/omap/aess/abe.h
sound/soc/omap/aess/abe_aess.c
sound/soc/omap/aess/abe_aess.h
sound/soc/omap/aess/abe_core.c
sound/soc/omap/aess/abe_def.h [deleted file]
sound/soc/omap/aess/abe_ext.h [deleted file]
sound/soc/omap/aess/abe_gain.c
sound/soc/omap/aess/abe_gain.h
sound/soc/omap/aess/abe_ini.c
sound/soc/omap/aess/abe_mem.h
sound/soc/omap/aess/abe_port.c
sound/soc/omap/aess/abe_port.h
sound/soc/omap/aess/abe_seq.c [deleted file]
sound/soc/omap/aess/abe_seq.h [deleted file]
sound/soc/omap/aess/abe_typ.h [deleted file]
sound/soc/omap/aess/aess-fw.h [new file with mode: 0644]
sound/soc/omap/omap-abe-core.c
sound/soc/omap/omap-abe-mixer.c
sound/soc/omap/omap-abe-mmap.c
sound/soc/omap/omap-abe-pcm.c
sound/soc/omap/omap-abe-pm.c
sound/soc/omap/omap-abe-priv.h
sound/soc/omap/omap-abe-twl6040.c
sound/soc/omap/omap-dmic.c
sound/soc/omap/omap-mcasp.c
sound/soc/omap/omap-mcpdm.c