Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

display-drivers: Add support for gts9wifi display panel #2

Open
wants to merge 2 commits into
base: lineage-21
Choose a base branch
from
Open

display-drivers: Add support for gts9wifi display panel #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5dda995
display-drivers: Add support for gts9wifi display panel
488315 Sep 13, 2024
2a6b347
kalama: audio: import from ` X710XXU4BXHB`
488315 Sep 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions qcom/opensource/audio-kernel/Android.bp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,25 @@ headers_src = [
]

audio_headers_out = [
"linux/avtimer.h",
"linux/msm_audio.h",
"linux/msm_audio_aac.h",
"linux/msm_audio_ac3.h",
"linux/msm_audio_alac.h",
"linux/msm_audio_amrnb.h",
"linux/msm_audio_amrwb.h",
"linux/msm_audio_amrwbplus.h",
"linux/msm_audio_ape.h",
"linux/msm_audio_calibration.h",
"linux/msm_audio_g711.h",
"linux/msm_audio_g711_dec.h",
"linux/msm_audio_mvs.h",
"linux/msm_audio_qcp.h",
"linux/msm_audio_sbc.h",
"linux/msm_audio_voicememo.h",
"linux/msm_audio_wma.h",
"linux/msm_audio_wmapro.h",
"linux/wcd-spi-ac-params.h",
"sound/audio_compressed_formats.h",
"sound/audio_effects.h",
"sound/audio_slimslave.h",
Expand Down
42 changes: 0 additions & 42 deletions qcom/opensource/audio-kernel/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ ifeq ($(call is-board-platform, bengal),true)
AUDIO_SELECT := CONFIG_SND_SOC_BENGAL=m
endif

ifeq ($(call is-board-platform, crow),true)
AUDIO_SELECT := CONFIG_SND_SOC_CROW=m
endif

ifeq ($(ENABLE_AUDIO_LEGACY_TECHPACK),true)
include $(call all-subdir-makefiles)
endif
Expand Down Expand Up @@ -341,44 +337,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk

########################### WCD937x CODEC ################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := wcd937x_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd937x/wcd937x_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk
###########################################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := wcd937x_slave_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd937x/wcd937x_slave_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk

########################### WCD939x CODEC ################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := wcd939x_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd939x/wcd939x_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk
###########################################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
LOCAL_MODULE := wcd939x_slave_dlkm.ko
LOCAL_MODULE_KBUILD_NAME := asoc/codecs/wcd939x/wcd939x_slave_dlkm.ko
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_DEBUG_ENABLE := true
LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
include $(DLKM_DIR)/Build_external_kernelmodule.mk
###########################################################
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(AUDIO_SRC_FILES)
Expand Down
2 changes: 1 addition & 1 deletion qcom/opensource/audio-kernel/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/bolero/ asoc/codecs/wsa884x/ asoc/codecs/wcd938x/ asoc/codecs/wsa883x/ asoc/codecs/wcd937x/ asoc/codecs/wcd939x/
obj-y := dsp/ ipc/ soc/ asoc/ asoc/codecs/ asoc/codecs/lpass-cdc/ asoc/codecs/bolero/ asoc/codecs/wsa884x/ asoc/codecs/wcd938x/ asoc/codecs/wsa883x/ asoc/codecs/wcd937x/
14 changes: 7 additions & 7 deletions qcom/opensource/audio-kernel/asoc/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ ifeq ($(KERNEL_BUILD), 0)
include $(AUDIO_ROOT)/config/waipioauto.conf
INCS += -include $(AUDIO_ROOT)/config/waipioautoconf.h
endif
ifeq ($(BOARD_PLATFORM), kalama)
ifeq ($(CONFIG_ARCH_KALAMA), y)
include $(AUDIO_ROOT)/config/kalamaauto.conf
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(BOARD_PLATFORM), crow)
include $(AUDIO_ROOT)/config/crowauto.conf
INCS += -include $(AUDIO_ROOT)/config/crowautoconf.h
ifeq ($(CONFIG_ARCH_CROW), y)
include $(AUDIO_ROOT)/config/kalamaauto.conf
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(CONFIG_ARCH_LITO), y)
include $(AUDIO_ROOT)/config/litoauto.conf
Expand Down Expand Up @@ -273,9 +273,6 @@ machine_dlkm-y := $(MACHINE_OBJS)
obj-$(CONFIG_SND_SOC_KALAMA) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)

