This repository has been archived by the owner on Jan 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from ranj063/dai_changes
DAI updates - topology changes
- Loading branch information
Showing
34 changed files
with
267 additions
and
227 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| SUBDIRS = intel common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| EXTRA_DIST = \ | ||
| ssp.m4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| divert(-1) | ||
|
|
||
| dnl SSP related macros | ||
|
|
||
| dnl SSP_CLOCK(clock, freq, codec_master) | ||
| define(`SSP_CLOCK', | ||
| $1 STR($3) | ||
| $1_freq STR($2)) | ||
|
|
||
|
|
||
| dnl SSP_TDM(slots, width, tx_mask, rx_mask) | ||
| define(`SSP_TDM', | ||
| `tdm_slots 'STR($1) | ||
| ` tdm_slot_width 'STR($2) | ||
| ` tx_slots 'STR($3) | ||
| ` rx_slots 'STR($4) | ||
| ) | ||
| dnl SSP_CONFIG(format, mclk, bclk, fsync, tdm, ssp_config_data) | ||
| define(`SSP_CONFIG', | ||
| ` format "'$1`"' | ||
| ` '$2 | ||
| ` '$3 | ||
| ` '$4 | ||
| ` '$5 | ||
| `}' | ||
| $6 | ||
| ) | ||
|
|
||
| dnl SSP_CONFIG_DATA(type, idx, valid bits, mclk_id) | ||
| dnl mclk_id is optional | ||
| define(`SSP_CONFIG_DATA', | ||
| `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' | ||
| ` tokens "sof_ssp_tokens"' | ||
| ` tuples."word" {' | ||
| ` SOF_TKN_INTEL_SSP_SAMPLE_BITS' STR($3) | ||
| ` }' | ||
| ` tuples."short" {' | ||
| ` SOF_TKN_INTEL_SSP_MCLK_ID' ifelse($4, `', "0", STR($4)) | ||
| ` }' | ||
| `}' | ||
| `SectionData."'N_DAI_CONFIG($1$2)`_data" {' | ||
| ` tuples "'N_DAI_CONFIG($1$2)`_tuples"' | ||
| `}' | ||
| ) | ||
|
|
||
| divert(0)dnl |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,5 +4,6 @@ EXTRA_DIST = \ | |
| byt.m4 \ | ||
| cht.m4 \ | ||
| hsw.m4 \ | ||
| cnl.m4 | ||
| cnl.m4 \ | ||
| dmic.m4 | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| divert(-1) | ||
|
|
||
| dnl DMIC related macros | ||
|
|
||
| dnl PDM_TUPLES(pdm ctrl id, mic_a_enable, mic_b_enable, polarity_a, polarity_b, | ||
| dnl clk_egde, skew) | ||
| define(`PDM_TUPLES', | ||
| ` tuples."short.pdm$1" {' | ||
| ` SOF_TKN_INTEL_DMIC_PDM_CTRL_ID' STR($1) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_MIC_A_Enable' STR($2) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_MIC_B_Enable' STR($3) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_POLARITY_A' STR($4) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_POLARITY_B' STR($5) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_CLK_EDGE' STR($6) | ||
| ` SOF_TKN_INTEL_DMIC_PDM_SKEW' STR($7) | ||
| ` }' | ||
| ) | ||
|
|
||
| dnl PDM_CONFIG(type, idx, pdm tuples list) | ||
| define(`PDM_CONFIG', | ||
| `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_pdm_tuples" {' | ||
| ` tokens "sof_dmic_pdm_tokens"' | ||
| $3 | ||
| `}' | ||
| ) | ||
|
|
||
| dnl DMIC currently only supports 16 bit or 32-bit word length | ||
| dnl DMIC_WORD_LENGTH(frame format) | ||
| define(`DMIC_WORD_LENGTH', | ||
| `ifelse($1, `s16le', 16, $1, `s32le', 32, `')') | ||
|
|
||
| dnl DMIC_CONFIG(driver_version, clk_min, clk_mac, duty_min, duty_max, | ||
| dnl req pdm count, sample_rate, | ||
| dnl fifo word length, type, idx, pdm controller config) | ||
| define(`DMIC_CONFIG', | ||
| `SectionVendorTuples."'N_DAI_CONFIG($9$10)`_dmic_tuples" {' | ||
| ` tokens "sof_dmic_tokens"' | ||
| ` tuples."word" {' | ||
| ` SOF_TKN_INTEL_DMIC_DRIVER_VERSION' STR($1) | ||
| ` SOF_TKN_INTEL_DMIC_CLK_MIN' STR($2) | ||
| ` SOF_TKN_INTEL_DMIC_CLK_MAX' STR($3) | ||
| ` SOF_TKN_INTEL_DMIC_DUTY_MIN' STR($4) | ||
| ` SOF_TKN_INTEL_DMIC_DUTY_MAX' STR($5) | ||
| ` SOF_TKN_INTEL_DMIC_NUM_PDM_ACTIVE' STR($6) | ||
| ` SOF_TKN_INTEL_DMIC_SAMPLE_RATE' STR($7) | ||
| ` SOF_TKN_INTEL_DMIC_FIFO_WORD_LENGTH' STR($8) | ||
| ` }' | ||
| `}' | ||
| dnl PDM config for the number of active PDM controllers | ||
| $11 | ||
| `SectionData."'N_DAI_CONFIG($9$10)`_pdm_data" {' | ||
| ` tuples "'N_DAI_CONFIG($9$10)`_pdm_tuples"' | ||
| `}' | ||
| `SectionData."'N_DAI_CONFIG($9$10)`_data" {' | ||
| ` tuples "'N_DAI_CONFIG($9$10)`_dmic_tuples"' | ||
|
|
||
| `}' | ||
| ) | ||
|
|
||
| divert(0)dnl |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.