Patch "ASoC: rsnd: fix sound route path when using SRC6/SRC9" has been added to the 4.9-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
ASoC: rsnd: fix sound route path when using SRC6/SRC9
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-rsnd-fix-sound-route-path-when-using-src6-src9.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Dec 18 14:12:34 CET 2017
From: Hiroyuki Yokoyama <[email protected]>
Date: Wed, 1 Mar 2017 03:51:00 +0000
Subject: ASoC: rsnd: fix sound route path when using SRC6/SRC9
From: Hiroyuki Yokoyama <[email protected]>
[ Upstream commit a1c2ff53726907aff5feb37e4cfd45c1ff626431 ]
This patch fixes the problem that the missing value of the route path setting table and incorrect values are set in the CMD_ROUTE_SELECT register.
--- sound/soc/sh/rcar/cmd.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)
sound/soc/sh/rcar/cmd.c +20 -16
@@ -31,23 +31,24 @@ static int rsnd_cmd_init(struct rsnd_modstruct rsnd_mod *mix =rsnd_io_to_mod_mix (io);struct device *dev =rsnd_priv_to_dev (priv);u32 data; +u32 path[] = { + [1 ] =1 <<0 , + [5 ] =1 <<8 , + [6 ] =1 <<12 , + [9 ] =1 <<15 , + };if (!mix && !dvc)return 0 ; +if (ARRAY_SIZE (path) <rsnd_mod_id (mod) +1 ) +return -ENXIO ; +if (mix) {struct rsnd_dai *rdai;struct rsnd_mod *src;struct rsnd_dai_stream *tio;int i; -u32 path[] = { - [0 ] =0 , - [1 ] =1 <<0 , - [2 ] =0 , - [3 ] =0 , - [4 ] =0 , - [5 ] =1 <<8 - };/* * it is assuming that integrater is well understanding about
@@ -70,16 +71,19 @@ static int rsnd_cmd_init(struct rsnd_mod }else {struct rsnd_mod *src =rsnd_io_to_mod_src (io); -u32 path[] = { - [0 ] =0x30000 , - [1 ] =0x30001 , - [2 ] =0x40000 , - [3 ] =0x10000 , - [4 ] =0x20000 , - [5 ] =0x40100 +u8 cmd_case[] = { + [0 ] =0x3 , + [1 ] =0x3 , + [2 ] =0x4 , + [3 ] =0x1 , + [4 ] =0x2 , + [5 ] =0x4 , + [6 ] =0x1 , + [9 ] =0x2 , }; - data = path[rsnd_mod_id (src)]; + data = path[rsnd_mod_id (src)] | + cmd_case[rsnd_mod_id (src)] <<16 ; }dev_dbg (dev,"ctu/mix path = 0x%08x" , data);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/dmaengine-rcar-dmac-use-tcrb-instead-of-tcr-for-residue.patch queue-4.9/asoc-rcar-clear-de-bit-only-in-pdmachcr-when-it-stops.patch queue-4.9/asoc-rsnd-fix-sound-route-path-when-using-src6-src9.patch