Commit 15f0d4f5 authored by Shreyas NC's avatar Shreyas NC Committed by Mark Brown
Browse files

ASoC: uapi: Intel: Skylake: Define vendor specific tokens 



With recent topology changes in alsa-lib, driver data for
modules can now be passed in topology conf file using tuples.

This patch defines vendor specific tokens to describe private
data with tuples.

The allowed token types are UUID, string, bool, byte, short and
word. These tokens will be referenced by the vendor tuples in
the conf file.

In the topology conf file, multiple data blocks can be defined
for a widget which can be either tuple vendor array or blob. So,
each data block will be preceded by a descriptor to identify
size and type of block. These descriptors will be token
value pairs.

Tokens for module_id and loadable flag are not defined as these
are read from the DSP FW manifest.

Signed-off-by: default avatarShreyas NC <shreyas.nc@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 84ccd636

include/uapi/sound/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ header-y += sb16_csp.h 
header-y += sfnt_info.h

header-y += tlv.h

header-y += usb_stream.h

header-y += snd_sst_tokens.h

include/uapi/sound/snd_sst_tokens.h

0 → 100644
+208 −0
Original line number Diff line number Diff line 
/*

 * snd_sst_tokens.h - Intel SST tokens definition

 *

 * Copyright (C) 2016 Intel Corp

 * Author: Shreyas NC <shreyas.nc@intel.com>

 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as version 2, as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 */

#ifndef __SND_SST_TOKENS_H__

#define __SND_SST_TOKENS_H__



/**

 * %SKL_TKN_UUID:               Module UUID

 *

 * %SKL_TKN_U8_BLOCK_TYPE:      Type of the private data block.Can be:

 *                              tuples, bytes, short and words

 *

 * %SKL_TKN_U8_IN_PIN_TYPE:     Input pin type,

 *                              homogenous=0, heterogenous=1

 *

 * %SKL_TKN_U8_OUT_PIN_TYPE:    Output pin type,

 *                              homogenous=0, heterogenous=1

 * %SKL_TKN_U8_DYN_IN_PIN:      Configure Input pin dynamically

 *                              if true

 *

 * %SKL_TKN_U8_DYN_OUT_PIN:     Configure Output pin dynamically

 *                              if true

 *

 * %SKL_TKN_U8_IN_QUEUE_COUNT:  Store the number of Input pins

 *

 * %SKL_TKN_U8_OUT_QUEUE_COUNT: Store the number of Output pins

 *

 * %SKL_TKN_U8_TIME_SLOT:       TDM slot number

 *

 * %SKL_TKN_U8_CORE_ID:         Stores module affinity value.Can take

 *                              the values:

 *                              SKL_AFFINITY_CORE_0 = 0,

 *                              SKL_AFFINITY_CORE_1,

 *                              SKL_AFFINITY_CORE_MAX

 *

 * %SKL_TKN_U8_MOD_TYPE:        Module type value.

 *

 * %SKL_TKN_U8_CONN_TYPE:       Module connection type can be a FE,

 *                              BE or NONE as defined :

 *                              SKL_PIPE_CONN_TYPE_NONE = 0,

 *                              SKL_PIPE_CONN_TYPE_FE = 1 (HOST_DMA)

 *                              SKL_PIPE_CONN_TYPE_BE = 2 (LINK_DMA)

 *

 * %SKL_TKN_U8_DEV_TYPE:        Type of device to which the module is

 *                              connected

 *                              Can take the values:

 *                              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

 *

 * %SKL_TKN_U8_HW_CONN_TYPE:    Connection type of the HW to which the

 *                              module is connected

 *                              SKL_CONN_NONE = 0,

 *                              SKL_CONN_SOURCE = 1,

 *                              SKL_CONN_SINK = 2

 *

 * %SKL_TKN_U16_PIN_INST_ID:    Stores the pin instance id

 *

 * %SKL_TKN_U16_MOD_INST_ID:    Stores the mdule instance id

 *

 * %SKL_TKN_U32_MAX_MCPS:       Module max mcps value

 *

 * %SKL_TKN_U32_MEM_PAGES:      Module resource pages

 *

 * %SKL_TKN_U32_OBS:            Stores Output Buffer size

 *

 * %SKL_TKN_U32_IBS:            Stores input buffer size

 *

 * %SKL_TKN_U32_VBUS_ID:        Module VBUS_ID. PDM=0, SSP0=0,

 *                              SSP1=1,SSP2=2,

 *                              SSP3=3, SSP4=4,

 *                              SSP5=5, SSP6=6,INVALID

 *

 * %SKL_TKN_U32_PARAMS_FIXUP:   Module Params fixup mask

 * %SKL_TKN_U32_CONVERTER:      Module params converter mask

 * %SKL_TKN_U32_PIPE_ID:        Stores the pipe id

 *

 * %SKL_TKN_U32_PIPE_CONN_TYPE: Type of the token to which the pipe is

 *                              connected to. It can be

 *                              SKL_PIPE_CONN_TYPE_NONE = 0,

 *                              SKL_PIPE_CONN_TYPE_FE = 1 (HOST_DMA),

 *                              SKL_PIPE_CONN_TYPE_BE = 2 (LINK_DMA),

 *

 * %SKL_TKN_U32_PIPE_PRIORITY:  Pipe priority value

 * %SKL_TKN_U32_PIPE_MEM_PGS:   Pipe resource pages

 *

 * %SKL_TKN_U32_DIR_PIN_COUNT:  Value for the direction to set input/output

 *                              formats and the pin count.

 *                              The first 4 bits have the direction

 *                              value and the next 4 have

 *                              the pin count value.

 *                              SKL_DIR_IN = 0, SKL_DIR_OUT = 1.

 *                              The input and output formats

 *                              share the same set of tokens

 *                              with the distinction between input

 *                              and output made by reading direction

 *                              token.

 *

 * %SKL_TKN_U32_FMT_CH:         Supported channel count

 *

 * %SKL_TKN_U32_FMT_FREQ:       Supported frequency/sample rate

 *

 * %SKL_TKN_U32_FMT_BIT_DEPTH:  Supported container size

 *

 * %SKL_TKN_U32_FMT_SAMPLE_SIZE:Number of samples in the container

 *

 * %SKL_TKN_U32_FMT_CH_CONFIG:  Supported channel configurations for the

 *                              input/output.

 *

 * %SKL_TKN_U32_FMT_INTERLEAVE: Interleaving style which can be per

 *                              channel or per sample. The values can be :

 *                              SKL_INTERLEAVING_PER_CHANNEL = 0,

 *                              SKL_INTERLEAVING_PER_SAMPLE = 1,

 *

 * %SKL_TKN_U32_FMT_SAMPLE_TYPE:

 *                              Specifies the sample type. Can take the

 *                              values: 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

 *

 * %SKL_TKN_U32_CH_MAP:         Channel map values

 * %SKL_TKN_U32_MOD_SET_PARAMS: It can take these values:

 *                              SKL_PARAM_DEFAULT, SKL_PARAM_INIT,

 *                              SKL_PARAM_SET, SKL_PARAM_BIND

 *

 * %SKL_TKN_U32_MOD_PARAM_ID:   ID of the module params

 *

 * %SKL_TKN_U32_CAPS_SET_PARAMS:

 *                              Set params value

 *

 * %SKL_TKN_U32_CAPS_PARAMS_ID: Params ID

 *

 * %SKL_TKN_U32_CAPS_SIZE:      Caps size

 *

 * %SKL_TKN_U32_PROC_DOMAIN:    Specify processing domain

 *

 * module_id and loadable flags dont have tokens as these values will be

 * read from the DSP FW manifest

 */

