ASoC: Intel: Remove obsolete UAPI headers
PATCH 1/1 ASoC: Intel: Remove obsolete UAPI headers
Both target Intel's skylake-driver, previously found in sound/soc/intel which has been removed few years ago and succeeded by the avs-driver.
snd_sst_tokens.h is succeeded by uapi/sound/intel/avs/tokens.h skl-tplg-interface.h to the best of my knowledge has no users. Its types are reflected in sound/soc/intel/avs/messages.h and are not intended for public use. Closest public equivalent would be the firmware's processing modules but in such case a user has to compile against Intel's AudioDSP headers, not Linux ones.
--- include/uapi/sound/skl-tplg-interface.h | 168 ------------ include/uapi/sound/snd_sst_tokens.h | 324 ------------------------ 2 files changed, 492 deletions(-) delete mode 100644 include/uapi/sound/skl-tplg-interface.h delete mode 100644 include/uapi/sound/snd_sst_tokens.h
include/uapi/sound/skl-tplg-interface.h deleted +0 -168
@@ -1,168 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -/* -* skl-tplg-interface.h - Intel DSP FW private data interface -* -* Copyright (C) 2015 Intel Corp -* Author: Jeeja KP <[email protected]> -* Nilofer, Samreen <[email protected]> -*/ - -#ifndef __HDA_TPLG_INTERFACE_H__ -#define __HDA_TPLG_INTERFACE_H__ - -#include <linux/types.h> - -/* -* Default types range from 0~12. type can range from 0 to 0xff -* SST types start at higher to avoid any overlapping in future -*/ -#define SKL_CONTROL_TYPE_BYTE_TLV 0x100 -#define SKL_CONTROL_TYPE_MIC_SELECT 0x102 -#define SKL_CONTROL_TYPE_MULTI_IO_SELECT 0x103 -#define SKL_CONTROL_TYPE_MULTI_IO_SELECT_DMIC 0x104 - -#define HDA_SST_CFG_MAX 900/* size of copier cfg*/ -#define MAX_IN_QUEUE 8 -#define MAX_OUT_QUEUE 8 - -#define SKL_UUID_STR_SZ 40 -/* Event types goes here */ -/* Reserve event type 0 for no event handlers */ -enum skl_event_types { -SKL_EVENT_NONE =0 , -SKL_MIXER_EVENT , -SKL_MUX_EVENT , -SKL_VMIXER_EVENT , -SKL_PGA_EVENT -}; - -/** -* enum skl_ch_cfg - channel configuration -* -* @SKL_CH_CFG_MONO: One channel only -* @SKL_CH_CFG_STEREO: L & R -* @SKL_CH_CFG_2_1: L, R & LFE -* @SKL_CH_CFG_3_0: L, C & R -* @SKL_CH_CFG_3_1: L, C, R & LFE -* @SKL_CH_CFG_QUATRO: L, R, Ls & Rs -* @SKL_CH_CFG_4_0: L, C, R & Cs -* @SKL_CH_CFG_5_0: L, C, R, Ls & Rs -* @SKL_CH_CFG_5_1: L, C, R, Ls, Rs & LFE -* @SKL_CH_CFG_DUAL_MONO: One channel replicated in two -* @SKL_CH_CFG_I2S_DUAL_STEREO_0: Stereo(L,R) in 4 slots, 1st stream:[ L, R, -, - ] -* @SKL_CH_CFG_I2S_DUAL_STEREO_1: Stereo(L,R) in 4 slots, 2nd stream:[ -, -, L, R ] -* @SKL_CH_CFG_INVALID: Invalid -*/ -enum skl_ch_cfg { -SKL_CH_CFG_MONO =0 , -SKL_CH_CFG_STEREO =1 , -SKL_CH_CFG_2_1 =2 , -SKL_CH_CFG_3_0 =3 , -SKL_CH_CFG_3_1 =4 , -SKL_CH_CFG_QUATRO =5 , -SKL_CH_CFG_4_0 =6 , -SKL_CH_CFG_5_0 =7 , -SKL_CH_CFG_5_1 =8 , -SKL_CH_CFG_DUAL_MONO =9 , -SKL_CH_CFG_I2S_DUAL_STEREO_0 =10 , -SKL_CH_CFG_I2S_DUAL_STEREO_1 =11 , -SKL_CH_CFG_7_1 =12 , -SKL_CH_CFG_4_CHANNEL =SKL_CH_CFG_7_1 , -SKL_CH_CFG_INVALID -}; - -enum skl_module_type { -SKL_MODULE_TYPE_MIXER =0 , -SKL_MODULE_TYPE_COPIER , -SKL_MODULE_TYPE_UPDWMIX , -SKL_MODULE_TYPE_SRCINT , -SKL_MODULE_TYPE_ALGO , -SKL_MODULE_TYPE_BASE_OUTFMT , -SKL_MODULE_TYPE_KPB , -SKL_MODULE_TYPE_MIC_SELECT , -}; - -enum skl_core_affinity { -SKL_AFFINITY_CORE_0 =0 , -SKL_AFFINITY_CORE_1 , -SKL_AFFINITY_CORE_MAX -}; - -enum skl_pipe_conn_type { -SKL_PIPE_CONN_TYPE_NONE =0 , -SKL_PIPE_CONN_TYPE_FE , -SKL_PIPE_CONN_TYPE_BE -}; - -enum skl_hw_conn_type { -SKL_CONN_NONE =0 , -SKL_CONN_SOURCE =1 , -SKL_CONN_SINK =2 -}; - -enum skl_dev_type { -SKL_DEVICE_BT =0x0 , -SKL_DEVICE_DMIC =0x1 , -SKL_DEVICE_I2S =0x2 , -SKL_DEVICE_SLIMBUS =0x3 , -SKL_DEVICE_HDALINK =0x4 , -SKL_DEVICE_HDAHOST =0x5 , -SKL_DEVICE_NONE -}; - -/** -* enum skl_interleaving - interleaving style -* -* @SKL_INTERLEAVING_PER_CHANNEL: [s1_ch1...s1_chN,...,sM_ch1...sM_chN] -* @SKL_INTERLEAVING_PER_SAMPLE: [s1_ch1...sM_ch1,...,s1_chN...sM_chN] -*/ -enum skl_interleaving { -SKL_INTERLEAVING_PER_CHANNEL =0 , -SKL_INTERLEAVING_PER_SAMPLE =1 , -}; - -enum skl_sample_type { -SKL_SAMPLE_TYPE_INT_MSB =0 , -SKL_SAMPLE_TYPE_INT_LSB =1 , -SKL_SAMPLE_TYPE_INT_SIGNED =2 , -SKL_SAMPLE_TYPE_INT_UNSIGNED =3 , -SKL_SAMPLE_TYPE_FLOAT =4 -}; - -enum module_pin_type { -/* All pins of the module takes same PCM inputs or outputs -* e.g. mixout -*/ -SKL_PIN_TYPE_HOMOGENEOUS , -/* All pins of the module takes different PCM inputs or outputs -* e.g mux -*/ -SKL_PIN_TYPE_HETEROGENEOUS , -}; - -enum skl_module_param_type { -SKL_PARAM_DEFAULT =0 , -SKL_PARAM_INIT , -SKL_PARAM_SET , -SKL_PARAM_BIND -}; - -struct skl_dfw_algo_data { -__u32 set_params:2 ; -__u32 rsvd:30 ; -__u32 param_id; -__u32 max; -char params[]; -} __packed; - -enum skl_tkn_dir { -SKL_DIR_IN , -SKL_DIR_OUT -}; - -enum skl_tuple_type { -SKL_TYPE_TUPLE , -SKL_TYPE_DATA -}; - -#endif
include/uapi/sound/snd_sst_tokens.h deleted +0 -324
324 lines not on this page · raw message
Signature · 1 line
2.34.1
Quoted 1 line · Cezary Rojewski
ASoC: Intel: Remove obsolete UAPI headers
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.3
Thanks!
[1/1] ASoC: Intel: Remove obsolete UAPI headers
https://git.kernel.org/broonie/sound/c/c53cb1f46be5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark