diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-21 15:03:05 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-06-21 15:03:05 +0800 |
| commit | d1276730560909329571ce75427e1c1dac43c9a0 (patch) | |
| tree | df724365ee32f8188f9fcdf1e9254cc90f18372a /include | |
| parent | 19f043c9cee6ed78a051ecb244b3406bd21dd0b0 (diff) | |
| parent | 4e7e9e5834d6f8d9971bddfc7ddb91116226c39d (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.15' into imx_3.0.15_android
Conflicts:
arch/arm/mach-mx6/devices-imx6q.h
drivers/power/sabresd_battery.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mxc_asrc.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 4ccf8cb496ca..72556a5e1669 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -72,6 +72,12 @@ enum asrc_outclk { OUTCLK_ASRCK1_CLK = 0x0f, }; +enum asrc_word_width { + ASRC_WIDTH_24_BIT = 0, + ASRC_WIDTH_16_BIT = 1, + ASRC_WIDTH_8_BIT = 2, +}; + struct asrc_config { enum asrc_pair_index pair; unsigned int channel_num; @@ -79,7 +85,8 @@ struct asrc_config { unsigned int dma_buffer_size; unsigned int input_sample_rate; unsigned int output_sample_rate; - unsigned int word_width; + enum asrc_word_width input_word_width; + enum asrc_word_width output_word_width; enum asrc_inclk inclk; enum asrc_outclk outclk; }; @@ -170,6 +177,9 @@ enum asrc_error_status { #define ASRC_ASRFSTB_REG 0xAC #define ASRC_ASRMCRC_REG 0xB0 #define ASRC_ASRFSTC_REG 0xB4 +#define ASRC_ASRMCR1A_REG 0xC0 +#define ASRC_ASRMCR1B_REG 0xC4 +#define ASRC_ASRMCR1C_REG 0xC8 struct dma_block { |