obj-$(CONFIG_SND_SOC_CROW) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)

obj-$(CONFIG_SND_SOC_HOLI) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)

Expand All @@ -290,3 +287,6 @@ machine_dlkm-y := $(MACHINE_OBJS)

obj-$(CONFIG_SND_SOC_SDX) += machine_dlkm.o
machine_dlkm-y := $(MACHINE_OBJS)

# inject some build related information
DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
8 changes: 5 additions & 3 deletions qcom/opensource/audio-kernel/asoc/codecs/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(CONFIG_ARCH_CROW), y)
include $(AUDIO_ROOT)/config/crowauto.conf
INCS += -include $(AUDIO_ROOT)/config/crowautoconf.h
include $(AUDIO_ROOT)/config/kalamaauto.conf
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(CONFIG_ARCH_LITO), y)
include $(AUDIO_ROOT)/config/litoauto.conf
Expand Down Expand Up @@ -268,7 +268,6 @@ ifeq ($(KERNEL_BUILD), 1)
obj-y += wcd934x/
obj-y += wcd937x/
obj-y += wcd938x/
obj-y += wcd939x/
obj-y += bolero/
obj-y += lpass-cdc/
obj-y += wsa884x/
Expand Down Expand Up @@ -322,3 +321,6 @@ hdmi_dlkm-y := $(HDMICODEC_OBJS)

obj-$(CONFIG_SND_SWR_HAPTICS) += swr_haptics_dlkm.o
swr_haptics_dlkm-y := $(SWR_HAP_OBJS)

# inject some build related information
DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"
4 changes: 2 additions & 2 deletions qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/Kbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ ifeq ($(KERNEL_BUILD), 0)
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(CONFIG_ARCH_CROW), y)
include $(AUDIO_ROOT)/config/crowauto.conf
INCS += -include $(AUDIO_ROOT)/config/crowautoconf.h
include $(AUDIO_ROOT)/config/kalamaauto.conf
INCS += -include $(AUDIO_ROOT)/config/kalamaautoconf.h
endif
ifeq ($(CONFIG_ARCH_LITO), y)
include $(AUDIO_ROOT)/config/litoauto.conf
Expand Down
1 change: 0 additions & 1 deletion qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ struct lpass_cdc_priv {
struct clk *lpass_audio_hw_vote;
int core_hw_vote_count;
int core_audio_vote_count;
int core_clk_vote_count;

/* Entry for version info */
struct snd_info_entry *entry;
Expand Down
20 changes: 5 additions & 15 deletions qcom/opensource/audio-kernel/asoc/codecs/lpass-cdc/lpass-cdc-tx-macro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*/

#include <linux/module.h>
Expand Down Expand Up @@ -724,21 +724,11 @@ static int lpass_cdc_tx_macro_tx_mixer_put(struct snd_kcontrol *kcontrol,
return -EINVAL;

if (enable) {
if (test_bit(dec_id, &tx_priv->active_ch_mask[dai_id])) {
dev_err(component->dev, "%s: channel is already enabled, dec_id = %d, dai_id = %d\n",
__func__, dec_id, dai_id);
} else {
set_bit(dec_id, &tx_priv->active_ch_mask[dai_id]);
tx_priv->active_ch_cnt[dai_id]++;
}
set_bit(dec_id, &tx_priv->active_ch_mask[dai_id]);
tx_priv->active_ch_cnt[dai_id]++;
} else {
if (!test_bit(dec_id, &tx_priv->active_ch_mask[dai_id])) {
dev_err(component->dev, "%s: channel is already disabled, dec_id = %d, dai_id = %d\n",
__func__, dec_id, dai_id);
} else {
tx_priv->active_ch_cnt[dai_id]--;
clear_bit(dec_id, &tx_priv->active_ch_mask[dai_id]);
}
tx_priv->active_ch_cnt[dai_id]--;
clear_bit(dec_id, &tx_priv->active_ch_mask[dai_id]);
}
snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol, enable, update);

Expand Down
Loading