Skip to content

L
linux
Commit ba9c949f authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files
Options

ASoC: rsnd: rename scu to src 

R-Car sound has SCU unit which has SRC/CTU/MIX/DVC,
and current rsnd driver has scu.c and scu module.
Current scu.c has SRC support only.
My first concept was control these feature on scu.c
but, it become difficult and un-understandable now.
This patch rename scu to src
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 9524be0e
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 166 deletions
include/sound/rcar_snd.h
View file @ ba9c949f
...@@ -55,14 +55,18 @@ struct rsnd_ssi_platform_info { ...@@ -55,14 +55,18 @@ struct rsnd_ssi_platform_info {
*/ */
#define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */ #define RSND_SCU_USE_HPBIF (1 << 31) /* it needs RSND_SSI_DEPENDENT */
#define RSND_SCU(rate, _dma_id) \ #define RSND_SRC(rate, _dma_id) \
{ .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, } { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
#define RSND_SCU_SET(rate, _dma_id) \ #define RSND_SRC_SET(rate, _dma_id) \
{ .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, } { .flags = RSND_SCU_USE_HPBIF, .convert_rate = rate, .dma_id = _dma_id, }
#define RSND_SCU_UNUSED \ #define RSND_SRC_UNUSED \
{ .flags = 0, .convert_rate = 0, .dma_id = 0, } { .flags = 0, .convert_rate = 0, .dma_id = 0, }
struct rsnd_scu_platform_info { #define rsnd_scu_platform_info rsnd_src_platform_info
#define src_info scu_info
#define src_info_nr scu_info_nr
struct rsnd_src_platform_info {
u32 flags; u32 flags;
u32 convert_rate; /* sampling rate convert */ u32 convert_rate; /* sampling rate convert */
int dma_id; /* for Gen2 SCU */ int dma_id; /* for Gen2 SCU */
...@@ -70,7 +74,7 @@ struct rsnd_scu_platform_info { ...@@ -70,7 +74,7 @@ struct rsnd_scu_platform_info {
struct rsnd_dai_path_info { struct rsnd_dai_path_info {
struct rsnd_ssi_platform_info *ssi; struct rsnd_ssi_platform_info *ssi;
struct rsnd_scu_platform_info *scu; struct rsnd_src_platform_info *src;
}; };
struct rsnd_dai_platform_info { struct rsnd_dai_platform_info {
...@@ -93,8 +97,8 @@ struct rcar_snd_info { ...@@ -93,8 +97,8 @@ struct rcar_snd_info {
u32 flags; u32 flags;
struct rsnd_ssi_platform_info *ssi_info; struct rsnd_ssi_platform_info *ssi_info;
int ssi_info_nr; int ssi_info_nr;
struct rsnd_scu_platform_info *scu_info; struct rsnd_src_platform_info *src_info;
int scu_info_nr; int src_info_nr;
struct rsnd_dai_platform_info *dai_info; struct rsnd_dai_platform_info *dai_info;
int dai_info_nr; int dai_info_nr;
int (*start)(int id); int (*start)(int id);
......
sound/soc/sh/rcar/Makefile
View file @ ba9c949f
snd-soc-rcar-objs := core.o gen.o scu.o adg.o ssi.o snd-soc-rcar-objs := core.o gen.o src.o adg.o ssi.o
obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o obj-$(CONFIG_SND_SOC_RCAR) += snd-soc-rcar.o
\ No newline at end of file
sound/soc/sh/rcar/core.c
View file @ ba9c949f
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
* | +- ssi[2] * | +- ssi[2]
* | ... * | ...
* | * |
* | ** these control scu * | ** these control src
* | * |
* +- scu * +- src
* | * |
* +- scu[0] * +- src[0]
* +- scu[1] * +- src[1]
* +- scu[2] * +- src[2]
* ... * ...
* *
* *
...@@ -572,7 +572,7 @@ static int rsnd_path_init(struct rsnd_priv *priv, ...@@ -572,7 +572,7 @@ static int rsnd_path_init(struct rsnd_priv *priv,
struct rsnd_dai_platform_info *dai_info = rdai->info; struct rsnd_dai_platform_info *dai_info = rdai->info;
int ret; int ret;
int ssi_id = -1; int ssi_id = -1;
int scu_id = -1; int src_id = -1;
/* /*
* Gen1 is created by SRU/SSI, and this SRU is base module of * Gen1 is created by SRU/SSI, and this SRU is base module of
...@@ -587,8 +587,8 @@ static int rsnd_path_init(struct rsnd_priv *priv, ...@@ -587,8 +587,8 @@ static int rsnd_path_init(struct rsnd_priv *priv,
if (dai_info) { if (dai_info) {
if (rsnd_is_enable_path(io, ssi)) if (rsnd_is_enable_path(io, ssi))
ssi_id = rsnd_info_id(priv, io, ssi); ssi_id = rsnd_info_id(priv, io, ssi);
if (rsnd_is_enable_path(io, scu)) if (rsnd_is_enable_path(io, src))
scu_id = rsnd_info_id(priv, io, scu); src_id = rsnd_info_id(priv, io, src);
} else { } else {
/* get SSI's ID */ /* get SSI's ID */
mod = rsnd_ssi_mod_get_frm_dai(priv, mod = rsnd_ssi_mod_get_frm_dai(priv,
...@@ -596,14 +596,14 @@ static int rsnd_path_init(struct rsnd_priv *priv, ...@@ -596,14 +596,14 @@ static int rsnd_path_init(struct rsnd_priv *priv,
rsnd_dai_is_play(rdai, io)); rsnd_dai_is_play(rdai, io));
if (!mod) if (!mod)
return 0; return 0;
ssi_id = scu_id = rsnd_mod_id(mod); ssi_id = src_id = rsnd_mod_id(mod);
} }
ret = 0; ret = 0;
/* SCU */ /* SRC */
if (scu_id >= 0) { if (src_id >= 0) {
mod = rsnd_scu_mod_get(priv, scu_id); mod = rsnd_src_mod_get(priv, src_id);
ret = rsnd_dai_connect(mod, io); ret = rsnd_dai_connect(mod, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -806,7 +806,7 @@ static int rsnd_probe(struct platform_device *pdev) ...@@ -806,7 +806,7 @@ static int rsnd_probe(struct platform_device *pdev)
struct rsnd_priv *priv) = { struct rsnd_priv *priv) = {
rsnd_gen_probe, rsnd_gen_probe,
rsnd_ssi_probe, rsnd_ssi_probe,
rsnd_scu_probe, rsnd_src_probe,
rsnd_adg_probe, rsnd_adg_probe,
rsnd_dai_probe, rsnd_dai_probe,
}; };
......
sound/soc/sh/rcar/rsnd.h
View file @ ba9c949f
...@@ -160,7 +160,7 @@ void rsnd_dma_quit(struct rsnd_priv *priv, ...@@ -160,7 +160,7 @@ void rsnd_dma_quit(struct rsnd_priv *priv,
* R-Car sound mod * R-Car sound mod
*/ */
enum rsnd_mod_type { enum rsnd_mod_type {
RSND_MOD_SCU = 0, RSND_MOD_SRC = 0,
RSND_MOD_SSI, RSND_MOD_SSI,
RSND_MOD_MAX, RSND_MOD_MAX,
}; };
...@@ -224,7 +224,7 @@ struct rsnd_dai_stream { ...@@ -224,7 +224,7 @@ struct rsnd_dai_stream {
int next_period_byte; int next_period_byte;
}; };
#define rsnd_io_to_mod_ssi(io) ((io)->mod[RSND_MOD_SSI]) #define rsnd_io_to_mod_ssi(io) ((io)->mod[RSND_MOD_SSI])
#define rsnd_io_to_mod_scu(io) ((io)->mod[RSND_MOD_SCU]) #define rsnd_io_to_mod_src(io) ((io)->mod[RSND_MOD_SRC])
struct rsnd_dai { struct rsnd_dai {
char name[RSND_DAI_NAME_SIZE]; char name[RSND_DAI_NAME_SIZE];
...@@ -302,10 +302,10 @@ struct rsnd_priv { ...@@ -302,10 +302,10 @@ struct rsnd_priv {
void *gen; void *gen;
/* /*
* below value will be filled on rsnd_scu_probe() * below value will be filled on rsnd_src_probe()
*/ */
void *scu; void *src;
int scu_nr; int src_nr;
/* /*
* below value will be filled on rsnd_adg_probe() * below value will be filled on rsnd_adg_probe()
...@@ -345,22 +345,22 @@ struct rsnd_priv { ...@@ -345,22 +345,22 @@ struct rsnd_priv {
}) })
/* /*
* R-Car SCU * R-Car SRC
*/ */
int rsnd_scu_probe(struct platform_device *pdev, int rsnd_src_probe(struct platform_device *pdev,
struct rsnd_priv *priv); struct rsnd_priv *priv);
struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id); struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id);
unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
struct snd_pcm_runtime *runtime); struct snd_pcm_runtime *runtime);
int rsnd_scu_ssi_mode_init(struct rsnd_mod *ssi_mod, int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io); struct rsnd_dai_stream *io);
int rsnd_scu_enable_ssi_irq(struct rsnd_mod *ssi_mod, int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io); struct rsnd_dai_stream *io);
#define rsnd_scu_nr(priv) ((priv)->scu_nr) #define rsnd_src_nr(priv) ((priv)->src_nr)
/* /*
* R-Car SSI * R-Car SSI
......
sound/soc/sh/rcar/scu.c → sound/soc/sh/rcar/src.c
View file @ ba9c949f
/* /*
* Renesas R-Car SCU support * Renesas R-Car SRC support
* *
* Copyright (C) 2013 Renesas Solutions Corp. * Copyright (C) 2013 Renesas Solutions Corp.
* Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
*/ */
#include "rsnd.h" #include "rsnd.h"
struct rsnd_scu { struct rsnd_src {
struct rsnd_scu_platform_info *info; /* rcar_snd.h */ struct rsnd_src_platform_info *info; /* rcar_snd.h */
struct rsnd_mod mod; struct rsnd_mod mod;
struct clk *clk; struct clk *clk;
}; };
#define RSND_SCU_NAME_SIZE 16 #define RSND_SRC_NAME_SIZE 16
/* /*
* ADINR * ADINR
...@@ -27,19 +27,19 @@ struct rsnd_scu { ...@@ -27,19 +27,19 @@ struct rsnd_scu {
#define OTBL_18 (6 << 16) #define OTBL_18 (6 << 16)
#define OTBL_16 (8 << 16) #define OTBL_16 (8 << 16)
#define rsnd_scu_mode_flags(p) ((p)->info->flags) #define rsnd_src_mode_flags(p) ((p)->info->flags)
#define rsnd_scu_convert_rate(p) ((p)->info->convert_rate) #define rsnd_src_convert_rate(p) ((p)->info->convert_rate)
#define rsnd_mod_to_scu(_mod) \ #define rsnd_mod_to_src(_mod) \
container_of((_mod), struct rsnd_scu, mod) container_of((_mod), struct rsnd_src, mod)
#define rsnd_scu_hpbif_is_enable(scu) \ #define rsnd_src_hpbif_is_enable(src) \
(rsnd_scu_mode_flags(scu) & RSND_SCU_USE_HPBIF) (rsnd_src_mode_flags(src) & RSND_SCU_USE_HPBIF)
#define rsnd_scu_dma_available(scu) \ #define rsnd_src_dma_available(src) \
rsnd_dma_available(rsnd_mod_to_dma(&(scu)->mod)) rsnd_dma_available(rsnd_mod_to_dma(&(src)->mod))
#define for_each_rsnd_scu(pos, priv, i) \ #define for_each_rsnd_src(pos, priv, i) \
for ((i) = 0; \ for ((i) = 0; \
((i) < rsnd_scu_nr(priv)) && \ ((i) < rsnd_src_nr(priv)) && \
((pos) = (struct rsnd_scu *)(priv)->scu + i); \ ((pos) = (struct rsnd_src *)(priv)->src + i); \
i++) i++)
...@@ -54,7 +54,7 @@ struct rsnd_scu { ...@@ -54,7 +54,7 @@ struct rsnd_scu {
*/ */
/* /*
* scu.c is caring... * src.c is caring...
* *
* Gen1 * Gen1
* *
...@@ -63,7 +63,7 @@ struct rsnd_scu { ...@@ -63,7 +63,7 @@ struct rsnd_scu {
* *
* Gen2 * Gen2
* *
* [mem] -> [SCU] -> [SSIU] -> [SSI] * [mem] -> [SRC] -> [SSIU] -> [SSI]
* |-----------------| * |-----------------|
*/ */
...@@ -79,34 +79,34 @@ struct rsnd_scu { ...@@ -79,34 +79,34 @@ struct rsnd_scu {
* but SRC bypass mode needs SSI_MODE0 only. * but SRC bypass mode needs SSI_MODE0 only.
* *
* This driver request * This driver request
* struct rsnd_scu_platform_info { * struct rsnd_src_platform_info {
* u32 flags; * u32 flags;
* u32 convert_rate; * u32 convert_rate;
* } * }
* *
* rsnd_scu_hpbif_is_enable() will be true * rsnd_src_hpbif_is_enable() will be true
* if flags had RSND_SCU_USE_HPBIF, * if flags had RSND_SRC_USE_HPBIF,
* and it controls whether SSIU is used or not. * and it controls whether SSIU is used or not.
* *
* rsnd_scu_convert_rate() indicates * rsnd_src_convert_rate() indicates
* above convert_rate, and it controls * above convert_rate, and it controls
* whether SRC is used or not. * whether SRC is used or not.
* *
* ex) doesn't use SRC * ex) doesn't use SRC
* struct rsnd_scu_platform_info info = { * struct rsnd_src_platform_info info = {
* .flags = 0, * .flags = 0,
* .convert_rate = 0, * .convert_rate = 0,
* }; * };
* *
* ex) uses SRC * ex) uses SRC
* struct rsnd_scu_platform_info info = { * struct rsnd_src_platform_info info = {
* .flags = RSND_SCU_USE_HPBIF, * .flags = RSND_SRC_USE_HPBIF,
* .convert_rate = 48000, * .convert_rate = 48000,
* }; * };
* *
* ex) uses SRC bypass mode * ex) uses SRC bypass mode
* struct rsnd_scu_platform_info info = { * struct rsnd_src_platform_info info = {
* .flags = RSND_SCU_USE_HPBIF, * .flags = RSND_SRC_USE_HPBIF,
* .convert_rate = 0, * .convert_rate = 0,
* }; * };
* *
...@@ -115,28 +115,28 @@ struct rsnd_scu { ...@@ -115,28 +115,28 @@ struct rsnd_scu {
/* /*
* Gen1/Gen2 common functions * Gen1/Gen2 common functions
*/ */
int rsnd_scu_ssi_mode_init(struct rsnd_mod *ssi_mod, int rsnd_src_ssi_mode_init(struct rsnd_mod *ssi_mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod); struct rsnd_priv *priv = rsnd_mod_to_priv(ssi_mod);
struct rsnd_mod *scu_mod = rsnd_io_to_mod_scu(io); struct rsnd_mod *src_mod = rsnd_io_to_mod_src(io);
struct rcar_snd_info *info = rsnd_priv_to_info(priv); struct rcar_snd_info *info = rsnd_priv_to_info(priv);
int ssi_id = rsnd_mod_id(ssi_mod); int ssi_id = rsnd_mod_id(ssi_mod);
int has_scu = 0; int has_src = 0;
/* /*
* SSI_MODE0 * SSI_MODE0
*/ */
if (info->dai_info) { if (info->dai_info) {
has_scu = !!scu_mod; has_src = !!src_mod;
} else { } else {
struct rsnd_scu *scu = rsnd_mod_to_scu(scu_mod); struct rsnd_src *src = rsnd_mod_to_src(src_mod);
has_scu = rsnd_scu_hpbif_is_enable(scu); has_src = rsnd_src_hpbif_is_enable(src);
} }
rsnd_mod_bset(ssi_mod, SSI_MODE0, (1 << ssi_id), rsnd_mod_bset(ssi_mod, SSI_MODE0, (1 << ssi_id),
has_scu ? 0 : (1 << ssi_id)); has_src ? 0 : (1 << ssi_id));
/* /*
* SSI_MODE1 * SSI_MODE1
...@@ -165,7 +165,7 @@ int rsnd_scu_ssi_mode_init(struct rsnd_mod *ssi_mod, ...@@ -165,7 +165,7 @@ int rsnd_scu_ssi_mode_init(struct rsnd_mod *ssi_mod,
return 0; return 0;
} }
int rsnd_scu_enable_ssi_irq(struct rsnd_mod *ssi_mod, int rsnd_src_enable_ssi_irq(struct rsnd_mod *ssi_mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
...@@ -178,33 +178,33 @@ int rsnd_scu_enable_ssi_irq(struct rsnd_mod *ssi_mod, ...@@ -178,33 +178,33 @@ int rsnd_scu_enable_ssi_irq(struct rsnd_mod *ssi_mod,
return 0; return 0;
} }
unsigned int rsnd_scu_get_ssi_rate(struct rsnd_priv *priv, unsigned int rsnd_src_get_ssi_rate(struct rsnd_priv *priv,
struct rsnd_dai_stream *io, struct rsnd_dai_stream *io,
struct snd_pcm_runtime *runtime) struct snd_pcm_runtime *runtime)
{ {
struct rsnd_scu *scu; struct rsnd_src *src;
unsigned int rate; unsigned int rate;
scu = rsnd_mod_to_scu(rsnd_io_to_mod_scu(io)); src = rsnd_mod_to_src(rsnd_io_to_mod_src(io));
/* /*
* return convert rate if SRC is used, * return convert rate if SRC is used,
* otherwise, return runtime->rate as usual * otherwise, return runtime->rate as usual
*/ */
rate = rsnd_scu_convert_rate(scu); rate = rsnd_src_convert_rate(src);
if (!rate) if (!rate)
rate = runtime->rate; rate = runtime->rate;
return rate; return rate;
} }
static int rsnd_scu_set_convert_rate(struct rsnd_mod *mod, static int rsnd_src_set_convert_rate(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
u32 convert_rate = rsnd_scu_convert_rate(scu); u32 convert_rate = rsnd_src_convert_rate(src);
u32 adinr = runtime->channels; u32 adinr = runtime->channels;
u32 fsrate = 0; u32 fsrate = 0;
...@@ -217,7 +217,7 @@ static int rsnd_scu_set_convert_rate(struct rsnd_mod *mod, ...@@ -217,7 +217,7 @@ static int rsnd_scu_set_convert_rate(struct rsnd_mod *mod,
/* /*
* Initialize the operation of the SRC internal circuits * Initialize the operation of the SRC internal circuits
* see rsnd_scu_start() * see rsnd_src_start()
*/ */
rsnd_mod_write(mod, SRC_SRCIR, 1); rsnd_mod_write(mod, SRC_SRCIR, 1);
...@@ -248,61 +248,61 @@ static int rsnd_scu_set_convert_rate(struct rsnd_mod *mod, ...@@ -248,61 +248,61 @@ static int rsnd_scu_set_convert_rate(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_init(struct rsnd_mod *mod, static int rsnd_src_init(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
clk_enable(scu->clk); clk_enable(src->clk);
return 0; return 0;
} }
static int rsnd_scu_quit(struct rsnd_mod *mod, static int rsnd_src_quit(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
clk_disable(scu->clk); clk_disable(src->clk);
return 0; return 0;
} }
static int rsnd_scu_start(struct rsnd_mod *mod, static int rsnd_src_start(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
/* /*
* Cancel the initialization and operate the SRC function * Cancel the initialization and operate the SRC function
* see rsnd_scu_set_convert_rate() * see rsnd_src_set_convert_rate()
*/ */
rsnd_mod_write(mod, SRC_SRCIR, 0); rsnd_mod_write(mod, SRC_SRCIR, 0);
if (rsnd_scu_convert_rate(scu)) if (rsnd_src_convert_rate(src))
rsnd_mod_write(mod, SRC_ROUTE_MODE0, 1); rsnd_mod_write(mod, SRC_ROUTE_MODE0, 1);
return 0; return 0;
} }
static int rsnd_scu_stop(struct rsnd_mod *mod, static int rsnd_src_stop(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
if (rsnd_scu_convert_rate(scu)) if (rsnd_src_convert_rate(src))
rsnd_mod_write(mod, SRC_ROUTE_MODE0, 0); rsnd_mod_write(mod, SRC_ROUTE_MODE0, 0);
return 0; return 0;
} }
static struct rsnd_mod_ops rsnd_scu_non_ops = { static struct rsnd_mod_ops rsnd_src_non_ops = {
.name = "scu (non)", .name = "src (non)",
}; };
/* /*
...@@ -312,7 +312,7 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod, ...@@ -312,7 +312,7 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct scu_route_config { struct src_route_config {
u32 mask; u32 mask;
int shift; int shift;
} routes[] = { } routes[] = {
...@@ -346,14 +346,14 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod, ...@@ -346,14 +346,14 @@ static int rsnd_src_set_route_gen1(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_set_convert_timing_gen1(struct rsnd_mod *mod, static int rsnd_src_set_convert_timing_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
u32 convert_rate = rsnd_scu_convert_rate(scu); u32 convert_rate = rsnd_src_convert_rate(src);
u32 mask; u32 mask;
u32 val; u32 val;
int shift; int shift;
...@@ -405,13 +405,13 @@ static int rsnd_scu_set_convert_timing_gen1(struct rsnd_mod *mod, ...@@ -405,13 +405,13 @@ static int rsnd_scu_set_convert_timing_gen1(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_set_convert_rate_gen1(struct rsnd_mod *mod, static int rsnd_src_set_convert_rate_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
int ret; int ret;
ret = rsnd_scu_set_convert_rate(mod, rdai, io); ret = rsnd_src_set_convert_rate(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -427,13 +427,13 @@ static int rsnd_scu_set_convert_rate_gen1(struct rsnd_mod *mod, ...@@ -427,13 +427,13 @@ static int rsnd_scu_set_convert_rate_gen1(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_init_gen1(struct rsnd_mod *mod, static int rsnd_src_init_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
int ret; int ret;
ret = rsnd_scu_init(mod, rdai, io); ret = rsnd_src_init(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -441,18 +441,18 @@ static int rsnd_scu_init_gen1(struct rsnd_mod *mod, ...@@ -441,18 +441,18 @@ static int rsnd_scu_init_gen1(struct rsnd_mod *mod,
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = rsnd_scu_set_convert_rate_gen1(mod, rdai, io); ret = rsnd_src_set_convert_rate_gen1(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = rsnd_scu_set_convert_timing_gen1(mod, rdai, io); ret = rsnd_src_set_convert_timing_gen1(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
} }
static int rsnd_scu_start_gen1(struct rsnd_mod *mod, static int rsnd_src_start_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
...@@ -460,10 +460,10 @@ static int rsnd_scu_start_gen1(struct rsnd_mod *mod, ...@@ -460,10 +460,10 @@ static int rsnd_scu_start_gen1(struct rsnd_mod *mod,
rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), (1 << id)); rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), (1 << id));
return rsnd_scu_start(mod, rdai, io); return rsnd_src_start(mod, rdai, io);
} }
static int rsnd_scu_stop_gen1(struct rsnd_mod *mod, static int rsnd_src_stop_gen1(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
...@@ -471,27 +471,27 @@ static int rsnd_scu_stop_gen1(struct rsnd_mod *mod, ...@@ -471,27 +471,27 @@ static int rsnd_scu_stop_gen1(struct rsnd_mod *mod,
rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), 0); rsnd_mod_bset(mod, SRC_ROUTE_CTRL, (1 << id), 0);
return rsnd_scu_stop(mod, rdai, io); return rsnd_src_stop(mod, rdai, io);
} }
static struct rsnd_mod_ops rsnd_scu_gen1_ops = { static struct rsnd_mod_ops rsnd_src_gen1_ops = {
.name = "sru (gen1)", .name = "sru (gen1)",
.init = rsnd_scu_init_gen1, .init = rsnd_src_init_gen1,
.quit = rsnd_scu_quit, .quit = rsnd_src_quit,
.start = rsnd_scu_start_gen1, .start = rsnd_src_start_gen1,
.stop = rsnd_scu_stop_gen1, .stop = rsnd_src_stop_gen1,
}; };
/* /*
* Gen2 functions * Gen2 functions
*/ */
static int rsnd_scu_set_convert_rate_gen2(struct rsnd_mod *mod, static int rsnd_src_set_convert_rate_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
int ret; int ret;
ret = rsnd_scu_set_convert_rate(mod, rdai, io); ret = rsnd_src_set_convert_rate(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
...@@ -506,13 +506,13 @@ static int rsnd_scu_set_convert_rate_gen2(struct rsnd_mod *mod, ...@@ -506,13 +506,13 @@ static int rsnd_scu_set_convert_rate_gen2(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_set_convert_timing_gen2(struct rsnd_mod *mod, static int rsnd_src_set_convert_timing_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io); struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
u32 convert_rate = rsnd_scu_convert_rate(scu); u32 convert_rate = rsnd_src_convert_rate(src);
int ret; int ret;
if (convert_rate) if (convert_rate)
...@@ -525,34 +525,34 @@ static int rsnd_scu_set_convert_timing_gen2(struct rsnd_mod *mod, ...@@ -525,34 +525,34 @@ static int rsnd_scu_set_convert_timing_gen2(struct rsnd_mod *mod,
return ret; return ret;
} }
static int rsnd_scu_probe_gen2(struct rsnd_mod *mod, static int rsnd_src_probe_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_priv *priv = rsnd_mod_to_priv(mod); struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
struct rcar_snd_info *info = rsnd_priv_to_info(priv); struct rcar_snd_info *info = rsnd_priv_to_info(priv);
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
struct rsnd_mod *ssi = rsnd_ssi_mod_get(priv, rsnd_mod_id(mod)); struct rsnd_mod *ssi = rsnd_ssi_mod_get(priv, rsnd_mod_id(mod));
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
int ret; int ret;
int is_play; int is_play;
if (info->dai_info) if (info->dai_info)
is_play = rsnd_info_is_playback(priv, scu); is_play = rsnd_info_is_playback(priv, src);
else else
is_play = rsnd_ssi_is_play(ssi); is_play = rsnd_ssi_is_play(ssi);
ret = rsnd_dma_init(priv, ret = rsnd_dma_init(priv,
rsnd_mod_to_dma(mod), rsnd_mod_to_dma(mod),
is_play, is_play,
scu->info->dma_id); src->info->dma_id);
if (ret < 0) if (ret < 0)
dev_err(dev, "SCU DMA failed\n"); dev_err(dev, "SRC DMA failed\n");
return ret; return ret;
} }
static int rsnd_scu_remove_gen2(struct rsnd_mod *mod, static int rsnd_src_remove_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
...@@ -561,121 +561,126 @@ static int rsnd_scu_remove_gen2(struct rsnd_mod *mod, ...@@ -561,121 +561,126 @@ static int rsnd_scu_remove_gen2(struct rsnd_mod *mod,
return 0; return 0;
} }
static int rsnd_scu_init_gen2(struct rsnd_mod *mod, static int rsnd_src_init_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
int ret; int ret;
ret = rsnd_scu_init(mod, rdai, io); ret = rsnd_src_init(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = rsnd_scu_set_convert_rate_gen2(mod, rdai, io); ret = rsnd_src_set_convert_rate_gen2(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = rsnd_scu_set_convert_timing_gen2(mod, rdai, io); ret = rsnd_src_set_convert_timing_gen2(mod, rdai, io);
if (ret < 0) if (ret < 0)
return ret; return ret;
return 0; return 0;
} }
static int rsnd_scu_start_gen2(struct rsnd_mod *mod, static int rsnd_src_start_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
rsnd_dma_start(rsnd_mod_to_dma(&scu->mod)); rsnd_dma_start(rsnd_mod_to_dma(&src->mod));
rsnd_mod_write(mod, SSI_CTRL, 0x1); rsnd_mod_write(mod, SSI_CTRL, 0x1);
rsnd_mod_write(mod, SRC_CTRL, 0x11); rsnd_mod_write(mod, SRC_CTRL, 0x11);
return rsnd_scu_start(mod, rdai, io); return rsnd_src_start(mod, rdai, io);
} }
static int rsnd_scu_stop_gen2(struct rsnd_mod *mod, static int rsnd_src_stop_gen2(struct rsnd_mod *mod,
struct rsnd_dai *rdai, struct rsnd_dai *rdai,
struct rsnd_dai_stream *io) struct rsnd_dai_stream *io)
{ {
struct rsnd_scu *scu = rsnd_mod_to_scu(mod); struct rsnd_src *src = rsnd_mod_to_src(mod);
rsnd_mod_write(mod, SSI_CTRL, 0); rsnd_mod_write(mod, SSI_CTRL, 0);
rsnd_mod_write(mod, SRC_CTRL, 0); rsnd_mod_write(mod, SRC_CTRL, 0);
rsnd_dma_stop(rsnd_mod_to_dma(&scu->mod)); rsnd_dma_stop(rsnd_mod_to_dma(&src->mod));
return rsnd_scu_stop(mod, rdai, io); return rsnd_src_stop(mod, rdai, io);
} }
static struct rsnd_mod_ops rsnd_scu_gen2_ops = { static struct rsnd_mod_ops rsnd_src_gen2_ops = {
.name = "scu (gen2)", .name = "src (gen2)",
.probe = rsnd_scu_probe_gen2, .probe = rsnd_src_probe_gen2,
.remove = rsnd_scu_remove_gen2, .remove = rsnd_src_remove_gen2,
.init = rsnd_scu_init_gen2, .init = rsnd_src_init_gen2,
.quit = rsnd_scu_quit, .quit = rsnd_src_quit,
.start = rsnd_scu_start_gen2, .start = rsnd_src_start_gen2,
.stop = rsnd_scu_stop_gen2, .stop = rsnd_src_stop_gen2,
}; };
struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id) struct rsnd_mod *rsnd_src_mod_get(struct rsnd_priv *priv, int id)
{ {
if (WARN_ON(id < 0 || id >= rsnd_scu_nr(priv))) if (WARN_ON(id < 0 || id >= rsnd_src_nr(priv)))
id = 0; id = 0;
return &((struct rsnd_scu *)(priv->scu) + id)->mod; return &((struct rsnd_src *)(priv->src) + id)->mod;
} }
int rsnd_scu_probe(struct platform_device *pdev, int rsnd_src_probe(struct platform_device *pdev,
struct rsnd_priv *priv) struct rsnd_priv *priv)
{ {
struct rcar_snd_info *info = rsnd_priv_to_info(priv); struct rcar_snd_info *info = rsnd_priv_to_info(priv);
struct device *dev = rsnd_priv_to_dev(priv); struct device *dev = rsnd_priv_to_dev(priv);
struct rsnd_scu *scu; struct rsnd_src *src;
struct rsnd_mod_ops *ops; struct rsnd_mod_ops *ops;
struct clk *clk; struct clk *clk;
char name[RSND_SCU_NAME_SIZE]; char name[RSND_SRC_NAME_SIZE];
int i, nr; int i, nr;
/* /*
* init SCU * init SRC
*/ */
nr = info->scu_info_nr; nr = info->src_info_nr;
if (!nr) if (!nr)
return 0; return 0;
scu = devm_kzalloc(dev, sizeof(*scu) * nr, GFP_KERNEL); src = devm_kzalloc(dev, sizeof(*src) * nr, GFP_KERNEL);
if (!scu) { if (!src) {
dev_err(dev, "SCU allocate failed\n"); dev_err(dev, "SRC allocate failed\n");
return -ENOMEM; return -ENOMEM;
} }
priv->scu_nr = nr; priv->src_nr = nr;
priv->scu = scu; priv->src = src;
for_each_rsnd_scu(scu, priv, i) { for_each_rsnd_src(src, priv, i) {
snprintf(name, RSND_SCU_NAME_SIZE, "scu.%d", i); snprintf(name, RSND_SRC_NAME_SIZE, "src.%d", i);
clk = devm_clk_get(dev, name); 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)) if (IS_ERR(clk))
return PTR_ERR(clk); return PTR_ERR(clk);
scu->info = &info->scu_info[i]; src->info = &info->src_info[i];
scu->clk = clk; src->clk = clk;
ops = &rsnd_scu_non_ops; ops = &rsnd_src_non_ops;
if (rsnd_scu_hpbif_is_enable(scu)) { if (rsnd_src_hpbif_is_enable(src)) {
if (rsnd_is_gen1(priv)) if (rsnd_is_gen1(priv))
ops = &rsnd_scu_gen1_ops; ops = &rsnd_src_gen1_ops;
if (rsnd_is_gen2(priv)) if (rsnd_is_gen2(priv))
ops = &rsnd_scu_gen2_ops; ops = &rsnd_src_gen2_ops;
} }
rsnd_mod_init(priv, &scu->mod, ops, RSND_MOD_SCU, i); rsnd_mod_init(priv, &src->mod, ops, RSND_MOD_SRC, i);
dev_dbg(dev, "SCU%d probed\n", i); dev_dbg(dev, "SRC%d probed\n", i);
} }
return 0; return 0;
......
sound/soc/sh/rcar/ssi.c
View file @ ba9c949f
...@@ -121,7 +121,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi, ...@@ -121,7 +121,7 @@ static int rsnd_ssi_master_clk_start(struct rsnd_ssi *ssi,
1, 2, 4, 8, 16, 6, 12, 1, 2, 4, 8, 16, 6, 12,
}; };
unsigned int main_rate; unsigned int main_rate;
unsigned int rate = rsnd_scu_get_ssi_rate(priv, io, runtime); unsigned int rate = rsnd_src_get_ssi_rate(priv, io, runtime);
/* /*
* Find best clock, and try to start ADG * Find best clock, and try to start ADG
...@@ -287,7 +287,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, ...@@ -287,7 +287,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod,
ssi->cr_own = cr; ssi->cr_own = cr;
ssi->err = -1; /* ignore 1st error */ ssi->err = -1; /* ignore 1st error */
rsnd_scu_ssi_mode_init(mod, rdai, io); rsnd_src_ssi_mode_init(mod, rdai, io);
return 0; return 0;
} }
...@@ -387,7 +387,7 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod, ...@@ -387,7 +387,7 @@ static int rsnd_ssi_pio_start(struct rsnd_mod *mod,
/* enable PIO IRQ */ /* enable PIO IRQ */
ssi->cr_etc = UIEN | OIEN | DIEN; ssi->cr_etc = UIEN | OIEN | DIEN;
rsnd_scu_enable_ssi_irq(mod, rdai, io); rsnd_src_enable_ssi_irq(mod, rdai, io);
rsnd_ssi_hw_start(ssi, rdai, io); rsnd_ssi_hw_start(ssi, rdai, io);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7