diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2014-05-08 04:59:00 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-05-08 07:17:59 -0400 |
commit | 5e392ea0da04d4206d56ec1479565fb42a044b57 (patch) | |
tree | 765c8458d0c8b0bc15d9361344933fe1549d096c /sound/soc/sh | |
parent | 86327bb880556ca2241b55e2f53c20377f0d082e (diff) |
ASoC: rsnd: remove old clock style support
All platform which used old style was
switched to new style.
R-Car sound can remove old style clock support,
use device dependent clock now.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sh')
-rw-r--r-- | sound/soc/sh/rcar/adg.c | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 69c44269ebdb..41556b2ef21e 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c | |||
@@ -397,9 +397,8 @@ int rsnd_adg_probe(struct platform_device *pdev, | |||
397 | { | 397 | { |
398 | struct rsnd_adg *adg; | 398 | struct rsnd_adg *adg; |
399 | struct device *dev = rsnd_priv_to_dev(priv); | 399 | struct device *dev = rsnd_priv_to_dev(priv); |
400 | struct clk *clk, *clk_orig; | 400 | struct clk *clk; |
401 | int i; | 401 | int i; |
402 | bool use_old_style = false; | ||
403 | 402 | ||
404 | adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL); | 403 | adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL); |
405 | if (!adg) { | 404 | if (!adg) { |
@@ -407,45 +406,13 @@ int rsnd_adg_probe(struct platform_device *pdev, | |||
407 | return -ENOMEM; | 406 | return -ENOMEM; |
408 | } | 407 | } |
409 | 408 | ||
410 | clk_orig = devm_clk_get(dev, NULL); | ||
411 | adg->clk[CLKA] = devm_clk_get(dev, "clk_a"); | 409 | adg->clk[CLKA] = devm_clk_get(dev, "clk_a"); |
412 | adg->clk[CLKB] = devm_clk_get(dev, "clk_b"); | 410 | adg->clk[CLKB] = devm_clk_get(dev, "clk_b"); |
413 | adg->clk[CLKC] = devm_clk_get(dev, "clk_c"); | 411 | adg->clk[CLKC] = devm_clk_get(dev, "clk_c"); |
414 | adg->clk[CLKI] = devm_clk_get(dev, "clk_i"); | 412 | adg->clk[CLKI] = devm_clk_get(dev, "clk_i"); |
415 | 413 | ||
416 | /* | 414 | for_each_rsnd_clk(clk, adg, i) |
417 | * It request device dependent audio clock. | 415 | dev_dbg(dev, "clk %d : %p\n", i, clk); |
418 | * But above all clks will indicate rsnd module clock | ||
419 | * if platform doesn't it | ||
420 | */ | ||
421 | for_each_rsnd_clk(clk, adg, i) { | ||
422 | if (clk_orig == clk) { | ||
423 | dev_warn(dev, | ||
424 | "doesn't have device dependent clock, use independent clock\n"); | ||
425 | use_old_style = true; | ||
426 | break; | ||
427 | } | ||
428 | } | ||
429 | |||
430 | /* | ||
431 | * note: | ||
432 | * these exist in order to keep compatible with | ||
433 | * platform which has device independent audio clock, | ||
434 | * but will be removed soon | ||
435 | */ | ||
436 | if (use_old_style) { | ||
437 | adg->clk[CLKA] = devm_clk_get(NULL, "audio_clk_a"); | ||
438 | adg->clk[CLKB] = devm_clk_get(NULL, "audio_clk_b"); | ||
439 | adg->clk[CLKC] = devm_clk_get(NULL, "audio_clk_c"); | ||
440 | adg->clk[CLKI] = devm_clk_get(NULL, "audio_clk_internal"); | ||
441 | } | ||
442 | |||
443 | for_each_rsnd_clk(clk, adg, i) { | ||
444 | if (IS_ERR(clk)) { | ||
445 | dev_err(dev, "Audio clock failed\n"); | ||
446 | return -EIO; | ||
447 | } | ||
448 | } | ||
449 | 416 | ||
450 | rsnd_adg_ssi_clk_init(priv, adg); | 417 | rsnd_adg_ssi_clk_init(priv, adg); |
451 | 418 | ||