enum SKL_TKNS {

	SKL_TKN_UUID = 1,

	SKL_TKN_U8_NUM_BLOCKS,

	SKL_TKN_U8_BLOCK_TYPE,

	SKL_TKN_U8_IN_PIN_TYPE,

	SKL_TKN_U8_OUT_PIN_TYPE,

	SKL_TKN_U8_DYN_IN_PIN,

	SKL_TKN_U8_DYN_OUT_PIN,

	SKL_TKN_U8_IN_QUEUE_COUNT,

	SKL_TKN_U8_OUT_QUEUE_COUNT,

	SKL_TKN_U8_TIME_SLOT,

	SKL_TKN_U8_CORE_ID,

	SKL_TKN_U8_MOD_TYPE,

	SKL_TKN_U8_CONN_TYPE,

	SKL_TKN_U8_DEV_TYPE,

	SKL_TKN_U8_HW_CONN_TYPE,

	SKL_TKN_U16_MOD_INST_ID,

	SKL_TKN_U16_BLOCK_SIZE,

	SKL_TKN_U32_MAX_MCPS,

	SKL_TKN_U32_MEM_PAGES,

	SKL_TKN_U32_OBS,

	SKL_TKN_U32_IBS,

	SKL_TKN_U32_VBUS_ID,

	SKL_TKN_U32_PARAMS_FIXUP,

	SKL_TKN_U32_CONVERTER,

	SKL_TKN_U32_PIPE_ID,

	SKL_TKN_U32_PIPE_CONN_TYPE,

	SKL_TKN_U32_PIPE_PRIORITY,

	SKL_TKN_U32_PIPE_MEM_PGS,

	SKL_TKN_U32_DIR_PIN_COUNT,

	SKL_TKN_U32_FMT_CH,

	SKL_TKN_U32_FMT_FREQ,

	SKL_TKN_U32_FMT_BIT_DEPTH,

	SKL_TKN_U32_FMT_SAMPLE_SIZE,

	SKL_TKN_U32_FMT_CH_CONFIG,

	SKL_TKN_U32_FMT_INTERLEAVE,

	SKL_TKN_U32_FMT_SAMPLE_TYPE,

	SKL_TKN_U32_FMT_CH_MAP,

	SKL_TKN_U32_PIN_MOD_ID,

	SKL_TKN_U32_PIN_INST_ID,

	SKL_TKN_U32_MOD_SET_PARAMS,

	SKL_TKN_U32_MOD_PARAM_ID,

	SKL_TKN_U32_CAPS_SET_PARAMS,

	SKL_TKN_U32_CAPS_PARAMS_ID,

	SKL_TKN_U32_CAPS_SIZE,

	SKL_TKN_U32_PROC_DOMAIN,

	SKL_TKN_MAX = SKL_TKN_U32_PROC_DOMAIN,

};



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE