]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
ASoC: ux500: Restore platform DAI assignments
authorJohan Hovold <johan@kernel.org>
Wed, 12 Jul 2017 15:55:30 +0000 (17:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 11 Aug 2017 15:33:52 +0000 (08:33 -0700)
commit6c0bc495b2ac07ab42c02a92e7634ca1c6012ab0
tree1458534f92459c9b0064f7b805fa7610dfaad7a8
parent045f833f265761e023c44e5f1951954a0ad531de
ASoC: ux500: Restore platform DAI assignments

commit 651e9268fb9b9944e063d731b09c0d2ad339bedb upstream.

This reverts commit f1013cdeeeb9 ("ASoC: ux500: drop platform DAI
assignments"), which seems to have been based on a misunderstanding and
prevents the platform driver callbacks from being made (e.g. to
preallocate DMA memory).

The real culprit for the warnings about attempts to create duplicate
procfs entries was commit 99b04f4c4051 ("ASoC: add Component level
pcm_new/pcm_free" that broke PCM creation on systems that use more than
one platform component.

Fixes: f1013cdeeeb9 ("ASoC: ux500: drop platform DAI assignments")
Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Tested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/soc/ux500/mop500.c