forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390
kernel/sound/soc/sh/rcar/adg.c
....@@ -88,6 +88,7 @@
8888 switch (id) {
8989 case 1:
9090 case 2:
91
+ case 9:
9192 ws = 0;
9293 break;
9394 case 4:
....@@ -250,28 +251,8 @@
250251 out = out << shift;
251252 mask = 0x0f1f << shift;
252253
253
- switch (id / 2) {
254
- case 0:
255
- rsnd_mod_bset(adg_mod, SRCIN_TIMSEL0, mask, in);
256
- rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL0, mask, out);
257
- break;
258
- case 1:
259
- rsnd_mod_bset(adg_mod, SRCIN_TIMSEL1, mask, in);
260
- rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL1, mask, out);
261
- break;
262
- case 2:
263
- rsnd_mod_bset(adg_mod, SRCIN_TIMSEL2, mask, in);
264
- rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL2, mask, out);
265
- break;
266
- case 3:
267
- rsnd_mod_bset(adg_mod, SRCIN_TIMSEL3, mask, in);
268
- rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL3, mask, out);
269
- break;
270
- case 4:
271
- rsnd_mod_bset(adg_mod, SRCIN_TIMSEL4, mask, in);
272
- rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL4, mask, out);
273
- break;
274
- }
254
+ rsnd_mod_bset(adg_mod, SRCIN_TIMSEL(id / 2), mask, in);
255
+ rsnd_mod_bset(adg_mod, SRCOUT_TIMSEL(id / 2), mask, out);
275256
276257 if (en)
277258 rsnd_mod_bset(adg_mod, DIV_EN, en, en);
....@@ -300,17 +281,7 @@
300281 if (id == 8)
301282 return;
302283
303
- switch (id / 4) {
304
- case 0:
305
- rsnd_mod_bset(adg_mod, AUDIO_CLK_SEL0, mask, val);
306
- break;
307
- case 1:
308
- rsnd_mod_bset(adg_mod, AUDIO_CLK_SEL1, mask, val);
309
- break;
310
- case 2:
311
- rsnd_mod_bset(adg_mod, AUDIO_CLK_SEL2, mask, val);
312
- break;
313
- }
284
+ rsnd_mod_bset(adg_mod, AUDIO_CLK_SEL(id / 4), mask, val);
314285
315286 dev_dbg(dev, "AUDIO_CLK_SEL is 0x%x\n", val);
316287 }
....@@ -589,7 +560,7 @@
589560 int i;
590561
591562 for_each_rsnd_clk(clk, adg, i)
592
- dev_dbg(dev, "%s : %p : %ld\n",
563
+ dev_dbg(dev, "%s : %pa : %ld\n",
593564 clk_name[i], clk, clk_get_rate(clk));
594565
595566 dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
....@@ -602,7 +573,7 @@
602573 * by BRGCKR::BRGCKR_31
603574 */
604575 for_each_rsnd_clkout(clk, adg, i)
605
- dev_dbg(dev, "clkout %d : %p : %ld\n", i,
576
+ dev_dbg(dev, "clkout %d : %pa : %ld\n", i,
606577 clk, clk_get_rate(clk));
607578 }
608579 #else
....@@ -620,7 +591,7 @@
620591 return -ENOMEM;
621592
622593 ret = rsnd_mod_init(priv, &adg->mod, &adg_ops,
623
- NULL, NULL, 0, 0);
594
+ NULL, 0, 0);
624595 if (ret)
625596 return ret;
626597