]>
git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge series "ASoC: rsnd: adjust disabled module for R-Car D3" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark, Geert
Renesas Sound driver is assuming that all SSI/SRC
are connected.
But some SSI/SRC are not connected on Some Renesas SoC.
ex)
H2 E2
SRC0 <=
SRC1 SRC1
SRC2 SRC2
... ...
We accepted it by using "status = disabled" on DT before.
ex)
rcar_sound,src {
src-0 {
=> status = "disabled";
};
src1: src-1 {
...
};
...
But R-Car D3 have many disabled modules (It has SSI3/SSI4, SRC5/SRC6),
and Renesas SoC maintainer don't want above style on DT.
ex)
rcar_sound,src {
=> src0: src-0 { status = "disabled"; };
=> src1: src-1 { status = "disabled"; };
=> src2: src-2 { status = "disabled"; };
=> src3: src-3 { status = "disabled"; };
=> src4: src-4 { status = "disabled"; };
src5: src-5 {
...
};
...
This patch-set adjust to this situation, and enables to intuitive DT settings.
rcar_sound,src {
src5: src-5 {
...
};
src6: src-6 {
...
};
};
Kuninori Morimoto (4):
ASoC: rsnd: tidyup rsnd_parse_connect_common()
ASoC: rsnd: tidyup rsnd_dma_request_channel()
ASoC: rsnd: tidyup rsnd_parse_connect_xxx()
ASoC: rsnd: adjust disabled module
sound/soc/sh/rcar/core.c | 58 ++++++++++++++++++++++++++++++++++++++--
sound/soc/sh/rcar/dma.c | 8 +++---
sound/soc/sh/rcar/dvc.c | 2 +-
sound/soc/sh/rcar/rsnd.h | 16 ++++++-----
sound/soc/sh/rcar/src.c | 6 +++--
sound/soc/sh/rcar/ssi.c | 12 ++++++---
sound/soc/sh/rcar/ssiu.c | 10 ++++---
7 files changed, 91 insertions(+), 21 deletions(-)
--
2.25.1