diff --git a/asoc/codecs/audio-ext-clk-up.c b/asoc/codecs/audio-ext-clk-up.c index bf77873946..4d6518312b 100644 --- a/asoc/codecs/audio-ext-clk-up.c +++ b/asoc/codecs/audio-ext-clk-up.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #ifdef CONFIG_AUDIO_PRM #include diff --git a/asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.h b/asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.h index 08e3e54ad6..e7457eef7d 100644 --- a/asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.h +++ b/asoc/codecs/lpass-cdc/lpass-cdc-clk-rsc.h @@ -1,13 +1,13 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. */ #ifndef LPASS_CDC_CLK_RSC_H #define LPASS_CDC_CLK_RSC_H #include -#include +#include #if IS_ENABLED(CONFIG_SND_SOC_LPASS_CDC) int lpass_cdc_clk_rsc_mgr_init(void); diff --git a/asoc/codecs/swr-dmic.c b/asoc/codecs/swr-dmic.c index 2fb4ebb4ae..0729e56e3b 100644 --- a/asoc/codecs/swr-dmic.c +++ b/asoc/codecs/swr-dmic.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "wcd938x/wcd938x.h" #include "swr-dmic.h" diff --git a/asoc/codecs/wcd938x/wcd938x.c b/asoc/codecs/wcd938x/wcd938x.c index 19f68c08ff..26bdafbb06 100644 --- a/asoc/codecs/wcd938x/wcd938x.c +++ b/asoc/codecs/wcd938x/wcd938x.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "wcd938x-registers.h" diff --git a/asoc/codecs/wcd938x/wcd938x.h b/asoc/codecs/wcd938x/wcd938x.h index 1cc8c7d859..1f945be99a 100644 --- a/asoc/codecs/wcd938x/wcd938x.h +++ b/asoc/codecs/wcd938x/wcd938x.h @@ -1,12 +1,12 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. + * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ #ifndef _WCD938X_H #define _WCD938X_H -#include +#include #define WCD938X_MAX_SLAVE_CH_TYPES 13 #define ZERO 0 diff --git a/asoc/waipio.c b/asoc/waipio.c index d493585304..3ce84bea01 100644 --- a/asoc/waipio.c +++ b/asoc/waipio.c @@ -33,7 +33,7 @@ #include "codecs/wsa883x/wsa883x.h" #include "codecs/wcd938x/wcd938x.h" #include "codecs/lpass-cdc/lpass-cdc.h" -#include +#include #include "codecs/lpass-cdc/lpass-cdc-wsa-macro.h" #include "waipio-port-config.h" #include "msm-audio-defs.h" diff --git a/include/bindings/audio-codec-port-types.h b/include/bindings/audio-codec-port-types.h new file mode 100644 index 0000000000..4e04ba8a8b --- /dev/null +++ b/include/bindings/audio-codec-port-types.h @@ -0,0 +1,75 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. */ + +#ifndef __AUDIO_CODEC_PORT_TYPES_H +#define __AUDIO_CODEC_PORT_TYPES_H + +#define OFFSET1_VAL0 0 +#define OFFSET1_VAL1 1 +#define OFFSET1_VAL2 2 +#define OFFSET1_VAL3 3 +#define OFFSET1_VAL4 4 +#define OFFSET1_VAL5 5 +#define OFFSET1_VAL6 6 +#define OFFSET1_VAL7 7 +#define OFFSET1_VAL8 8 +#define OFFSET1_VAL9 9 +#define OFFSET1_VAL10 10 +#define OFFSET1_VAL11 11 +#define OFFSET1_VAL12 12 +#define OFFSET1_VAL13 13 +#define OFFSET1_VAL14 14 +#define OFFSET1_VAL15 15 + +#define LANE0 0 +#define LANE1 1 +#define LANE2 2 + +#define SPKR_L 1 +#define SPKR_L_COMP 2 +#define SPKR_L_BOOST 3 +#define SPKR_L_VI 4 +#define SPKR_R 5 +#define SPKR_R_COMP 6 +#define SPKR_R_BOOST 7 +#define SPKR_R_VI 8 +#define HPH_L 9 +#define HPH_R 10 +#define COMP_L 11 +#define COMP_R 12 +#define CLSH 13 +#define LO 14 +#define DSD_L 15 +#define DSD_R 16 +#define MBHC 17 +#define ADC1 18 +#define ADC2 19 +#define ADC3 20 +#define ADC4 21 +#define DMIC0 22 +#define DMIC1 23 +#define DMIC2 24 +#define DMIC3 25 +#define DMIC4 26 +#define DMIC5 27 +#define DMIC6 28 +#define DMIC7 29 +#define DMIC8 30 +#define DMIC9 31 +#define DMIC10 32 +#define PCM_OUT1 33 +#define SWRM_TX1_CH1 34 +#define SWRM_TX1_CH2 35 +#define SWRM_TX1_CH3 36 +#define SWRM_TX1_CH4 37 +#define SWRM_TX2_CH1 38 +#define SWRM_TX2_CH2 39 +#define SWRM_TX2_CH3 40 +#define SWRM_TX2_CH4 41 +#define SWRM_TX3_CH1 42 +#define SWRM_TX3_CH2 43 +#define SWRM_TX3_CH3 44 +#define SWRM_TX3_CH4 45 +#define SWRM_PCM_IN 46 + +#endif /* __AUDIO_CODEC_PORT_TYPES_H */ diff --git a/include/bindings/qcom,audio-ext-clk.h b/include/bindings/qcom,audio-ext-clk.h new file mode 100644 index 0000000000..3fd67fa483 --- /dev/null +++ b/include/bindings/qcom,audio-ext-clk.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2018-2021, The Linux Foundation. All rights reserved. + */ + +#ifndef __AUDIO_EXT_CLK_H +#define __AUDIO_EXT_CLK_H + +/* Audio External Clocks */ +#define AUDIO_PMI_CLK 0 +#define AUDIO_PMIC_LNBB_CLK 1 +#define AUDIO_LPASS_MCLK 2 /* VA CORE CLK */ +#define AUDIO_LPASS_MCLK_2 3 /* WSA1 CORE CLK */ +#define AUDIO_LPASS_MCLK_3 4 /* WSA1 NPL CLK */ +#define AUDIO_LPASS_MCLK_4 5 /* RX CORE CLK */ +#define AUDIO_LPASS_MCLK_5 6 /* RX NPL CLK */ +#define AUDIO_LPASS_MCLK_6 7 /* TX CORE CLK */ +#define AUDIO_LPASS_MCLK_7 8 /* TX NPL CLK */ +#define AUDIO_LPASS_CORE_HW_VOTE 9 +#define AUDIO_LPASS_MCLK_8 10 /* VA NPL CLK */ +#define AUDIO_LPASS_AUDIO_HW_VOTE 11 +#define AUDIO_LPASS_MCLK_9 12 /* WSA2 CORE CLK */ +#define AUDIO_LPASS_MCLK_10 13 /* RX_TX CORE CLK */ +#define AUDIO_LPASS_MCLK_11 14 /* WSA_TX CORE CLK */ +#define AUDIO_LPASS_MCLK_12 15 /* WSA2_TX CORE CLK */ +#define AUDIO_LPASS_MCLK_13 16 /* RX_MCLK2 2X CLK */ + +#endif diff --git a/include/bindings/qcom,gpr.h b/include/bindings/qcom,gpr.h new file mode 100755 index 0000000000..7180e927e5 --- /dev/null +++ b/include/bindings/qcom,gpr.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved. */ +#ifndef __DT_BINDINGS_QCOM_GPR_H +#define __DT_BINDINGS_QCOM_GPR_H + +/* Domain IDs */ +#define GPR_DOMAIN_SIM 0x0 +#define GPR_DOMAIN_MODEM 0x1 +#define GPR_DOMAIN_ADSP 0x2 +#define GPR_DOMAIN_APPS 0x3 +#define GPR_DOMAIN_SDSP 0x4 +#define GPR_DOMAIN_CDSP 0x5 +#define GPR_DOMAIN_MAX 0x6 + +/* ADSP service IDs */ +#define GPR_SVC_ADSP_CORE 0x3 +#define GPR_SVC_AFE 0x4 +#define GPR_SVC_VSM 0x5 +#define GPR_SVC_VPM 0x6 +#define GPR_SVC_ASM 0x7 +#define GPR_SVC_ADM 0x8 +#define GPR_SVC_ADSP_MVM 0x09 +#define GPR_SVC_ADSP_CVS 0x0A +#define GPR_SVC_ADSP_CVP 0x0B +#define GPR_SVC_USM 0x0C +#define GPR_SVC_LSM 0x0D +#define GPR_SVC_VIDC 0x16 +#define GPR_SVC_MAX 0x17 + +#endif /* __DT_BINDINGS_QCOM_GPR_H */ + diff --git a/include/bindings/qcom,lpass-cdc-clk-rsc.h b/include/bindings/qcom,lpass-cdc-clk-rsc.h new file mode 100644 index 0000000000..260c26ec61 --- /dev/null +++ b/include/bindings/qcom,lpass-cdc-clk-rsc.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. + */ + +#ifndef __LPASS_CDC_CLK_RSC_H +#define __LPASS_CDC_CLK_RSC_H + +/* LPASS codec clock types */ +#define TX_CORE_CLK 0 +#define RX_CORE_CLK 1 +#define WSA_CORE_CLK 2 +#define VA_CORE_CLK 3 +#define WSA2_CORE_CLK 4 +#define RX_TX_CORE_CLK 5 +#define WSA_TX_CORE_CLK 6 +#define WSA2_TX_CORE_CLK 7 +#define MAX_CLK 8 + +#endif /* __LPASS_CDC_CLK_RSC_H */ diff --git a/include/ipc/gpr-lite.h b/include/ipc/gpr-lite.h index 16f9f5cb5b..a91720476a 100644 --- a/include/ipc/gpr-lite.h +++ b/include/ipc/gpr-lite.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2011-2017, 2019-2020 The Linux Foundation. All rights reserved. +/* Copyright (c) 2011-2017, 2019-2021 The Linux Foundation. All rights reserved. * Copyright (c) 2018, Linaro Limited * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ #include #include #include "soc/audio_mod_devicetable.h" -#include +#include extern struct bus_type gprbus;