Merge remote-tracking branches 'asoc/fix/rcar', 'asoc/fix/rt5670' and 'asoc/fix/wm894...

diff --combined sound/soc/sh/rcar/adg.c
index 49354d1,0891014,49354d1,49354d1..c4c51a4
--- 1/sound/soc/sh/rcar/adg.c
--- 2/sound/soc/sh/rcar/adg.c
--- 3/sound/soc/sh/rcar/adg.c
--- 4/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@@@@ -492,7 -492,9 -492,7 -492,7 +492,7 @@@@@ static void rsnd_adg_get_clkout(struct 
         */
        if (!count) {
                clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
 -                                            parent_clk_name,
 -                                            (parent_clk_name) ?
 -                                            0 : CLK_IS_ROOT, req_rate);
 +                                            parent_clk_name, 0, req_rate);
                if (!IS_ERR(clk)) {
                        adg->clkout[CLKOUT] = clk;
                        of_clk_add_provider(np, of_clk_src_simple_get, clk);
@@@@@ -504,7 -506,9 -504,7 -504,7 +504,7 @@@@@
        else {
                for (i = 0; i < CLKOUTMAX; i++) {
                        clk = clk_register_fixed_rate(dev, clkout_name[i],
 -                                                    parent_clk_name,
 -                                                    (parent_clk_name) ?
 -                                                    0 : CLK_IS_ROOT,
 +                                                    parent_clk_name, 0,
                                                      req_rate);
                        if (!IS_ERR(clk)) {
                                adg->onecell.clks       = adg->clkout;
@@@@@ -518,7 -522,7 -518,7 -518,7 +518,7 @@@@@
                }
        }
    
- --    rsnd_mod_bset(adg_mod, SSICKR, 0x00FF0000, ckr);
+ ++    rsnd_mod_bset(adg_mod, SSICKR, 0x80FF0000, ckr);
        rsnd_mod_write(adg_mod, BRRA,  rbga);
        rsnd_mod_write(adg_mod, BRRB,  rbgb);