From: Mark Brown Date: Tue, 3 Jun 2014 09:39:53 +0000 (+0100) Subject: Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=440a5285589d4abc7f7c44f063a3554557820ab6;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge remote-tracking branches 'asoc/topic/omap' and 'asoc/topic/rcar' into asoc-next --- 440a5285589d4abc7f7c44f063a3554557820ab6 diff --cc sound/soc/sh/rcar/src.c index e3b078e7c3aa,6232b7d307aa,4b5671b0d1e6..200eda019bc7 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@@@ -393,8 -431,9 -391,19 +391,19 @@@@ static int rsnd_src_set_convert_rate_ge return 0; } ++ static int rsnd_src_probe_gen1(struct rsnd_mod *mod, ++ struct rsnd_dai *rdai) ++ { ++ struct rsnd_priv *priv = rsnd_mod_to_priv(mod); ++ struct device *dev = rsnd_priv_to_dev(priv); ++ ++ dev_dbg(dev, "%s (Gen1) is probed\n", rsnd_mod_name(mod)); ++ ++ return 0; ++ } ++ static int rsnd_src_init_gen1(struct rsnd_mod *mod, - struct rsnd_dai *rdai, - struct rsnd_dai_stream *io) + struct rsnd_dai *rdai) { int ret; @@@@ -643,21 -696,28 -668,16 +668,16 @@@@ int rsnd_src_probe(struct platform_devi priv->src = src; for_each_rsnd_src(src, priv, i) { -- snprintf(name, RSND_SRC_NAME_SIZE, "src.%d", i); ++ snprintf(name, RSND_SRC_NAME_SIZE, "%s.%d", ++ SRC_NAME, i); clk = devm_clk_get(dev, name); - if (IS_ERR(clk)) { - snprintf(name, RSND_SRC_NAME_SIZE, "scu.%d", i); - clk = devm_clk_get(dev, name); - } - if (IS_ERR(clk)) return PTR_ERR(clk); src->info = &info->src_info[i]; src->clk = clk; -- ops = &rsnd_src_non_ops; - if (rsnd_is_gen1(priv)) - ops = &rsnd_src_gen1_ops; - if (rsnd_is_gen2(priv)) - ops = &rsnd_src_gen2_ops; - if (rsnd_src_hpbif_is_enable(src)) { - if (rsnd_is_gen1(priv)) - ops = &rsnd_src_gen1_ops; - if (rsnd_is_gen2(priv)) - ops = &rsnd_src_gen2_ops; - } -- rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i); dev_dbg(dev, "SRC%d probed\n", i);