From 2103aa2f98bfafb504783dca387f9b182556a9c0 Mon Sep 17 00:00:00 2001 From: Chen Liangjun Date: Tue, 13 Nov 2012 16:43:25 +0800 Subject: ENGR00233427 ASRC: add interface to modify ASRC input/output watermark In this patch, add interface to modify ASRC input/output watermark. Signed-off-by: Chen Liangjun --- include/linux/mxc_asrc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 8c0c45d86cfd..72817e6ece0f 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -141,8 +141,8 @@ enum asrc_error_status { #include #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 { @@ -266,6 +268,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__ */ -- cgit v1.2.3 From 72ab3f46c599fadabf83f17b0bde7d6887c805fd Mon Sep 17 00:00:00 2001 From: Ge Lei Date: Thu, 15 Nov 2012 14:46:19 +0800 Subject: ENGR00233570-1 ASRC: Use hook to add support for ASRC loadable ASoC ESAI machine driver and pcm platform driver use the APIs from mxc_asrc.c, but once ASRC is used as a loadable module, these files can't find the APIs from this ko. In this patch, we use 'asrc_p2p_hook' to hook the APIs which will be used in ASoC ESAI machine driver and pcm platform driver. Signed-off-by: Ge Lei --- include/linux/mxc_asrc.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'include') diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h index 72817e6ece0f..37c64b7c2200 100644 --- a/include/linux/mxc_asrc.h +++ b/include/linux/mxc_asrc.h @@ -259,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); -- cgit v1.2.3 From 3c7d2684054ee74a228a686496a27cd15e40fd7f Mon Sep 17 00:00:00 2001 From: Zhang Jiejing Date: Fri, 23 Nov 2012 14:09:54 +0800 Subject: ENGR00234781 input: add novatek touch screen driver. This patch add device drvier for novatek touch screen driver. This touch screen chip will be support because it have more populary screen size. Signed-off-by: Zhang Jiejing --- include/linux/i2c/novatek_ts.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 include/linux/i2c/novatek_ts.h (limited to 'include') 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 -- cgit v1.2.3