iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: codecs: Modify the bin file parsing method

Browse Source 
Modify the aw88395_lib file so that the bin file
parsing is no longer related to the chip id of the chip.
Adopt the bin file data type "prof_data_type" as the
differentiation between different chip bin file
parsing methods.

Since the chip id macro for the aw88399 is no longer
defined in aw88395_reg.h, define the chip id
for the aw88399 in aw88399.h

Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
Link: https://lore.kernel.org/r/20231109093708.13155-1-wangweidong.a@awinic.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Weidong Wang 2023-11-09 17:37:07 +08:00 committed by Mark Brown
parent 8df735701a
commit fc213b8d44
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 42 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,7 @@ struct aw_device {
unsigned int channel; unsigned int channel;
unsigned int fade_step; unsigned int fade_step;
unsigned int prof_data_type;
struct i2c_client *i2c; struct i2c_client *i2c;
struct device *dev; struct device *dev;

124
sound/soc/codecs/aw88395/aw88395_lib.c
View File

@ -11,7 +11,6 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include "aw88395_lib.h" #include "aw88395_lib.h"
#include "aw88395_device.h" #include "aw88395_device.h"
#include "aw88395_reg.h"
#define AW88395_CRC8_POLYNOMIAL 0x8C #define AW88395_CRC8_POLYNOMIAL 0x8C
DECLARE_CRC8_TABLE(aw_crc8_table); DECLARE_CRC8_TABLE(aw_crc8_table);
@ -456,14 +455,6 @@ static int aw_dev_parse_reg_bin_with_hdr(struct aw_device *aw_dev,
goto parse_bin_failed; goto parse_bin_failed;
} }
if (aw_dev->chip_id == AW88261_CHIP_ID) {
if (aw_bin->header_info[0].valid_data_len % 4) {
dev_err(aw_dev->dev, "bin data len get error!");
ret = -EINVAL;
goto parse_bin_failed;
}
}
prof_desc->sec_desc[AW88395_DATA_TYPE_REG].data = prof_desc->sec_desc[AW88395_DATA_TYPE_REG].data =
data + aw_bin->header_info[0].valid_data_addr; data + aw_bin->header_info[0].valid_data_addr;
prof_desc->sec_desc[AW88395_DATA_TYPE_REG].len = prof_desc->sec_desc[AW88395_DATA_TYPE_REG].len =
@ -528,7 +519,7 @@ static int aw_dev_parse_dev_type(struct aw_device *aw_dev,
cfg_dde[i].dev_profile); cfg_dde[i].dev_profile);
return -EINVAL; return -EINVAL;
} }
aw_dev->prof_data_type = cfg_dde[i].data_type;
ret = aw_dev_parse_data_by_sec_type(aw_dev, prof_hdr, &cfg_dde[i], ret = aw_dev_parse_data_by_sec_type(aw_dev, prof_hdr, &cfg_dde[i],
&all_prof_info->prof_desc[cfg_dde[i].dev_profile]); &all_prof_info->prof_desc[cfg_dde[i].dev_profile]);
if (ret < 0) { if (ret < 0) {
@ -564,6 +555,7 @@ static int aw_dev_parse_dev_default_type(struct aw_device *aw_dev,
cfg_dde[i].dev_profile); cfg_dde[i].dev_profile);
return -EINVAL; return -EINVAL;
} }
aw_dev->prof_data_type = cfg_dde[i].data_type;
ret = aw_dev_parse_data_by_sec_type(aw_dev, prof_hdr, &cfg_dde[i], ret = aw_dev_parse_data_by_sec_type(aw_dev, prof_hdr, &cfg_dde[i],
&all_prof_info->prof_desc[cfg_dde[i].dev_profile]); &all_prof_info->prof_desc[cfg_dde[i].dev_profile]);
if (ret < 0) { if (ret < 0) {
@ -582,7 +574,7 @@ static int aw_dev_parse_dev_default_type(struct aw_device *aw_dev,
return 0; return 0;
} }
static int aw88261_dev_cfg_get_valid_prof(struct aw_device *aw_dev, static int aw_dev_cfg_get_reg_valid_prof(struct aw_device *aw_dev,
struct aw_all_prof_info *all_prof_info) struct aw_all_prof_info *all_prof_info)
{ {
struct aw_prof_desc *prof_desc = all_prof_info->prof_desc; struct aw_prof_desc *prof_desc = all_prof_info->prof_desc;
@ -624,7 +616,7 @@ static int aw88261_dev_cfg_get_valid_prof(struct aw_device *aw_dev,
return 0; return 0;
} }
static int aw88395_dev_cfg_get_valid_prof(struct aw_device *aw_dev, static int aw_dev_cfg_get_multiple_valid_prof(struct aw_device *aw_dev,
struct aw_all_prof_info *all_prof_info) struct aw_all_prof_info *all_prof_info)
{ {
struct aw_prof_desc *prof_desc = all_prof_info->prof_desc; struct aw_prof_desc *prof_desc = all_prof_info->prof_desc;
@ -703,26 +695,20 @@ static int aw_dev_load_cfg_by_hdr(struct aw_device *aw_dev,
goto exit; goto exit;
} }
switch (aw_dev->chip_id) { switch (aw_dev->prof_data_type) {
case AW88395_CHIP_ID: case ACF_SEC_TYPE_MULTIPLE_BIN:
case AW88399_CHIP_ID: ret = aw_dev_cfg_get_multiple_valid_prof(aw_dev, all_prof_info);
ret = aw88395_dev_cfg_get_valid_prof(aw_dev, all_prof_info);
if (ret < 0)
goto exit;
break; break;
case AW88261_CHIP_ID: case ACF_SEC_TYPE_HDR_REG:
case AW87390_CHIP_ID: ret = aw_dev_cfg_get_reg_valid_prof(aw_dev, all_prof_info);
ret = aw88261_dev_cfg_get_valid_prof(aw_dev, all_prof_info);
if (ret < 0)
goto exit;
break; break;
default: default:
dev_err(aw_dev->dev, "valid prof unsupported"); dev_err(aw_dev->dev, "unsupport data type\n");
ret = -EINVAL; ret = -EINVAL;
break; break;
} }
if (!ret)
aw_dev->prof_info.prof_name_list = profile_name; aw_dev->prof_info.prof_name_list = profile_name;
exit: exit:
devm_kfree(aw_dev->dev, all_prof_info); devm_kfree(aw_dev->dev, all_prof_info);
@ -791,39 +777,23 @@ static int aw_get_dev_scene_count_v1(struct aw_device *aw_dev, struct aw_contain
struct aw_cfg_dde_v1 *cfg_dde = struct aw_cfg_dde_v1 *cfg_dde =
(struct aw_cfg_dde_v1 *)(aw_cfg->data + cfg_hdr->hdr_offset); (struct aw_cfg_dde_v1 *)(aw_cfg->data + cfg_hdr->hdr_offset);
unsigned int i; unsigned int i;
int ret;
switch (aw_dev->chip_id) { for (i = 0; i < cfg_hdr->ddt_num; ++i) {
case AW88395_CHIP_ID: if (((cfg_dde[i].data_type == ACF_SEC_TYPE_REG) ||
case AW88399_CHIP_ID: (cfg_dde[i].data_type == ACF_SEC_TYPE_HDR_REG) ||
for (i = 0; i < cfg_hdr->ddt_num; ++i) { (cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN)) &&
if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) && (aw_dev->chip_id == cfg_dde[i].chip_id) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) && (aw_dev->i2c->adapter->nr == cfg_dde[i].dev_bus) &&
(aw_dev->i2c->adapter->nr == cfg_dde[i].dev_bus) && (aw_dev->i2c->addr == cfg_dde[i].dev_addr))
(aw_dev->i2c->addr == cfg_dde[i].dev_addr)) (*scene_num)++;
(*scene_num)++;
}
ret = 0;
break;
case AW88261_CHIP_ID:
case AW87390_CHIP_ID:
for (i = 0; i < cfg_hdr->ddt_num; ++i) {
if (((cfg_dde[i].data_type == ACF_SEC_TYPE_REG) ||
(cfg_dde[i].data_type == ACF_SEC_TYPE_HDR_REG)) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) &&
(aw_dev->i2c->adapter->nr == cfg_dde[i].dev_bus) &&
(aw_dev->i2c->addr == cfg_dde[i].dev_addr))
(*scene_num)++;
}
ret = 0;
break;
default:
dev_err(aw_dev->dev, "unsupported device");
ret = -EINVAL;
break;
} }
return ret; if ((*scene_num) == 0) {
dev_err(aw_dev->dev, "failed to obtain scene, scenu_num = %d\n", (*scene_num));
return -EINVAL;
}
return 0;
} }
static int aw_get_default_scene_count_v1(struct aw_device *aw_dev, static int aw_get_default_scene_count_v1(struct aw_device *aw_dev,
@ -834,37 +804,23 @@ static int aw_get_default_scene_count_v1(struct aw_device *aw_dev,
struct aw_cfg_dde_v1 *cfg_dde = struct aw_cfg_dde_v1 *cfg_dde =
(struct aw_cfg_dde_v1 *)(aw_cfg->data + cfg_hdr->hdr_offset); (struct aw_cfg_dde_v1 *)(aw_cfg->data + cfg_hdr->hdr_offset);
unsigned int i; unsigned int i;
int ret;
switch (aw_dev->chip_id) {
case AW88395_CHIP_ID: for (i = 0; i < cfg_hdr->ddt_num; ++i) {
case AW88399_CHIP_ID: if (((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) ||
for (i = 0; i < cfg_hdr->ddt_num; ++i) { (cfg_dde[i].data_type == ACF_SEC_TYPE_REG) ||
if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) && (cfg_dde[i].data_type == ACF_SEC_TYPE_HDR_REG)) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) && (aw_dev->chip_id == cfg_dde[i].chip_id) &&
(aw_dev->channel == cfg_dde[i].dev_index)) (aw_dev->channel == cfg_dde[i].dev_index))
(*scene_num)++; (*scene_num)++;
}
ret = 0;
break;
case AW88261_CHIP_ID:
case AW87390_CHIP_ID:
for (i = 0; i < cfg_hdr->ddt_num; ++i) {
if (((cfg_dde[i].data_type == ACF_SEC_TYPE_REG) ||
(cfg_dde[i].data_type == ACF_SEC_TYPE_HDR_REG)) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) &&
(aw_dev->channel == cfg_dde[i].dev_index))
(*scene_num)++;
}
ret = 0;
break;
default:
dev_err(aw_dev->dev, "unsupported device");
ret = -EINVAL;
break;
} }
return ret; if ((*scene_num) == 0) {
dev_err(aw_dev->dev, "failed to obtain scene, scenu_num = %d\n", (*scene_num));
return -EINVAL;
}
return 0;
} }
static int aw_dev_parse_scene_count_v1(struct aw_device *aw_dev, static int aw_dev_parse_scene_count_v1(struct aw_device *aw_dev,

3
sound/soc/codecs/aw88395/aw88395_reg.h
View File

@ -95,10 +95,7 @@
#define AW88395_TM_REG (0x7C) #define AW88395_TM_REG (0x7C)
enum aw88395_id { enum aw88395_id {
AW88399_CHIP_ID = 0x2183,
AW88395_CHIP_ID = 0x2049, AW88395_CHIP_ID = 0x2049,
AW88261_CHIP_ID = 0x2113,
AW87390_CHIP_ID = 0x76,
}; };
#define AW88395_REG_MAX (0x7D) #define AW88395_REG_MAX (0x7D)

1
sound/soc/codecs/aw88399.c
View File

@ -15,7 +15,6 @@
#include <sound/soc.h> #include <sound/soc.h>
#include "aw88399.h" #include "aw88399.h"
#include "aw88395/aw88395_device.h" #include "aw88395/aw88395_device.h"
#include "aw88395/aw88395_reg.h"
static const struct regmap_config aw88399_remap_config = { static const struct regmap_config aw88399_remap_config = {
.val_bits = 16, .val_bits = 16,

1
sound/soc/codecs/aw88399.h
View File

@ -491,6 +491,7 @@
#define AW88399_CRC_FW_BASE_ADDR (0x4C0) #define AW88399_CRC_FW_BASE_ADDR (0x4C0)
#define AW88399_ACF_FILE "aw88399_acf.bin" #define AW88399_ACF_FILE "aw88399_acf.bin"
#define AW88399_DEV_SYSST_CHECK_MAX (10) #define AW88399_DEV_SYSST_CHECK_MAX (10)
#define AW88399_CHIP_ID 0x2183
#define AW88399_I2C_NAME "aw88399" #define AW88399_I2C_NAME "aw88399"