Skip to content

Commit

Permalink
ASoC: simple-card: merge simple-scu-card
Browse files Browse the repository at this point in the history
simple-card and simple-scu-card are very similar driver,
but the former is supporting normal sound card,
the latter is supporting DPCM sound card.

We couldn't use normal sound and DPCM sound in same time by
one sound card. This patch merges both sound card into
simple-card. Now we can use both feature on same driver.

simple-card is now supporting .compatible = "simple-scu-audio-card".

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Kuninori Morimoto authored and Mark Brown committed Dec 14, 2018
1 parent c4e8ebb commit da21535
Show file tree
Hide file tree
Showing 2 changed files with 284 additions and 46 deletions.
1 change: 1 addition & 0 deletions sound/soc/generic/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ config SND_SIMPLE_CARD
select SND_SIMPLE_CARD_UTILS
help
This option enables generic simple sound card support
It also support DPCM of multi CPU single Codec ststem.

config SND_SIMPLE_SCU_CARD
tristate "ASoC Simple SCU sound card support"
Expand Down
Loading

0 comments on commit da21535

Please sign in to comment.