From 0568c38c5f02bc2162f79b52b825d8f57253bdec Mon Sep 17 00:00:00 2001 From: Alejandro Sierra Date: Fri, 6 Apr 2012 20:32:55 -0500 Subject: ENGR00179123 AMFM I2C module to ARD platform for IMX6Q and IMX6DL Basic I2C module integration of AMFM module to ARD platform IMX6Q and IMX6DL rev A and rev B boards. Supported for kernel 3.0.15. Signed-off-by: Alejandro Sierra --- include/media/radio-si4763.h | 20 ++++++++++++++++++ include/media/si4763.h | 48 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 include/media/radio-si4763.h create mode 100644 include/media/si4763.h (limited to 'include') diff --git a/include/media/radio-si4763.h b/include/media/radio-si4763.h new file mode 100644 index 000000000000..e7abac285c14 --- /dev/null +++ b/include/media/radio-si4763.h @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2008-2012 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +#ifndef RADIO_SI4763_H +#define RADIO_SI4763_H + +#include + +#define SI4763_NAME "radio-si4763" + +/* + * Platform dependent definition + */ +struct radio_si4763_platform_data { + int i2c_bus; + struct i2c_board_info *subdev_board_info; +}; + +#endif /* ifndef RADIO_SI4763_H*/ diff --git a/include/media/si4763.h b/include/media/si4763.h new file mode 100644 index 000000000000..494542e15c36 --- /dev/null +++ b/include/media/si4763.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2008-2012 Freescale Semiconductor, Inc. All Rights Reserved. + */ + +/* + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#ifndef SI4713_H +#define SI4713_H + +/* The SI4713 I2C sensor chip has a fixed slave address of 0xc6 or 0x22. */ +#define SI4713_I2C_ADDR_BUSEN_HIGH 0x63 +#define SI4713_I2C_ADDR_BUSEN_LOW 0x11 + +/* + * Platform dependent definition + */ +struct si4713_platform_data { + /* Set power state, zero is off, non-zero is on. */ + int (*set_power)(int power); +}; + +/* + * Structure to query for Received Noise Level (RNL). + */ +struct si4713_rnl { + __u32 index; /* modulator index */ + __u32 frequency; /* frequency to peform rnl measurement */ + __s32 rnl; /* result of measurement in dBuV */ + __u32 reserved[4]; /* drivers and apps must init this to 0 */ +}; + +/* + * This is the ioctl number to query for rnl. Users must pass a + * struct si4713_rnl pointer specifying desired frequency in 'frequency' field + * following driver capabilities (i.e V4L2_TUNER_CAP_LOW). + * Driver must return measured value in the same struture, filling 'rnl' field. + */ +#define SI4713_IOC_MEASURE_RNL _IOWR('V', BASE_VIDIOC_PRIVATE + 0, \ + struct si4713_rnl) + +#endif /* ifndef SI4713_H*/ -- cgit v1.2.3 From a378494ae9d706e6f30d6c020df99198a436c7d7 Mon Sep 17 00:00:00 2001 From: Allen Xu Date: Tue, 10 Apr 2012 16:53:01 +0800 Subject: ENGR00179284-1 support ONFI NAND device on mx6q_arm2_pop board Add a platform data to indicate whether the board support ONFI nand Signed-off-by: Allen Xu --- include/linux/mtd/gpmi-nand.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/linux/mtd/gpmi-nand.h b/include/linux/mtd/gpmi-nand.h index 6659446591ec..e4b52f281df5 100644 --- a/include/linux/mtd/gpmi-nand.h +++ b/include/linux/mtd/gpmi-nand.h @@ -66,5 +66,6 @@ struct gpmi_nand_platform_data { struct mtd_partition *partitions; unsigned partition_count; unsigned int enable_bbt:1; + unsigned int enable_ddr:1; }; #endif -- cgit v1.2.3 From 4d5c8d7aa0d5137d337048dd82c71c77c3954fa5 Mon Sep 17 00:00:00 2001 From: Wayne Zou Date: Fri, 13 Apr 2012 08:19:46 +0800 Subject: ENGR00179513-2 IPU: Add TILED_NV12_FRAME_SIZE macro for consistency VPU needs 4K align buffer address for tiled format data output. Use this macro for IPU/V4L2/Apps to calculate the frame/field size. Signed-off-by: Wayne Zou --- include/linux/ipu.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include') diff --git a/include/linux/ipu.h b/include/linux/ipu.h index 973cfe9b45a5..e0c9e90c2804 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -141,6 +141,8 @@ typedef enum { #define IPU_PIX_FMT_YUV422P fourcc('4', '2', '2', 'P') /*!< 16 YUV 4:2:2 */ /*! @} */ #define IPU_PIX_FMT_TILED_NV12_MBALIGN (16) +#define TILED_NV12_FRAME_SIZE(w, h) \ + (ALIGN((w) * (h), SZ_4K) + ALIGN((w) * (h) / 2, SZ_4K)) /* IPU device */ typedef enum { RGB_CS, -- cgit v1.2.3 From c86a909e285f17cf91e9c89619601048cf8bf35d Mon Sep 17 00:00:00 2001 From: Alan Tull Date: Thu, 5 Apr 2012 13:27:49 -0500 Subject: ENGR00179601 Synopsys approved hdmi fifo workaround - rev 3 This patch includes some of the clk enable/disable changes from rev2 Check the version of the HDMI IP to determine whether the fifo threshold needs to be high. The i.Mx6dl version of the HDMI doesn't need the workaround. All other parts of the workaround are used for both parts for code simplicity. ---------------------------------------------------------- For i.Mxq, set the Threshold of audio fifo as: FIFO depth - 2 (fixed and independent of the number of channels actually used). Use unspecified length ahb bursts (using fixed INCRx will make the audio dma fail). Additionally and in order to get it working on all conditions it will be necessary to run the following sw steps at startup of video and audio (or when video changes or audio changes): 1-Configure AUD_N1 and AUD_CTS1 registers with final value and let the AUD_N2, AUD_N3, AUD_CTS2 and AUD_CTS3 to 0s. 2-Configure start and end addresses of audio DMA registers. 3-Start DMA operation 4-Configure the AUD_CTS2 and AUD_CTS3 with the final value. 5-Configure the AUD_N2 and AUD_N3 with final value. Signed-off-by: Alan Tull --- include/linux/mfd/mxc-hdmi-core.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/linux/mfd/mxc-hdmi-core.h b/include/linux/mfd/mxc-hdmi-core.h index 0b241838f1b9..8681053d231f 100644 --- a/include/linux/mfd/mxc-hdmi-core.h +++ b/include/linux/mfd/mxc-hdmi-core.h @@ -37,6 +37,7 @@ void hdmi_irq_enable(int irq); unsigned int hdmi_irq_disable(int irq); void hdmi_set_sample_rate(unsigned int rate); +void hdmi_set_dma_mode(unsigned int dma_running); void hdmi_init_clk_regenerator(void); void hdmi_clk_regenerator_update_pixel_clock(void); -- cgit v1.2.3