Merge tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "We've got many code additions at this cycle as a result of quite a few new drivers. Below are highlights: Core stuff: - Fix the long-standing issue with the device registration order; the control device is now registered at last - PCM locking code cleanups for RT kernels - Fixes for possible races in ALSA timer resolution accesses - TLV offset definitions in uapi ASoC: - Many fixes for the topology stuff, including fixes for v4 ABI compatibility - Lots of cleanups / quirks for Intel platforms based on Realtek CODECs - Continued componentization works, removing legacy CODEC stuff - Conversion of OMAP DMA to the new, more standard SDMA-PCM driver - Fixes and updates to Cirrus Logic SoC drivers - New Qualcomm DSP support - New drivers for Analog SSM2305, Atmel I2S controllers, Mediatek MT6351, MT6797 and MT7622, Qualcomm DSPs, Realtek RT1305, RT1306 and RT5668 and TI TSCS454 HD-audio: - Finally better support for some CA0132 boards, allowing Windows firmware - HP Spectre x360 support along with a bulk of COEF stuff - Blacklisting power save default some known boards reported on Fedora USB-audio: - Continued improvements on UAC3 support; now BADD is supported - Fixes / improvements for Dell WD15 dock - Allow DMA coherent pages for PCM buffers for ARCH, MIPS & co Others: - New Xen sound frontend driver support - Cache implementation and other improvements for FireWire DICE - Conversions to octal permissions in allover places" * tag 'sound-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (386 commits) ASoC: dapm: delete dapm_kcontrol_data paths list before freeing it ALSA: usb-audio: remove redundant check on err ASoC: topology: Move skl-tplg-interface.h to uapi ASoC: topology: Move v4 manifest header data structures to uapi ASoC: topology: Improve backwards compatibility with v4 topology files ALSA: pci/hda: Remove unused, broken, header file ASoC: TSCS454: Add Support ASoC: Intel: kbl: Move codec sysclk config to codec_init function ASoC: simple-card: set cpu dai clk in hw_params ALSA: hda - Handle kzalloc() failure in snd_hda_attach_pcm_stream() ALSA: oxygen: use match_string() helper ASoC: dapm: use match_string() helper ASoC: max98095: use match_string() helper ASoC: max98088: use match_string() helper ASoC: Intel: bytcr_rt5651: Set card long_name based on quirks ASoC: mt6797-mt6351: add hostless phone call path ASoC: mt6797: add Hostless DAI ASoC: mt6797: add PCM interface ASoC: mediatek: export mtk-afe symbols as needed ASoC: codecs: PCM1789: include gpio/consumer.h ...
This commit is contained in:
28
include/dt-bindings/soc/qcom,apr.h
Normal file
28
include/dt-bindings/soc/qcom,apr.h
Normal file
@@ -0,0 +1,28 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_BINDINGS_QCOM_APR_H
|
||||
#define __DT_BINDINGS_QCOM_APR_H
|
||||
|
||||
/* Domain IDs */
|
||||
#define APR_DOMAIN_SIM 0x1
|
||||
#define APR_DOMAIN_PC 0x2
|
||||
#define APR_DOMAIN_MODEM 0x3
|
||||
#define APR_DOMAIN_ADSP 0x4
|
||||
#define APR_DOMAIN_APPS 0x5
|
||||
#define APR_DOMAIN_MAX 0x6
|
||||
|
||||
/* ADSP service IDs */
|
||||
#define APR_SVC_ADSP_CORE 0x3
|
||||
#define APR_SVC_AFE 0x4
|
||||
#define APR_SVC_VSM 0x5
|
||||
#define APR_SVC_VPM 0x6
|
||||
#define APR_SVC_ASM 0x7
|
||||
#define APR_SVC_ADM 0x8
|
||||
#define APR_SVC_ADSP_MVM 0x09
|
||||
#define APR_SVC_ADSP_CVS 0x0A
|
||||
#define APR_SVC_ADSP_CVP 0x0B
|
||||
#define APR_SVC_USM 0x0C
|
||||
#define APR_SVC_LSM 0x0D
|
||||
#define APR_SVC_VIDC 0x16
|
||||
#define APR_SVC_MAX 0x17
|
||||
|
||||
#endif /* __DT_BINDINGS_QCOM_APR_H */
|
@@ -25,6 +25,13 @@
|
||||
#define MX51_AUDMUX_PORT6 5
|
||||
#define MX51_AUDMUX_PORT7 6
|
||||
|
||||
/*
|
||||
* TFCSEL/RFCSEL (i.MX27) or TFSEL/TCSEL/RFSEL/RCSEL (i.MX31/51/53/6Q)
|
||||
* can be sourced from Rx/Tx.
|
||||
*/
|
||||
#define IMX_AUDMUX_RXFS 0x8
|
||||
#define IMX_AUDMUX_RXCLK 0x8
|
||||
|
||||
/* Register definitions for the i.MX21/27 Digital Audio Multiplexer */
|
||||
#define IMX_AUDMUX_V1_PCR_INMMASK(x) ((x) & 0xff)
|
||||
#define IMX_AUDMUX_V1_PCR_INMEN (1 << 8)
|
||||
|
111
include/dt-bindings/sound/qcom,q6afe.h
Normal file
111
include/dt-bindings/sound/qcom,q6afe.h
Normal file
@@ -0,0 +1,111 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_BINDINGS_Q6_AFE_H__
|
||||
#define __DT_BINDINGS_Q6_AFE_H__
|
||||
|
||||
/* Audio Front End (AFE) virtual ports IDs */
|
||||
#define HDMI_RX 1
|
||||
#define SLIMBUS_0_RX 2
|
||||
#define SLIMBUS_0_TX 3
|
||||
#define SLIMBUS_1_RX 4
|
||||
#define SLIMBUS_1_TX 5
|
||||
#define SLIMBUS_2_RX 6
|
||||
#define SLIMBUS_2_TX 7
|
||||
#define SLIMBUS_3_RX 8
|
||||
#define SLIMBUS_3_TX 9
|
||||
#define SLIMBUS_4_RX 10
|
||||
#define SLIMBUS_4_TX 11
|
||||
#define SLIMBUS_5_RX 12
|
||||
#define SLIMBUS_5_TX 13
|
||||
#define SLIMBUS_6_RX 14
|
||||
#define SLIMBUS_6_TX 15
|
||||
#define PRIMARY_MI2S_RX 16
|
||||
#define PRIMARY_MI2S_TX 17
|
||||
#define SECONDARY_MI2S_RX 18
|
||||
#define SECONDARY_MI2S_TX 19
|
||||
#define TERTIARY_MI2S_RX 20
|
||||
#define TERTIARY_MI2S_TX 21
|
||||
#define QUATERNARY_MI2S_RX 22
|
||||
#define QUATERNARY_MI2S_TX 23
|
||||
#define PRIMARY_TDM_RX_0 24
|
||||
#define PRIMARY_TDM_TX_0 25
|
||||
#define PRIMARY_TDM_RX_1 26
|
||||
#define PRIMARY_TDM_TX_1 27
|
||||
#define PRIMARY_TDM_RX_2 28
|
||||
#define PRIMARY_TDM_TX_2 29
|
||||
#define PRIMARY_TDM_RX_3 30
|
||||
#define PRIMARY_TDM_TX_3 31
|
||||
#define PRIMARY_TDM_RX_4 32
|
||||
#define PRIMARY_TDM_TX_4 33
|
||||
#define PRIMARY_TDM_RX_5 34
|
||||
#define PRIMARY_TDM_TX_5 35
|
||||
#define PRIMARY_TDM_RX_6 36
|
||||
#define PRIMARY_TDM_TX_6 37
|
||||
#define PRIMARY_TDM_RX_7 38
|
||||
#define PRIMARY_TDM_TX_7 39
|
||||
#define SECONDARY_TDM_RX_0 40
|
||||
#define SECONDARY_TDM_TX_0 41
|
||||
#define SECONDARY_TDM_RX_1 42
|
||||
#define SECONDARY_TDM_TX_1 43
|
||||
#define SECONDARY_TDM_RX_2 44
|
||||
#define SECONDARY_TDM_TX_2 45
|
||||
#define SECONDARY_TDM_RX_3 46
|
||||
#define SECONDARY_TDM_TX_3 47
|
||||
#define SECONDARY_TDM_RX_4 48
|
||||
#define SECONDARY_TDM_TX_4 49
|
||||
#define SECONDARY_TDM_RX_5 50
|
||||
#define SECONDARY_TDM_TX_5 51
|
||||
#define SECONDARY_TDM_RX_6 52
|
||||
#define SECONDARY_TDM_TX_6 53
|
||||
#define SECONDARY_TDM_RX_7 54
|
||||
#define SECONDARY_TDM_TX_7 55
|
||||
#define TERTIARY_TDM_RX_0 56
|
||||
#define TERTIARY_TDM_TX_0 57
|
||||
#define TERTIARY_TDM_RX_1 58
|
||||
#define TERTIARY_TDM_TX_1 59
|
||||
#define TERTIARY_TDM_RX_2 60
|
||||
#define TERTIARY_TDM_TX_2 61
|
||||
#define TERTIARY_TDM_RX_3 62
|
||||
#define TERTIARY_TDM_TX_3 63
|
||||
#define TERTIARY_TDM_RX_4 64
|
||||
#define TERTIARY_TDM_TX_4 65
|
||||
#define TERTIARY_TDM_RX_5 66
|
||||
#define TERTIARY_TDM_TX_5 67
|
||||
#define TERTIARY_TDM_RX_6 68
|
||||
#define TERTIARY_TDM_TX_6 69
|
||||
#define TERTIARY_TDM_RX_7 70
|
||||
#define TERTIARY_TDM_TX_7 71
|
||||
#define QUATERNARY_TDM_RX_0 72
|
||||
#define QUATERNARY_TDM_TX_0 73
|
||||
#define QUATERNARY_TDM_RX_1 74
|
||||
#define QUATERNARY_TDM_TX_1 75
|
||||
#define QUATERNARY_TDM_RX_2 76
|
||||
#define QUATERNARY_TDM_TX_2 77
|
||||
#define QUATERNARY_TDM_RX_3 78
|
||||
#define QUATERNARY_TDM_TX_3 79
|
||||
#define QUATERNARY_TDM_RX_4 80
|
||||
#define QUATERNARY_TDM_TX_4 81
|
||||
#define QUATERNARY_TDM_RX_5 82
|
||||
#define QUATERNARY_TDM_TX_5 83
|
||||
#define QUATERNARY_TDM_RX_6 84
|
||||
#define QUATERNARY_TDM_TX_6 85
|
||||
#define QUATERNARY_TDM_RX_7 86
|
||||
#define QUATERNARY_TDM_TX_7 87
|
||||
#define QUINARY_TDM_RX_0 88
|
||||
#define QUINARY_TDM_TX_0 89
|
||||
#define QUINARY_TDM_RX_1 90
|
||||
#define QUINARY_TDM_TX_1 91
|
||||
#define QUINARY_TDM_RX_2 92
|
||||
#define QUINARY_TDM_TX_2 93
|
||||
#define QUINARY_TDM_RX_3 94
|
||||
#define QUINARY_TDM_TX_3 95
|
||||
#define QUINARY_TDM_RX_4 96
|
||||
#define QUINARY_TDM_TX_4 97
|
||||
#define QUINARY_TDM_RX_5 98
|
||||
#define QUINARY_TDM_TX_5 99
|
||||
#define QUINARY_TDM_RX_6 100
|
||||
#define QUINARY_TDM_TX_6 101
|
||||
#define QUINARY_TDM_RX_7 102
|
||||
#define QUINARY_TDM_TX_7 103
|
||||
|
||||
#endif /* __DT_BINDINGS_Q6_AFE_H__ */
|
||||
|
22
include/dt-bindings/sound/qcom,q6asm.h
Normal file
22
include/dt-bindings/sound/qcom,q6asm.h
Normal file
@@ -0,0 +1,22 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_BINDINGS_Q6_ASM_H__
|
||||
#define __DT_BINDINGS_Q6_ASM_H__
|
||||
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA1 0
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA2 1
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA3 2
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA4 3
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA5 4
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA6 5
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA7 6
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA8 7
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA9 8
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA10 9
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA11 10
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA12 11
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA13 12
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA14 13
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA15 14
|
||||
#define MSM_FRONTEND_DAI_MULTIMEDIA16 15
|
||||
|
||||
#endif /* __DT_BINDINGS_Q6_ASM_H__ */
|
25
include/dt-bindings/sound/rt5640.h
Normal file
25
include/dt-bindings/sound/rt5640.h
Normal file
@@ -0,0 +1,25 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_RT5640_H
|
||||
#define __DT_RT5640_H
|
||||
|
||||
#define RT5640_DMIC1_DATA_PIN_NONE 0
|
||||
#define RT5640_DMIC1_DATA_PIN_IN1P 1
|
||||
#define RT5640_DMIC1_DATA_PIN_GPIO3 2
|
||||
|
||||
#define RT5640_DMIC2_DATA_PIN_NONE 0
|
||||
#define RT5640_DMIC2_DATA_PIN_IN1N 1
|
||||
#define RT5640_DMIC2_DATA_PIN_GPIO4 2
|
||||
|
||||
#define RT5640_JD_SRC_GPIO1 1
|
||||
#define RT5640_JD_SRC_JD1_IN4P 2
|
||||
#define RT5640_JD_SRC_JD2_IN4N 3
|
||||
#define RT5640_JD_SRC_GPIO2 4
|
||||
#define RT5640_JD_SRC_GPIO3 5
|
||||
#define RT5640_JD_SRC_GPIO4 6
|
||||
|
||||
#define RT5640_OVCD_SF_0P5 0
|
||||
#define RT5640_OVCD_SF_0P75 1
|
||||
#define RT5640_OVCD_SF_1P0 2
|
||||
#define RT5640_OVCD_SF_1P5 3
|
||||
|
||||
#endif /* __DT_RT5640_H */
|
Reference in New Issue
Block a user