diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-05-08 04:59:26 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-08 07:17:59 -0400 |
commit | 29e69fd2cd6f55233f64f600ad55ce2b661784d1 (patch) | |
tree | 4a97366f4c2b349e06ed00e8dcdb396766541f54 /include/sound | |
parent | 5e392ea0da04d4206d56ec1479565fb42a044b57 (diff) |
ASoC: rsnd: remove compatibility code
Now, all platform is using new style rsnd_dai_platform_info.
Keeping compatibility is no longer needed.
We can cleanup code.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/rcar_snd.h | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index 34a3c02a4576..a03268ec59c3 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h | |||
@@ -34,40 +34,24 @@ | |||
34 | * B : SSI direction | 34 | * B : SSI direction |
35 | */ | 35 | */ |
36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) | 36 | #define RSND_SSI_CLK_PIN_SHARE (1 << 31) |
37 | #define RSND_SSI_PLAY (1 << 24) | ||
38 | 37 | ||
39 | #define RSND_SSI(_dma_id, _pio_irq, _flags) \ | 38 | #define RSND_SSI(_dma_id, _pio_irq, _flags) \ |
40 | { .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags } | 39 | { .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags } |
41 | #define RSND_SSI_SET(_dai_id, _dma_id, _pio_irq, _flags) \ | ||
42 | { .dai_id = _dai_id, .dma_id = _dma_id, .pio_irq = _pio_irq, .flags = _flags } | ||
43 | #define RSND_SSI_UNUSED \ | 40 | #define RSND_SSI_UNUSED \ |
44 | { .dai_id = -1, .dma_id = -1, .pio_irq = -1, .flags = 0 } | 41 | { .dma_id = -1, .pio_irq = -1, .flags = 0 } |
45 | 42 | ||
46 | struct rsnd_ssi_platform_info { | 43 | struct rsnd_ssi_platform_info { |
47 | int dai_id; /* will be removed */ | ||
48 | int dma_id; | 44 | int dma_id; |
49 | int pio_irq; | 45 | int pio_irq; |
50 | u32 flags; | 46 | u32 flags; |
51 | }; | 47 | }; |
52 | 48 | ||
53 | /* | ||
54 | * flags | ||
55 | */ | ||
56 | #define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ | ||
57 | |||
58 | #define RSND_SRC(rate, _dma_id) \ | 49 | #define RSND_SRC(rate, _dma_id) \ |
59 | { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, } | 50 | { .convert_rate = rate, .dma_id = _dma_id, } |
60 | #define RSND_SRC_SET(rate, _dma_id) \ | ||
61 | { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, } | ||
62 | #define RSND_SRC_UNUSED \ | 51 | #define RSND_SRC_UNUSED \ |
63 | { .flags = 0, .convert_rate = 0, .dma_id = 0, } | 52 | { .convert_rate = 0, .dma_id = -1, } |
64 | |||
65 | #define rsnd_scu_platform_info rsnd_src_platform_info | ||
66 | #define src_info scu_info | ||
67 | #define src_info_nr scu_info_nr | ||
68 | 53 | ||
69 | struct rsnd_src_platform_info { | 54 | struct rsnd_src_platform_info { |
70 | u32 flags; | ||
71 | u32 convert_rate; /* sampling rate convert */ | 55 | u32 convert_rate; /* sampling rate convert */ |
72 | int dma_id; /* for Gen2 SCU */ | 56 | int dma_id; /* for Gen2 SCU */ |
73 | }; | 57 | }; |