History

Merge tag 'asoc-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v6.18 A relatively quiet release for ASoC, we've had a lot of maintainance work going on and several new drivers but really the most remarkable thing is that we removed a driver, the WL1273 driver used in some old Nokia systems that have had the underlying system support removed from the kernel. - Morimoto-san continues his work on cleanups of the core APIs and enforcement of abstraction layers. - Lots of cleanups and conversions of DT bindings. - Substantial maintainance work on the Intel AVS drivers. - Support for Qualcomm Glymur and PM4125, Realtek RT1321, Shanghai FourSemi FS2104/5S, Texas Instruments PCM1754. - Remove support for TI WL1273.

Takashi Iwai committed 1 year ago

Commit b8d82652 parents fc87f70 5998f0d1025 files · +19517 −7215Browse files

Showing the changes to include/uapi (5 of 1025 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/netfilter/nf_tables.h +2 −0
  2. include/uapi/linux/vhost.h +2 −2
  3. include/uapi/sound/intel/avs/tokens.h +15 −0
  4. include/uapi/sound/snd_ar_tokens.h +18 −2
  5. include/uapi/sound/sof/tokens.h +2 −0
include/uapi/linux/netfilter/nf_tables.h+2−0
@@ -1784,10 +1784,12 @@ enum nft_synproxy_attributes { · 1783 unmodified lines
1784 * enum nft_device_attributes - nf_tables device netlink attributes1784 * enum nft_device_attributes - nf_tables device netlink attributes
1785 *1785 *
1786 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)1786 * @NFTA_DEVICE_NAME: name of this device (NLA_STRING)
1787 * @NFTA_DEVICE_PREFIX: device name prefix, a simple wildcard (NLA_STRING)
1787 */1788 */
1788enum nft_devices_attributes {1789enum nft_devices_attributes {
1789 NFTA_DEVICE_UNSPEC,1790 NFTA_DEVICE_UNSPEC,
1790 NFTA_DEVICE_NAME,1791 NFTA_DEVICE_NAME,
1792 NFTA_DEVICE_PREFIX,
1791 __NFTA_DEVICE_MAX1793 __NFTA_DEVICE_MAX
1792};1794};
1793#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)1795#define NFTA_DEVICE_MAX (__NFTA_DEVICE_MAX - 1)
include/uapi/linux/vhost.h+2−2
@@ -260,7 +260,7 @@ · 259 unmodified lines
260 * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:260 * When fork_owner is set to VHOST_FORK_OWNER_KTHREAD:
261 * - Vhost will create vhost workers as kernel threads.261 * - Vhost will create vhost workers as kernel threads.
262 */262 */
263#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x83, __u8)263#define VHOST_SET_FORK_FROM_OWNER _IOW(VHOST_VIRTIO, 0x84, __u8)
264 264
265/**265/**
266 * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.266 * VHOST_GET_FORK_OWNER - Get the current fork_owner flag for the vhost device.
@@ -268,6 +268,6 @@ · 1 unmodified line
268 *268 *
269 * @return: An 8-bit value indicating the current thread mode.269 * @return: An 8-bit value indicating the current thread mode.
270 */270 */
271#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x84, __u8)271#define VHOST_GET_FORK_FROM_OWNER _IOR(VHOST_VIRTIO, 0x85, __u8)
272 272
273#endif273#endif
include/uapi/sound/intel/avs/tokens.h+15−0
@@ -133,6 +133,21 @@ enum avs_tplg_token { · 132 unmodified lines
133 AVS_TKN_PATH_FE_FMT_ID_U32 = 1902,133 AVS_TKN_PATH_FE_FMT_ID_U32 = 1902,
134 AVS_TKN_PATH_BE_FMT_ID_U32 = 1903,134 AVS_TKN_PATH_BE_FMT_ID_U32 = 1903,
135 135
136 /* struct avs_tplg_path_template (conditional) */
137 AVS_TKN_CONDPATH_TMPL_ID_U32 = 1801,
138 AVS_TKN_CONDPATH_TMPL_SOURCE_TPLG_NAME_STRING = 2002,
139 AVS_TKN_CONDPATH_TMPL_SOURCE_PATH_TMPL_ID_U32 = 2003,
140 AVS_TKN_CONDPATH_TMPL_SINK_TPLG_NAME_STRING = 2004,
141 AVS_TKN_CONDPATH_TMPL_SINK_PATH_TMPL_ID_U32 = 2005,
142 AVS_TKN_CONDPATH_TMPL_COND_TYPE_U32 = 2006,
143 AVS_TKN_CONDPATH_TMPL_OVERRIDABLE_BOOL = 2007,
144 AVS_TKN_CONDPATH_TMPL_PRIORITY_U8 = 2008,
145
146 /* struct avs_tplg_path (conditional) */
147 AVS_TKN_CONDPATH_ID_U32 = 1901,
148 AVS_TKN_CONDPATH_SOURCE_PATH_ID_U32 = 2102,
149 AVS_TKN_CONDPATH_SINK_PATH_ID_U32 = 2103,
150
136 /* struct avs_tplg_pin_format */151 /* struct avs_tplg_pin_format */
137 AVS_TKN_PIN_FMT_INDEX_U32 = 2201,152 AVS_TKN_PIN_FMT_INDEX_U32 = 2201,
138 AVS_TKN_PIN_FMT_IOBS_U32 = 2202,153 AVS_TKN_PIN_FMT_IOBS_U32 = 2202,
include/uapi/sound/snd_ar_tokens.h+18−2
@@ -3,6 +3,8 @@ · 2 unmodified lines
3#ifndef __SND_AR_TOKENS_H__3#ifndef __SND_AR_TOKENS_H__
4#define __SND_AR_TOKENS_H__4#define __SND_AR_TOKENS_H__
5 5
6#include <linux/types.h>
7
6#define APM_SUB_GRAPH_PERF_MODE_LOW_POWER 0x18#define APM_SUB_GRAPH_PERF_MODE_LOW_POWER 0x1
7#define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY 0x29#define APM_SUB_GRAPH_PERF_MODE_LOW_LATENCY 0x2
8 10
@@ -118,6 +120,12 @@ enum ar_event_types { · 109 unmodified lines
118 * LPAIF_WSA = 2,120 * LPAIF_WSA = 2,
119 * LPAIF_VA = 3,121 * LPAIF_VA = 3,
120 * LPAIF_AXI = 4122 * LPAIF_AXI = 4
123 * Possible values for MI2S
124 * I2S_INTF_TYPE_PRIMARY = 0,
125 * I2S_INTF_TYPE_SECONDARY = 1,
126 * I2S_INTF_TYPE_TERTIARY = 2,
127 * I2S_INTF_TYPE_QUATERNARY = 3,
128 * I2S_INTF_TYPE_QUINARY = 4,
121 *129 *
122 * %AR_TKN_U32_MODULE_FMT_INTERLEAVE: PCM Interleaving130 * %AR_TKN_U32_MODULE_FMT_INTERLEAVE: PCM Interleaving
123 * PCM_INTERLEAVED = 1,131 * PCM_INTERLEAVED = 1,
@@ -184,8 +192,8 @@ enum ar_event_types { · 60 unmodified lines
184#define AR_TKN_U32_MODULE_INSTANCE_ID 201192#define AR_TKN_U32_MODULE_INSTANCE_ID 201
185#define AR_TKN_U32_MODULE_MAX_IP_PORTS 202193#define AR_TKN_U32_MODULE_MAX_IP_PORTS 202
186#define AR_TKN_U32_MODULE_MAX_OP_PORTS 203194#define AR_TKN_U32_MODULE_MAX_OP_PORTS 203
187#define AR_TKN_U32_MODULE_IN_PORTS 204195#define AR_TKN_U32_MODULE_IN_PORTS 204 /* deprecated */
188#define AR_TKN_U32_MODULE_OUT_PORTS 205196#define AR_TKN_U32_MODULE_OUT_PORTS 205 /* deprecated */
189#define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206197#define AR_TKN_U32_MODULE_SRC_OP_PORT_ID 206
190#define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207198#define AR_TKN_U32_MODULE_DST_IN_PORT_ID 207
191#define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208199#define AR_TKN_U32_MODULE_SRC_INSTANCE_ID 208
@@ -232,4 +240,12 @@ enum ar_event_types { · 40 unmodified lines
232#define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID 260240#define AR_TKN_U32_MODULE_LOG_TAP_POINT_ID 260
233#define AR_TKN_U32_MODULE_LOG_MODE 261241#define AR_TKN_U32_MODULE_LOG_MODE 261
234 242
243#define SND_SOC_AR_TPLG_MODULE_CFG_TYPE 0x01001006
244struct audioreach_module_priv_data {
245 __le32 size; /* size in bytes of the array, including all elements */
246 __le32 type; /* SND_SOC_AR_TPLG_MODULE_CFG_TYPE */
247 __le32 priv[2]; /* Private data for future expansion */
248 __le32 data[0]; /* config data */
249};
250
235#endif /* __SND_AR_TOKENS_H__ */251#endif /* __SND_AR_TOKENS_H__ */
include/uapi/sound/sof/tokens.h+2−0
@@ -106,6 +106,8 @@ · 105 unmodified lines
106 */106 */
107#define SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME 417107#define SOF_TKN_COMP_NO_WNAME_IN_KCONTROL_NAME 417
108 108
109#define SOF_TKN_COMP_SCHED_DOMAIN 418
110
109/* SSP */111/* SSP */
110#define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500112#define SOF_TKN_INTEL_SSP_CLKS_CONTROL 500
111#define SOF_TKN_INTEL_SSP_MCLK_ID 501113#define SOF_TKN_INTEL_SSP_MCLK_ID 501