audio-kernel: devon audio bring up
changes: 1. add aw88261 config 2. cause hw i2c address conflict, disable receiver smartpa. Change-Id: I242f0edb9ea1db9d0620126d332f5f01cf3837dd Reviewed-on: https://gerrit.mot.com/2205301 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Submit-Approved: Jira Key Tested-by: Jira Key Reviewed-by: <longc103@motorola.com> SLTApproved: <longc103@motorola.com> Submit-Approved: <longc103@motorola.com> Tested-by: <longc103@motorola.com> Reviewed-by: Yunfei Guo <guoyf2@motorola.com> (cherry picked from commit 244d714b75be72eaff960780de0b3f0643f62ce8) Reviewed-on: https://gerrit.mot.com/2206429 Reviewed-by: Hujun Liao <liaohj@motorola.com>
This commit is contained in:
1 parent
93396078c5
commit
4da94a78da
6 files changed
+28
-2
No files matched your search
@@ -104,6 +104,9 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||||||
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(filter devon%, $(TARGET_PRODUCT)))
|
||||||
|
INCS += -include $(AUDIO_ROOT)/config/devonautoconf.h
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# As per target team, build is done as follows:
|
# As per target team, build is done as follows:
|
||||||
|
|||||||
@@ -5445,6 +5445,13 @@ static struct snd_soc_dai_link_component awinic_codecs[] = {
|
|||||||
.dai_name = "aw882xx-aif-1-35",
|
.dai_name = "aw882xx-aif-1-35",
|
||||||
.name = "aw882xxacf_smartpa.1-0035",
|
.name = "aw882xxacf_smartpa.1-0035",
|
||||||
},
|
},
|
||||||
|
#elif CONFIG_DEVON_AW882XX_SMARTPA
|
||||||
|
/* {
|
||||||
|
.of_node = NULL,
|
||||||
|
.dai_name = "aw882xx-aif-1-36",
|
||||||
|
.name = "aw882xxacf_smartpa.1-0036",
|
||||||
|
},
|
||||||
|
*/
|
||||||
#else
|
#else
|
||||||
{
|
{
|
||||||
.of_node = NULL,
|
.of_node = NULL,
|
||||||
|
|||||||
+5
-1
@@ -97,6 +97,10 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||||||
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
||||||
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(filter devon%, $(TARGET_PRODUCT)))
|
||||||
|
INCS += -include $(AUDIO_ROOT)/config/devonautoconf.h
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# As per target team, build is done as follows:
|
# As per target team, build is done as follows:
|
||||||
@@ -295,7 +299,7 @@ hdmi_dlkm-y := $(HDMICODEC_OBJS)
|
|||||||
|
|
||||||
#Add awinic driver begain
|
#Add awinic driver begain
|
||||||
ifdef CONFIG_SND_SMARTPA_AW882XX
|
ifdef CONFIG_SND_SMARTPA_AW882XX
|
||||||
ifneq (,$(filter rhode% hawao%, $(TARGET_PRODUCT)))
|
ifneq (,$(filter rhode% hawao% devon%, $(TARGET_PRODUCT)))
|
||||||
SND_SOC_AW882XX_OBJS += aw88261/aw882xx.o
|
SND_SOC_AW882XX_OBJS += aw88261/aw882xx.o
|
||||||
SND_SOC_AW882XX_OBJS += aw88261/aw_init.o
|
SND_SOC_AW882XX_OBJS += aw88261/aw_init.o
|
||||||
SND_SOC_AW882XX_OBJS += aw88261/aw_bin_parse.o
|
SND_SOC_AW882XX_OBJS += aw88261/aw_bin_parse.o
|
||||||
|
|||||||
@@ -42,7 +42,9 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||||||
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
||||||
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
||||||
endif
|
endif
|
||||||
|
ifneq (,$(filter devon%, $(TARGET_PRODUCT)))
|
||||||
|
INCS += -include $(AUDIO_ROOT)/config/devonautoconf.h
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# As per target team, build is done as follows:
|
# As per target team, build is done as follows:
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||||
|
/* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
|
||||||
|
*/
|
||||||
|
#define CONFIG_AW882XX_STEREO_SMARTPA 1
|
||||||
|
#define CONFIG_AW882XX_PARAMS_STORED_IN_BIN 1
|
||||||
|
#define CONFIG_DEVON_AW882XX_SMARTPA 1
|
||||||
@@ -103,6 +103,10 @@ ifeq ($(KERNEL_BUILD), 0)
|
|||||||
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
ifneq (,$(filter hawao%, $(TARGET_PRODUCT)))
|
||||||
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
INCS += -include $(AUDIO_ROOT)/config/hawaoautoconf.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq (,$(filter devon%, $(TARGET_PRODUCT)))
|
||||||
|
INCS += -include $(AUDIO_ROOT)/config/devonautoconf.h
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user