mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-12 15:16:41 +07:00
ASoC: rsnd: add .get_id/.get_id_sub
ID for CTU and SSIU are confusable. 1 CTU has 4 sub nodes. This means, CTU0 has CTU01 - CTU03, CTU1 has CTU10 - CTU13. SSIU is more confusable. Gen2 SSIU has BUSIF0-3, Gen3 SSIU has BUSIF0-7, but not for all SSIU. In rsnd driver, each mod drivers are assuming rsnd_mod_id() returns main device ID (In CTU case CTU0-1, SSIU case SSIU0-9), not serial number. This patch adds new .id/.id_sub to handling more detail ID. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
7e7fe06de3
commit
c16015f36c
@ -144,6 +144,27 @@ u32 *rsnd_mod_get_status(struct rsnd_mod *mod,
|
||||
return &mod->status;
|
||||
}
|
||||
|
||||
int rsnd_mod_id_raw(struct rsnd_mod *mod)
|
||||
{
|
||||
return mod->id;
|
||||
}
|
||||
|
||||
int rsnd_mod_id(struct rsnd_mod *mod)
|
||||
{
|
||||
if ((mod)->ops->id)
|
||||
return (mod)->ops->id(mod);
|
||||
|
||||
return rsnd_mod_id_raw(mod);
|
||||
}
|
||||
|
||||
int rsnd_mod_id_sub(struct rsnd_mod *mod)
|
||||
{
|
||||
if ((mod)->ops->id_sub)
|
||||
return (mod)->ops->id_sub(mod);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rsnd_mod_init(struct rsnd_priv *priv,
|
||||
struct rsnd_mod *mod,
|
||||
struct rsnd_mod_ops *ops,
|
||||
|
@ -334,6 +334,24 @@ static int rsnd_ctu_pcm_new(struct rsnd_mod *mod,
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int rsnd_ctu_id(struct rsnd_mod *mod)
|
||||
{
|
||||
/*
|
||||
* ctu00: -> 0, ctu01: -> 0, ctu02: -> 0, ctu03: -> 0
|
||||
* ctu10: -> 1, ctu11: -> 1, ctu12: -> 1, ctu13: -> 1
|
||||
*/
|
||||
return mod->id / 4;
|
||||
}
|
||||
|
||||
static int rsnd_ctu_id_sub(struct rsnd_mod *mod)
|
||||
{
|
||||
/*
|
||||
* ctu00: -> 0, ctu01: -> 1, ctu02: -> 2, ctu03: -> 3
|
||||
* ctu10: -> 0, ctu11: -> 1, ctu12: -> 2, ctu13: -> 3
|
||||
*/
|
||||
return mod->id % 4;
|
||||
}
|
||||
|
||||
static struct rsnd_mod_ops rsnd_ctu_ops = {
|
||||
.name = CTU_NAME,
|
||||
.probe = rsnd_ctu_probe_,
|
||||
@ -342,6 +360,8 @@ static struct rsnd_mod_ops rsnd_ctu_ops = {
|
||||
.hw_params = rsnd_ctu_hw_params,
|
||||
.pcm_new = rsnd_ctu_pcm_new,
|
||||
.get_status = rsnd_mod_get_status,
|
||||
.id = rsnd_ctu_id,
|
||||
.id_sub = rsnd_ctu_id_sub,
|
||||
};
|
||||
|
||||
struct rsnd_mod *rsnd_ctu_mod_get(struct rsnd_priv *priv, int id)
|
||||
|
@ -304,6 +304,8 @@ struct rsnd_mod_ops {
|
||||
u32 *(*get_status)(struct rsnd_mod *mod,
|
||||
struct rsnd_dai_stream *io,
|
||||
enum rsnd_mod_type type);
|
||||
int (*id)(struct rsnd_mod *mod);
|
||||
int (*id_sub)(struct rsnd_mod *mod);
|
||||
};
|
||||
|
||||
struct rsnd_dai_stream;
|
||||
@ -376,7 +378,6 @@ struct rsnd_mod {
|
||||
|
||||
#define rsnd_mod_to_priv(mod) ((mod)->priv)
|
||||
#define rsnd_mod_name(mod) ((mod)->ops->name)
|
||||
#define rsnd_mod_id(mod) ((mod)->id)
|
||||
#define rsnd_mod_power_on(mod) clk_enable((mod)->clk)
|
||||
#define rsnd_mod_power_off(mod) clk_disable((mod)->clk)
|
||||
#define rsnd_mod_get(ip) (&(ip)->mod)
|
||||
@ -396,6 +397,9 @@ void rsnd_mod_interrupt(struct rsnd_mod *mod,
|
||||
u32 *rsnd_mod_get_status(struct rsnd_mod *mod,
|
||||
struct rsnd_dai_stream *io,
|
||||
enum rsnd_mod_type type);
|
||||
int rsnd_mod_id(struct rsnd_mod *mod);
|
||||
int rsnd_mod_id_raw(struct rsnd_mod *mod);
|
||||
int rsnd_mod_id_sub(struct rsnd_mod *mod);
|
||||
struct rsnd_mod *rsnd_mod_next(int *iterator,
|
||||
struct rsnd_dai_stream *io,
|
||||
enum rsnd_mod_type *array,
|
||||
|
Loading…
Reference in New Issue
Block a user