From d71ec81bb01611b3f8e4d9cda8dbc3a1ca259c00 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Fri, 6 Dec 2019 17:46:51 -0800 Subject: [PATCH] audio: update kernel version reference Update kernel version references from 4.19 to 5.4. Update symbolic links to new kernel version files. Change-Id: I38baa52218b16e0b0c86ad898912d29ec4d3d516 Signed-off-by: Vignesh Kulothungan --- asoc/Kbuild | 4 ++-- asoc/codecs/Kbuild | 4 ++-- asoc/codecs/aqt1000/Kbuild | 4 ++-- asoc/codecs/bolero/Kbuild | 4 ++-- asoc/codecs/csra66x0/Kbuild | 4 ++-- asoc/codecs/ep92/Kbuild | 4 ++-- asoc/codecs/wcd934x/Kbuild | 4 ++-- asoc/codecs/wcd937x/Kbuild | 4 ++-- asoc/codecs/wcd938x/Kbuild | 4 ++-- asoc/codecs/wsa883x/Kbuild | 4 ++-- dsp/Kbuild | 4 ++-- include/soc/internal.h | 2 +- ipc/Kbuild | 4 ++-- soc/Kbuild | 4 ++-- soc/core.h | 2 +- soc/pinctrl-utils.h | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/asoc/Kbuild b/asoc/Kbuild index 137fd60f88..97bd605589 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -95,7 +95,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 1ce059ec70..0a1982a76d 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -89,7 +89,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild index d83955f0ad..f5f18785e9 100644 --- a/asoc/codecs/aqt1000/Kbuild +++ b/asoc/codecs/aqt1000/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -53,7 +53,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/bolero/Kbuild b/asoc/codecs/bolero/Kbuild index 15e5dc576d..a6a11c1a0e 100644 --- a/asoc/codecs/bolero/Kbuild +++ b/asoc/codecs/bolero/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -64,7 +64,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/csra66x0/Kbuild b/asoc/codecs/csra66x0/Kbuild index ef599622dd..61463e7a0f 100644 --- a/asoc/codecs/csra66x0/Kbuild +++ b/asoc/codecs/csra66x0/Kbuild @@ -10,7 +10,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -39,7 +39,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/ep92/Kbuild b/asoc/codecs/ep92/Kbuild index fc46a72f77..410d7fafed 100644 --- a/asoc/codecs/ep92/Kbuild +++ b/asoc/codecs/ep92/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -40,7 +40,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild index 63a75a770c..989e905d2b 100644 --- a/asoc/codecs/wcd934x/Kbuild +++ b/asoc/codecs/wcd934x/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -55,7 +55,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/wcd937x/Kbuild b/asoc/codecs/wcd937x/Kbuild index e353e8a37d..0f3b01388a 100644 --- a/asoc/codecs/wcd937x/Kbuild +++ b/asoc/codecs/wcd937x/Kbuild @@ -11,7 +11,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -50,7 +50,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index 3dfe142bcf..873a7b29d4 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/asoc/codecs/wcd938x/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -43,7 +43,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/asoc/codecs/wsa883x/Kbuild b/asoc/codecs/wsa883x/Kbuild index 4eb844af51..6db0f9179e 100644 --- a/asoc/codecs/wsa883x/Kbuild +++ b/asoc/codecs/wsa883x/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -37,7 +37,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/dsp/Kbuild b/dsp/Kbuild index 006de44589..cd75541891 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -97,7 +97,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio/ UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/include/soc/internal.h b/include/soc/internal.h index 3180181282..4b7332cb97 120000 --- a/include/soc/internal.h +++ b/include/soc/internal.h @@ -1 +1 @@ -../../../../../../kernel/msm-4.19/drivers/base/regmap/internal.h \ No newline at end of file +../../../../../../kernel/msm-5.4/drivers/base/regmap/internal.h \ No newline at end of file diff --git a/ipc/Kbuild b/ipc/Kbuild index bbea67396e..00a71683d5 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -8,7 +8,7 @@ endif # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds -KDIR := $(TOP)/kernel/msm-4.19 +KDIR := $(TOP)/kernel/msm-5.4 ifeq ($(KERNEL_BUILD), 1) AUDIO_ROOT := $(KDIR)/techpack/audio @@ -96,7 +96,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/soc/Kbuild b/soc/Kbuild index 9e32c429fa..10f761ed65 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -9,7 +9,7 @@ endif ifeq ($(KERNEL_BUILD), 1) # These are configurable via Kconfig for kernel-based builds # Need to explicitly configure for Android-based builds - AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 + AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4 AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio endif @@ -95,7 +95,7 @@ endif # config. ############ UAPI ############ -UAPI_DIR := uapi +UAPI_DIR := uapi/audio UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) ############ COMMON ############ diff --git a/soc/core.h b/soc/core.h index 62a868d5c8..fcefe83a15 120000 --- a/soc/core.h +++ b/soc/core.h @@ -1 +1 @@ -../../../../../kernel/msm-4.19/drivers/pinctrl/core.h \ No newline at end of file +../../../../../kernel/msm-5.4/drivers/pinctrl/core.h \ No newline at end of file diff --git a/soc/pinctrl-utils.h b/soc/pinctrl-utils.h index 8799471489..6135de470b 120000 --- a/soc/pinctrl-utils.h +++ b/soc/pinctrl-utils.h @@ -1 +1 @@ -../../../../../kernel/msm-4.19/drivers/pinctrl/pinctrl-utils.h \ No newline at end of file +../../../../../kernel/msm-5.4/drivers/pinctrl/pinctrl-utils.h \ No newline at end of file