Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.1.0' into imx_3.0.35_android

Conflicts:
	arch/arm/mach-mx6/Kconfig
	arch/arm/mach-mx6/board-mx6q_arm2.c
	arch/arm/mach-mx6/board-mx6q_arm2.h
	arch/arm/mach-mx6/board-mx6q_hdmidongle.c
	arch/arm/mach-mx6/board-mx6q_sabreauto.c
	arch/arm/mach-mx6/board-mx6q_sabreauto.h
	arch/arm/mach-mx6/board-mx6q_sabrelite.c
	arch/arm/mach-mx6/board-mx6q_sabresd.c
	arch/arm/mach-mx6/board-mx6q_sabresd.h
	arch/arm/mach-mx6/clock.c
	arch/arm/mach-mx6/pcie.c
	arch/arm/plat-mxc/include/mach/iomux-mx6q.h
	arch/arm/plat-mxc/include/mach/pcie.h
	drivers/dma/imx-sdma.c
	drivers/input/touchscreen/egalax_ts.c
	drivers/media/video/mxc/capture/csi_v4l2_capture.c
	drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
	drivers/mxc/mlb/mxc_mlb150.c
	drivers/mxc/thermal/thermal.c
	drivers/net/fec.c
	drivers/usb/host/ehci-arc.c
	drivers/video/mxc/mxc_ipuv3_fb.c
	include/linux/fec.h
	sound/soc/imx/imx-wm8962.c

5 files changed, 11 insertions, 6 deletions

diff --git a/include/linux/dmapool.h b/include/linux/dmapool.h
index 450950163272..c3c41efe2424 100644
--- a/include/linux/dmapool.h
+++ b/include/linux/dmapool.h
@@ -22,10 +22,8 @@ void dma_pool_destroy(struct dma_pool *pool);
 void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
 		     dma_addr_t *handle);
 
-#ifdef CONFIG_FSL_UTP
 void *dma_pool_alloc_nonbufferable(struct dma_pool *pool, gfp_t mem_flags,
 		     dma_addr_t *handle);
-#endif
 
 void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t addr);
 
diff --git a/include/linux/fec.h b/include/linux/fec.h
index a9d659456eba..7d4e73d138ce 100644
--- a/include/linux/fec.h
+++ b/include/linux/fec.h
@@ -21,9 +21,7 @@ struct fec_platform_data {
 	int (*power_hibernate) (struct phy_device *);
 	phy_interface_t phy;
 	unsigned char mac[ETH_ALEN];
-#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO
-	unsigned int gpio_irq;
-#endif
+	int gpio_irq;
 };
 
 #endif
diff --git a/include/linux/ipu.h b/include/linux/ipu.h
index ef55d80da4a3..358d315b1194 100644
--- a/include/linux/ipu.h
+++ b/include/linux/ipu.h
@@ -94,6 +94,7 @@ typedef enum {
 /*! @{ */
 #define IPU_PIX_FMT_GENERIC fourcc('I', 'P', 'U', '0')	/*!< IPU Generic Data */
 #define IPU_PIX_FMT_GENERIC_32 fourcc('I', 'P', 'U', '1')	/*!< IPU Generic Data */
+#define IPU_PIX_FMT_GENERIC_16 fourcc('I', 'P', 'U', '2')	/*!< IPU Generic Data */
 #define IPU_PIX_FMT_LVDS666 fourcc('L', 'V', 'D', '6')	/*!< IPU Generic Data */
 #define IPU_PIX_FMT_LVDS888 fourcc('L', 'V', 'D', '8')	/*!< IPU Generic Data */
 /*! @} */
diff --git a/include/linux/mxc_asrc.h b/include/linux/mxc_asrc.h
index 7594ee68ae1c..8de07b92b0ac 100644
--- a/include/linux/mxc_asrc.h
+++ b/include/linux/mxc_asrc.h
@@ -40,16 +40,21 @@ enum asrc_pair_index {
 	ASRC_PAIR_C
 };
 
+#define ASRC_PAIR_MAX_NUM	(ASRC_PAIR_C + 1)
+
 enum asrc_inclk {
 	INCLK_NONE = 0x03,
 	INCLK_ESAI_RX = 0x00,
 	INCLK_SSI1_RX = 0x01,
 	INCLK_SSI2_RX = 0x02,
+	INCLK_SSI3_RX = 0x07,
 	INCLK_SPDIF_RX = 0x04,
 	INCLK_MLB_CLK = 0x05,
+	INCLK_PAD = 0x06,
 	INCLK_ESAI_TX = 0x08,
 	INCLK_SSI1_TX = 0x09,
 	INCLK_SSI2_TX = 0x0a,
+	INCLK_SSI3_TX = 0x0b,
 	INCLK_SPDIF_TX = 0x0c,
 	INCLK_ASRCK1_CLK = 0x0f,
 };
@@ -59,11 +64,14 @@ enum asrc_outclk {
 	OUTCLK_ESAI_TX = 0x00,
 	OUTCLK_SSI1_TX = 0x01,
 	OUTCLK_SSI2_TX = 0x02,
+	OUTCLK_SSI3_TX = 0x07,
 	OUTCLK_SPDIF_TX = 0x04,
 	OUTCLK_MLB_CLK = 0x05,
+	OUTCLK_PAD = 0x06,
 	OUTCLK_ESAI_RX = 0x08,
 	OUTCLK_SSI1_RX = 0x09,
 	OUTCLK_SSI2_RX = 0x0a,
+	OUTCLK_SSI3_RX = 0x0b,
 	OUTCLK_SPDIF_RX = 0x0c,
 	OUTCLK_ASRCK1_CLK = 0x0f,
 };
diff --git a/include/linux/mxcfb.h b/include/linux/mxcfb.h
index af792f516cfd..69ea4d7d5403 100644
--- a/include/linux/mxcfb.h
+++ b/include/linux/mxcfb.h
@@ -110,7 +110,7 @@ struct mxcfb_update_data {
 	__u32 update_mode;
 	__u32 update_marker;
 	int temp;
-	uint flags;
+	unsigned int flags;
 	struct mxcfb_alt_buffer_data alt_buffer_data;
 };