github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 05:55:44 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: codecs: Remove the "fade-enable property"

Browse Source 
Remove the "fade-enable" property because the "fade_step" property
already implement this functionality.

Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
Link: https://lore.kernel.org/r/20230928105727.47273-4-wangweidong.a@awinic.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Weidong Wang 2023-09-28 18:57:20 +08:00 committed by Mark Brown
parent 457b6587c1
commit 085370aa8c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/soc/codecs/aw88395/aw88395_device.c
View File

@ -297,9 +297,6 @@ static void aw_dev_fade_in(struct aw_device *aw_dev)
int fade_step = aw_dev->fade_step;
int i;
if (!aw_dev->fade_en)
return;
if (fade_step == 0 || aw_dev->fade_in_time == 0) {
aw_dev_set_volume(aw_dev, fade_in_vol);
return;
@ -320,9 +317,6 @@ static void aw_dev_fade_out(struct aw_device *aw_dev)
int fade_step = aw_dev->fade_step;
int i;
if (!aw_dev->fade_en)
return;
if (fade_step == 0 || aw_dev->fade_out_time == 0) {
aw_dev_set_volume(aw_dev, AW88395_MUTE_VOL);
return;
@ -1062,10 +1056,6 @@ static int aw_dev_update_reg_container(struct aw_device *aw_dev,
aw_dev_set_volume(aw_dev, vol_desc->ctl_volume);
}
/* keep min volume */
if (aw_dev->fade_en)
aw_dev_set_volume(aw_dev, AW88395_MUTE_VOL);
aw_dev_get_dsp_config(aw_dev, &aw_dev->dsp_cfg);
return ret;
@ -1607,24 +1597,6 @@ static void aw88395_parse_channel_dt(struct aw_device *aw_dev)
aw_dev->channel = channel_value;
}
static void aw88395_parse_fade_enable_dt(struct aw_device *aw_dev)
{
struct device_node *np = aw_dev->dev->of_node;
u32 fade_en;
int ret;
ret = of_property_read_u32(np, "fade-enable", &fade_en);
if (ret) {
dev_dbg(aw_dev->dev,
"read fade-enable failed, close fade_in_out");
fade_en = AW88395_FADE_IN_OUT_DEFAULT;
}
dev_dbg(aw_dev->dev, "read fade-enable value is: %d", fade_en);
aw_dev->fade_en = fade_en;
}
static int aw_dev_init(struct aw_device *aw_dev)
{
aw_dev->chip_id = AW88395_CHIP_ID;
@ -1639,7 +1611,6 @@ static int aw_dev_init(struct aw_device *aw_dev)
aw_dev->fade_step = AW88395_VOLUME_STEP_DB;
aw_dev->volume_desc.ctl_volume = AW88395_VOL_DEFAULT_VALUE;
aw88395_parse_channel_dt(aw_dev);
aw88395_parse_fade_enable_dt(aw_dev);
return 0;
}

4
sound/soc/codecs/aw88395/aw88395_device.h
View File

@ -141,6 +141,7 @@ struct aw_device {
unsigned char prof_cur;
unsigned char prof_index;
unsigned char dsp_crc_st;
unsigned char dsp_cfg;
u16 chip_id;
unsigned int channel;
@ -151,9 +152,6 @@ struct aw_device {
struct regmap *regmap;
char *acf;
u32 fade_en;
unsigned char dsp_cfg;
u32 dsp_fw_len;
u32 dsp_cfg_len;
u8 platform;