malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: hda - Allow driver to add vendor-specific verbs for regmap

Browse Source 
Codecs may have own vendor-specific verbs, and we need to allow each
driver to give such verbs for cached accesses.  Here a verb can be put
into a single array and looked through it at readable and writeable
callbacks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2015-02-26 12:29:03 +01:00
parent faa75f8a2e
commit 5e56bcea50
3 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/hda_regmap.h
View File

@ -11,7 +11,8 @@
int snd_hdac_regmap_init(struct hdac_device *codec); int snd_hdac_regmap_init(struct hdac_device *codec);
void snd_hdac_regmap_exit(struct hdac_device *codec); void snd_hdac_regmap_exit(struct hdac_device *codec);
int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec,
unsigned int verb);
int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg, int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg,
unsigned int *val); unsigned int *val);
int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg, int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg,

1
include/sound/hdaudio.h
View File

@ -75,6 +75,7 @@ struct hdac_device {
/* regmap */ /* regmap */
struct regmap *regmap; struct regmap *regmap;
struct snd_array vendor_verbs;
bool lazy_cache:1; /* don't wake up for writes */ bool lazy_cache:1; /* don't wake up for writes */
bool caps_overwriting:1; /* caps overwrite being in process */ bool caps_overwriting:1; /* caps overwrite being in process */
}; };

28
sound/hda/hdac_regmap.c
View File

@ -60,6 +60,13 @@ static bool hda_writeable_reg(struct device *dev, unsigned int reg)
{ {
struct hdac_device *codec = dev_to_hdac_dev(dev); struct hdac_device *codec = dev_to_hdac_dev(dev);
unsigned int verb = get_verb(reg); unsigned int verb = get_verb(reg);
int i;
for (i = 0; i < codec->vendor_verbs.used; i++) {
unsigned int *v = snd_array_elem(&codec->vendor_verbs, i);
if (verb == *v)
return true;
}
if (codec->caps_overwriting) if (codec->caps_overwriting)
return true; return true;
@ -200,6 +207,7 @@ int snd_hdac_regmap_init(struct hdac_device *codec)
if (IS_ERR(regmap)) if (IS_ERR(regmap))
return PTR_ERR(regmap); return PTR_ERR(regmap);
codec->regmap = regmap; codec->regmap = regmap;
snd_array_init(&codec->vendor_verbs, sizeof(unsigned int), 8);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(snd_hdac_regmap_init); EXPORT_SYMBOL_GPL(snd_hdac_regmap_init);
@ -209,10 +217,30 @@ void snd_hdac_regmap_exit(struct hdac_device *codec)
if (codec->regmap) { if (codec->regmap) {
regmap_exit(codec->regmap); regmap_exit(codec->regmap);
codec->regmap = NULL; codec->regmap = NULL;
snd_array_free(&codec->vendor_verbs);
} }
} }
EXPORT_SYMBOL_GPL(snd_hdac_regmap_exit); EXPORT_SYMBOL_GPL(snd_hdac_regmap_exit);
/**
* snd_hdac_regmap_add_vendor_verb - add a vendor-specific verb to regmap
* @codec: the codec object
* @verb: verb to allow accessing via regmap
*
* Returns zero for success or a negative error code.
*/
int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec,
unsigned int verb)
{
unsigned int *p = snd_array_new(&codec->vendor_verbs);
if (!p)
return -ENOMEM;
*p = verb;
return 0;
}
EXPORT_SYMBOL_GPL(snd_hdac_regmap_add_vendor_verb);
/* /*
* helper functions * helper functions
*/ */