aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/sh/rcar/dma.c2
-rw-r--r--sound/soc/sh/rcar/src.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c
index 60aa5e96a49f..041ec1080d52 100644
--- a/sound/soc/sh/rcar/dma.c
+++ b/sound/soc/sh/rcar/dma.c
@@ -604,8 +604,8 @@ rsnd_gen2_dma_addr(struct rsnd_dai_stream *io,
604 dma_addr_t in_addr; 604 dma_addr_t in_addr;
605 } dma_addrs[3][2][3] = { 605 } dma_addrs[3][2][3] = {
606 /* SRC */ 606 /* SRC */
607 /* Capture */
607 {{{ 0, 0 }, 608 {{{ 0, 0 },
608 /* Capture */
609 { RDMA_SRC_O_N(src, id), RDMA_SRC_I_P(src, id) }, 609 { RDMA_SRC_O_N(src, id), RDMA_SRC_I_P(src, id) },
610 { RDMA_CMD_O_N(src, id), RDMA_SRC_I_P(src, id) } }, 610 { RDMA_CMD_O_N(src, id), RDMA_SRC_I_P(src, id) } },
611 /* Playback */ 611 /* Playback */
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 8e9a1de0ec25..46400397dbbd 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -108,7 +108,6 @@ unsigned int rsnd_src_get_rate(struct rsnd_priv *priv,
108 int is_play = rsnd_io_is_play(io); 108 int is_play = rsnd_io_is_play(io);
109 109
110 /* 110 /*
111 *
112 * Playback 111 * Playback
113 * runtime_rate -> [SRC] -> convert_rate 112 * runtime_rate -> [SRC] -> convert_rate
114 * 113 *
@@ -203,13 +202,13 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
203 use_src = (fin != fout) | rsnd_src_sync_is_enabled(mod); 202 use_src = (fin != fout) | rsnd_src_sync_is_enabled(mod);
204 203
205 /* 204 /*
206 * SRC_ADINR 205 * SRC_ADINR
207 */ 206 */
208 adinr = rsnd_get_adinr_bit(mod, io) | 207 adinr = rsnd_get_adinr_bit(mod, io) |
209 rsnd_runtime_channel_original(io); 208 rsnd_runtime_channel_original(io);
210 209
211 /* 210 /*
212 * SRC_IFSCR / SRC_IFSVR 211 * SRC_IFSCR / SRC_IFSVR
213 */ 212 */
214 ifscr = 0; 213 ifscr = 0;
215 fsrate = 0; 214 fsrate = 0;
@@ -223,7 +222,7 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
223 } 222 }
224 223
225 /* 224 /*
226 * SRC_SRCCR / SRC_ROUTE_MODE0 225 * SRC_SRCCR / SRC_ROUTE_MODE0
227 */ 226 */
228 cr = 0x00011110; 227 cr = 0x00011110;
229 route = 0x0; 228 route = 0x0;