| From 46d3595e32833a17780de5eed3257d6c145bd77f Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 13 Apr 2014 17:57:12 -0700 |
| Subject: ARM: shmobile: lager: switch to use dai info for R-Car sound |
| |
| Now, R-Car sound driver supports dai info settings. |
| switch to use it |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 50f359d7389be354b46d781f3b234d3008d20f2f) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/board-lager.c | 17 ++++++++++++----- |
| 1 file changed, 12 insertions(+), 5 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c |
| index 18c7e0311aa6..05c263b5de59 100644 |
| --- a/arch/arm/mach-shmobile/board-lager.c |
| +++ b/arch/arm/mach-shmobile/board-lager.c |
| @@ -567,20 +567,27 @@ static struct resource rsnd_resources[] __initdata = { |
| }; |
| |
| static struct rsnd_ssi_platform_info rsnd_ssi[] = { |
| - RSND_SSI_SET(0, 0, gic_spi(370), RSND_SSI_PLAY), |
| - RSND_SSI_SET(0, 0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE), |
| + RSND_SSI(0, gic_spi(370), 0), |
| + RSND_SSI(0, gic_spi(371), RSND_SSI_CLK_PIN_SHARE), |
| }; |
| |
| -static struct rsnd_scu_platform_info rsnd_scu[2] = { |
| +static struct rsnd_src_platform_info rsnd_src[2] = { |
| /* no member at this point */ |
| }; |
| |
| +static struct rsnd_dai_platform_info rsnd_dai = { |
| + .playback = { .ssi = &rsnd_ssi[0], }, |
| + .capture = { .ssi = &rsnd_ssi[1], }, |
| +}; |
| + |
| static struct rcar_snd_info rsnd_info = { |
| .flags = RSND_GEN2, |
| .ssi_info = rsnd_ssi, |
| .ssi_info_nr = ARRAY_SIZE(rsnd_ssi), |
| - .scu_info = rsnd_scu, |
| - .scu_info_nr = ARRAY_SIZE(rsnd_scu), |
| + .src_info = rsnd_src, |
| + .src_info_nr = ARRAY_SIZE(rsnd_src), |
| + .dai_info = &rsnd_dai, |
| + .dai_info_nr = 1, |
| }; |
| |
| static struct asoc_simple_card_info rsnd_card_info = { |
| -- |
| 2.1.2 |
| |