ASoC: share more product information with user space
Subsystems (3)
v3 cover ASoC: share more product information with user space
From: "Lu, Han" <[email protected]>
Share more product information, so user space utils such as PA and UCM can distinguish different products.
1. Add a core API.
2. Apply the API to bytcr-rt5640 driver.
changes on V3:
1. Split the core API and the API call to two patches
2. Replace misused strcat() with snprintf()
3. Code and comment fix
Lu, Han (2):
ASoC: core: add API for registering DMI card names
ASoC: bytcr-rt5640: register DMI names to card
include/sound/soc.h | 3 ++ sound/soc/intel/boards/bytcr_rt5640.c | 15 ++++++++++ sound/soc/soc-core.c | 53 +++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+)
Signature · 1 line
2.5.0
PATCH v3 1/2 ASoC: core: add API for registering DMI card names
From: "Lu, Han" <[email protected]>
Add core API for registering DMI card names, so user space utils such as PA and UCM can distinguish various products.
Previously on ASoC, the card short name, driver name and long name are all the same as the machine driver name.
The patch adds more board information:
card driver name ---> machine driver name
card short name ---> DMI_BOARD_NAME or DMI_PRODUCT_NAME card long name and
card component ---> short name:driver name:(DMI_SYS_VENDOR if
available):(the firmware name if available)
include/sound/soc.h +3 -0
@@ -486,6 +486,9 @@ void snd_soc_runtime_deactivate(struct snd_soc_pcm_runtime *rtd, int stream);int snd_soc_runtime_set_dai_fmt (struct snd_soc_pcm_runtime *rtd,unsigned int dai_fmt); +int snd_soc_set_card_names (struct snd_soc_card *card,const char *board, +const char *vendor,const char *firmware); +/* Utility functions to get clock rates from various things */ int snd_soc_calc_frame_size (int sample_size,int channels,int tdm_slots);int snd_soc_params_to_frame_size (struct snd_pcm_hw_params *params);
sound/soc/soc-core.c +53 -0
59 lines not on this page · raw message
Signature · 1 line
2.5.0
Re: [PATCH V3 1/2] ASoC: core: add API for registering DMI card names
On 03/31/2016 10:58 AM, [email protected] wrote:
[...]
sound/soc/soc-core.c int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, · line 1875
Quoted 9 lines
sound/soc/soc-core.c +9
-0+ name_size =strlen (card->name) +strlen (card->driver_name) + +strlen (vendor) +strlen (firmware) +4 ; +if (buf_size < name_size +strlen (card->snd_card->components)) +return -ENOMEM ; + name =kmalloc (buf_size,GFP_KERNEL ); +if (!name) +return -ENOMEM ; +snprintf (name, buf_size,"%s:%s:%s:%s" , card->name, + card->driver_name, vendor, firmware);
Have a look at kasprintf(). It will allow you to simplify the code here
Re: [PATCH V3 1/2] ASoC: core: add API for registering DMI card names
Quoted 11 lines
-----Original Message-----
From: Lars-Peter Clausen [mailto:[email protected]]
Sent: Thursday, March 31, 2016 8:01 PM
To: Lu, Han <[email protected]>; [email protected]; [email protected]; Koul, Vinod <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [alsa-devel] [PATCH V3 1/2] ASoC: core: add API for registering DMI card namesOn 03/31/2016 10:58 AM, [email protected] wrote:
[...]
Quoted 12 lines
sound/soc/soc-core.c int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, · line 1875
Quoted 9 lines
sound/soc/soc-core.c +9
-0+ name_size =strlen (card->name) +strlen (card->driver_name) + +strlen (vendor) +strlen (firmware) +4 ; +if (buf_size < name_size +strlen (card->snd_card->components)) +return -ENOMEM ; + name =kmalloc (buf_size,GFP_KERNEL ); +if (!name) +return -ENOMEM ; +snprintf (name, buf_size,"%s:%s:%s:%s" , card->name, + card->driver_name, vendor, firmware);Have a look at
kasprintf(). It will allow you to simplify the code here
Thanks Lars-Peter, I'll use kasprintf() to replace kmalloc() and snprintf() in V4.
BR,
Han
PATCH v3 2/2 ASoC: bytcr-rt5640: register DMI names to card
In reply to [email protected]From: "Lu, Han" <[email protected]>
Register DMI names for products using bytcr-rt5640 driver, such as ASUS T100TA and Dell Venue 8 Pro 5830, for user space utils to distinguish different products.
For example, previously on T100TA:
$ cat /proc/asound/cards
0 [bytcrrt5640 ]: bytcr-rt5640 - bytcr-rt5640
bytcr-rt5640
$ amixer -c0 info
Card hw:0 'bytcrrt5640'/'bytcr-rt5640'
Mixer name : ''
Components : ''
Controls : 256
Simple ctrls : 228After apply the patch:
$ cat /proc/asound/cards
0 [T100TA ]: bytcr-rt5640 - T100TA
T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_
sst_0f28.bin
$ amixer -c0 info
Card hw:0 'T100TA'/'T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_
sst_0f28.bin'
Mixer name : ''
Components : 'T100TA:bytcr-rt5640:ASUSTek COMPUTER INC.:intel/fw_s
st_0f28.bin'
Controls : 256
Simple ctrls : 228sound/soc/intel/boards/bytcr_rt5640.c +15 -0
@@ -152,6 +152,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { {} }; +static struct snd_soc_card byt_rt5640_card; +static int byt_rt5640_init (struct snd_soc_pcm_runtime *runtime) {int ret;
@@ -159,6 +161,19 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime)struct snd_soc_card *card = runtime->card;const struct snd_soc_dapm_route *custom_map;int num_routes; +const char *board, *vendor; +struct sst_acpi_mach *mach = byt_rt5640_card.dev->platform_data; + +/* Add board/product/vendor/firmware name for userspace */ + board =dmi_get_system_info (DMI_BOARD_NAME ); +if (!board) + board =dmi_get_system_info (DMI_PRODUCT_NAME ); + vendor =dmi_get_system_info (DMI_SYS_VENDOR ); + ret =snd_soc_set_card_names (card, board, vendor, mach->fw_filename); +if (ret <0 ) { +dev_err (card->dev,"unable to set card names\n" ); +return ret; + } card->dapm.idle_bias_off = true;
Signature · 1 line
2.5.0