diff options
| author | qctecmdr <qctecmdr@localhost> | 2020-02-21 07:01:55 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2020-02-21 07:01:55 -0800 |
| commit | 1f384e85adba66c84f910ecb44de373a8f898ddc (patch) | |
| tree | e87424c7f3a9d1308aff23f67486ccf492d606d3 | |
| parent | 08e7e3dc5d26f994004a70e5d2561998ddb9b33a (diff) | |
| parent | c7db3755cba3f26657848e70afb40bf5a3a9fb0a (diff) | |
| download | msm-extra-1f384e85adba66c84f910ecb44de373a8f898ddc.tar.gz | |
Merge "ASoC: sdm660: Fix compilation issue of sdm660 drivers"
| -rw-r--r-- | asoc/sdm660-common.c | 23 | ||||
| -rw-r--r-- | asoc/sdm660-external.c | 6 |
2 files changed, 22 insertions, 7 deletions
diff --git a/asoc/sdm660-common.c b/asoc/sdm660-common.c index b0edcea4..c3c9b5a7 100644 --- a/asoc/sdm660-common.c +++ b/asoc/sdm660-common.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -45,6 +45,27 @@ enum { bool codec_reg_done; +enum { + STATUS_PORT_STARTED, /* track if AFE port has started */ + /* track AFE Tx port status for bi-directional transfers */ + STATUS_TX_PORT, + /* track AFE Rx port status for bi-directional transfers */ + STATUS_RX_PORT, + STATUS_MAX +}; + +struct tdm_dai_data { + DECLARE_BITMAP(status_mask, STATUS_MAX); + u32 rate; + u32 channels; + u32 bitwidth; + u32 num_group_ports; + u32 is_island_dai; + struct afe_clk_set clk_set; /* hold LPASS clock config. */ + union afe_port_group_config group_cfg; /* hold tdm group config */ + struct afe_tdm_port_config port_cfg; /* hold tdm config */ +}; + /* TDM default config */ static struct dev_config tdm_rx_cfg[TDM_INTERFACE_MAX][TDM_PORT_MAX] = { { /* PRI TDM */ diff --git a/asoc/sdm660-external.c b/asoc/sdm660-external.c index fad90999..af54bcb8 100644 --- a/asoc/sdm660-external.c +++ b/asoc/sdm660-external.c @@ -96,12 +96,6 @@ enum { SLIM_TX_MAX, }; -struct dev_config { - u32 sample_rate; - u32 bit_format; - u32 channels; -}; - /* Default configuration of slimbus channels */ static struct dev_config slim_rx_cfg[] = { [SLIM_RX_0] = {SAMPLING_RATE_48KHZ, SNDRV_PCM_FORMAT_S16_LE, 1}, |