diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-11-30 11:59:33 +0800 |
| commit | 08c473f52af7434b09214fedcfce222fb9821033 (patch) | |
| tree | 555dc016292a132bd55096d42c945c61c6394174 /include | |
| parent | 9ae3b66a8ea648d977cbcebf02209f21cc9be3a4 (diff) | |
| parent | 57ade285e32285186879f96c346dd5b45a7f0dd6 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_1.1.0' into imx_3.0.35_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabrelite.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/plat-mxc/cpufreq.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c/novatek_ts.h | 16 | ||||
| -rw-r--r-- | include/linux/mxc_asrc.h | 21 |
2 files changed, 35 insertions, 2 deletions
diff --git a/include/linux/i2c/novatek_ts.h b/include/linux/i2c/novatek_ts.h new file mode 100644 index 000000000000..0f8695fc3890 --- /dev/null +++ b/include/linux/i2c/novatek_ts.h @@ -0,0 +1,16 @@ +/* Copyright (C) 2012 Freescale Semiconductor, Inc. */ + +#ifndef NOVATEK_TS_H +#define NOVATEK_TS_H + + + +/** + * struct novatek_platform_data - platform data for novatek touch screen chip. + * @reset_gpio: gpio for chip reset pin + */ +struct novatek_platform_data { + int reset_gpio; +}; + +#endif diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 8c0c45d86cfd..37c64b7c2200 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -141,8 +141,8 @@ enum asrc_error_status { #include <linux/scatterlist.h> #define ASRC_DMA_BUFFER_NUM 2 -#define ASRC_INPUTFIFO_THRESHOLD 4 -#define ASRC_OUTPUTFIFO_THRESHOLD 2 +#define ASRC_INPUTFIFO_THRESHOLD 32 +#define ASRC_OUTPUTFIFO_THRESHOLD 32 #define ASRC_DMA_BUFFER_SIZE (1024 * 48 * 4) #define ASRC_MAX_BUFFER_SIZE (1024 * 48) #define ASRC_OUTPUT_LAST_SAMPLE 8 @@ -242,6 +242,8 @@ struct asrc_pair_params { enum asrc_word_width output_word_width; u32 input_sample_rate; u32 output_sample_rate; + u32 input_wm; + u32 output_wm; }; struct asrc_data { @@ -257,6 +259,19 @@ struct asrc_data { struct device *dev; }; +struct asrc_p2p_ops { + void (*asrc_p2p_start_conv)(enum asrc_pair_index); + void (*asrc_p2p_stop_conv)(enum asrc_pair_index); + int (*asrc_p2p_get_dma_request)(enum asrc_pair_index, bool); + u32 (*asrc_p2p_per_addr)(enum asrc_pair_index, bool); + int (*asrc_p2p_req_pair)(int, enum asrc_pair_index *index); + int (*asrc_p2p_config_pair)(struct asrc_config *config); + void (*asrc_p2p_release_pair)(enum asrc_pair_index); + void (*asrc_p2p_finish_conv)(enum asrc_pair_index); +}; + +extern void asrc_p2p_hook(struct asrc_p2p_ops *asrc_p2p_ct); + extern int asrc_req_pair(int chn_num, enum asrc_pair_index *index); extern void asrc_release_pair(enum asrc_pair_index index); extern int asrc_config_pair(struct asrc_config *config); @@ -266,6 +281,8 @@ extern void asrc_stop_conv(enum asrc_pair_index index); extern u32 asrc_get_per_addr(enum asrc_pair_index index, bool i); extern int asrc_get_dma_request(enum asrc_pair_index index, bool i); extern void asrc_finish_conv(enum asrc_pair_index index); +extern int asrc_set_watermark(enum asrc_pair_index index, + u32 in_wm, u32 out_wm); #endif /* __kERNEL__ */ |