asoc: move some kernel headers to vendor SI

Move some audio kernel headers to vendor SI.

Change-Id: I41df0cdb2789359e1fded84ec0bf6c30eaa4a25f
Signed-off-by: Meng Wang <[email protected]>

asoc/codecs/audio-ext-clk-up.c

@@ -14,7 +14,7 @@
 #include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <dsp/apr_audio-v2.h>
-#include <dt-bindings/clock/qcom,audio-ext-clk.h>
+#include <bindings/qcom,audio-ext-clk.h>
 #include <linux/ratelimit.h>
 #ifdef CONFIG_AUDIO_PRM
 #include <dsp/audio_prm.h>

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 <linux/regmap.h>
-#include <dt-bindings/sound/qcom,lpass-cdc-clk-rsc.h>
+#include <bindings/qcom,lpass-cdc-clk-rsc.h>
 
 #if IS_ENABLED(CONFIG_SND_SOC_LPASS_CDC)
 int lpass_cdc_clk_rsc_mgr_init(void);

asoc/codecs/swr-dmic.c

@@ -26,7 +26,7 @@
 #include <sound/tlv.h>
 #include <asoc/msm-cdc-pinctrl.h>
 #include <asoc/msm-cdc-supply.h>
-#include <dt-bindings/sound/audio-codec-port-types.h>
+#include <bindings/audio-codec-port-types.h>
 #include "wcd938x/wcd938x.h"
 #include "swr-dmic.h"
 

asoc/codecs/wcd938x/wcd938x.c

@@ -19,7 +19,7 @@
 #include <asoc/wcdcal-hwdep.h>
 #include <asoc/msm-cdc-pinctrl.h>
 #include <asoc/msm-cdc-supply.h>
-#include <dt-bindings/sound/audio-codec-port-types.h>
+#include <bindings/audio-codec-port-types.h>
 #include <linux/qti-regmap-debugfs.h>
 
 #include "wcd938x-registers.h"

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 <dt-bindings/sound/audio-codec-port-types.h>
+#include <bindings/audio-codec-port-types.h>
 
 #define WCD938X_MAX_SLAVE_CH_TYPES 13
 #define ZERO 0

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 <dt-bindings/sound/audio-codec-port-types.h>
+#include <bindings/audio-codec-port-types.h>
 #include "codecs/lpass-cdc/lpass-cdc-wsa-macro.h"
 #include "waipio-port-config.h"
 #include "msm-audio-defs.h"

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 */

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

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 */
+

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 */

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 <linux/spinlock.h>
 #include <linux/device.h>
 #include "soc/audio_mod_devicetable.h"
-#include <dt-bindings/sound/qcom,gpr.h>
+#include <bindings/qcom,gpr.h>
 
 extern struct bus_type gprbus;