From: Weidong Wang <wangweidong.a@awinic.com>
Add aw88399 compatible code to the aw88395_lib.c file
so that it can parse aw88399's bin file.
Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
---
sound/soc/codecs/aw88395/aw88395_lib.c | 3 +++
sound/soc/codecs/aw88395/aw88395_reg.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/sound/soc/codecs/aw88395/aw88395_lib.c b/sound/soc/codecs/aw88395/aw88395_lib.c
index 87dd0ccade4c..692ad9fa65a6 100644
--- a/sound/soc/codecs/aw88395/aw88395_lib.c
+++ b/sound/soc/codecs/aw88395/aw88395_lib.c
@@ -702,6 +702,7 @@ static int aw_dev_load_cfg_by_hdr(struct aw_device *aw_dev,
}
switch (aw_dev->chip_id) {
+ case AW88399_CHIP_ID:
case AW88395_CHIP_ID:
ret = aw88395_dev_cfg_get_valid_prof(aw_dev, *all_prof_info);
if (ret < 0)
@@ -791,6 +792,7 @@ static int aw_get_dev_scene_count_v1(struct aw_device *aw_dev, struct aw_contain
switch (aw_dev->chip_id) {
case AW88395_CHIP_ID:
+ case AW88399_CHIP_ID:
for (i = 0; i < cfg_hdr->ddt_num; ++i) {
if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) &&
@@ -832,6 +834,7 @@ static int aw_get_default_scene_count_v1(struct aw_device *aw_dev,
switch (aw_dev->chip_id) {
case AW88395_CHIP_ID:
+ case AW88399_CHIP_ID:
for (i = 0; i < cfg_hdr->ddt_num; ++i) {
if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) &&
(aw_dev->chip_id == cfg_dde[i].chip_id) &&
diff --git a/sound/soc/codecs/aw88395/aw88395_reg.h b/sound/soc/codecs/aw88395/aw88395_reg.h
index e7a7c02efaf3..63d2bac85715 100644
--- a/sound/soc/codecs/aw88395/aw88395_reg.h
+++ b/sound/soc/codecs/aw88395/aw88395_reg.h
@@ -95,6 +95,7 @@
#define AW88395_TM_REG (0x7C)
enum aw88395_id {
+ AW88399_CHIP_ID = 0x2183,
AW88395_CHIP_ID = 0x2049,
AW88261_CHIP_ID = 0x2113,
};
--
2.41.0
Hi Weidong,
On Fri, 13 Oct 2023 18:42:19 +0800
wangweidong.a@awinic.com wrote:
> From: Weidong Wang <wangweidong.a@awinic.com>
>
> Add aw88399 compatible code to the aw88395_lib.c file
> so that it can parse aw88399's bin file.
>
> Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
> ---
> sound/soc/codecs/aw88395/aw88395_lib.c | 3 +++
> sound/soc/codecs/aw88395/aw88395_reg.h | 1 +
> 2 files changed, 4 insertions(+)
>
> diff --git a/sound/soc/codecs/aw88395/aw88395_lib.c b/sound/soc/codecs/aw88395/aw88395_lib.c
> index 87dd0ccade4c..692ad9fa65a6 100644
> --- a/sound/soc/codecs/aw88395/aw88395_lib.c
> +++ b/sound/soc/codecs/aw88395/aw88395_lib.c
> @@ -702,6 +702,7 @@ static int aw_dev_load_cfg_by_hdr(struct aw_device *aw_dev,
> }
>
> switch (aw_dev->chip_id) {
> + case AW88399_CHIP_ID:
Just a nitpick here.
You can use the same 'switch case' order as for the other 'switch cases' below.
I mean
case AW88395_CHIP_ID:
case AW88399_CHIP_ID:
With that done:
Reviewed-by: Herve Codina <herve.codina@bootlin.com>
> case AW88395_CHIP_ID:
> ret = aw88395_dev_cfg_get_valid_prof(aw_dev, *all_prof_info);
> if (ret < 0)
> @@ -791,6 +792,7 @@ static int aw_get_dev_scene_count_v1(struct aw_device *aw_dev, struct aw_contain
>
> switch (aw_dev->chip_id) {
> case AW88395_CHIP_ID:
> + case AW88399_CHIP_ID:
> for (i = 0; i < cfg_hdr->ddt_num; ++i) {
> if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) &&
> (aw_dev->chip_id == cfg_dde[i].chip_id) &&
> @@ -832,6 +834,7 @@ static int aw_get_default_scene_count_v1(struct aw_device *aw_dev,
>
> switch (aw_dev->chip_id) {
> case AW88395_CHIP_ID:
> + case AW88399_CHIP_ID:
> for (i = 0; i < cfg_hdr->ddt_num; ++i) {
> if ((cfg_dde[i].data_type == ACF_SEC_TYPE_MULTIPLE_BIN) &&
> (aw_dev->chip_id == cfg_dde[i].chip_id) &&
[...]
Best regards,
Hervé
© 2016 - 2025 Red Hat, Inc.