Merge branch 'davinci-next-drivers'

Conflicts:
	drivers/mmc/host/davinci_mmc.c
	drivers/usb/musb/davinci.c

drivers/input/misc/Kconfig

@@ -269,4 +269,14 @@ config INPUT_DM355EVM
 
 	  To compile this driver as a module, choose M here: the
 	  module will be called dm355evm_keys.
+
+config INPUT_DM365EVM
+	tristate "TI DaVinci DM365 EVM IR Remote"
+	depends on MACH_DAVINCI_DM365_EVM
+	help
+	  Supports the IR remote used with the DM365 EVM board.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called dm365evm_keys.
+
 endif

drivers/input/misc/Makefile

@@ -11,6 +11,7 @@ obj-$(CONFIG_INPUT_ATLAS_BTNS)		+= atlas_btns.o
 obj-$(CONFIG_INPUT_CM109)		+= cm109.o
 obj-$(CONFIG_INPUT_COBALT_BTNS)		+= cobalt_btns.o
 obj-$(CONFIG_INPUT_DM355EVM)		+= dm355evm_keys.o
+obj-$(CONFIG_INPUT_DM365EVM)		+= dm365evm_keys.o
 obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_IXP4XX_BEEPER)	+= ixp4xx-beeper.o
 obj-$(CONFIG_INPUT_KEYSPAN_REMOTE)	+= keyspan_remote.o

drivers/mmc/host/davinci_mmc.c

@@ -178,7 +178,7 @@ struct mmc_davinci_host {
 	u32 buffer_bytes_left;
 	u32 bytes_left;
 
-	u8 rxdma, txdma;
+	u32 rxdma, txdma;
 	bool use_dma;
 	bool do_dma;
 
@@ -190,7 +190,7 @@ struct mmc_davinci_host {
 	struct edmacc_param	tx_template;
 	struct edmacc_param	rx_template;
 	unsigned		n_link;
-	u8			links[NR_SG - 1];
+	u32			links[NR_SG - 1];
 
 	/* For PIO we walk scatterlists one segment at a time. */
 	unsigned int		sg_len;
@@ -460,7 +460,7 @@ static void __init mmc_davinci_dma_setup(struct mmc_davinci_host *host,
 	edma_read_slot(sync_dev, template);
 
 	/* don't bother with irqs or chaining */
-	template->opt |= sync_dev << 12;
+	template->opt |= EDMA_CHAN_SLOT(sync_dev) << 12;
 }
 
 static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host,
@@ -495,7 +495,7 @@ static void mmc_davinci_send_dma_request(struct mmc_davinci_host *host,
 		unsigned	count = sg_dma_len(sg);
 
 		template->link_bcntrld = sg_len
-				? (host->links[link] << 5)
+				? (EDMA_CHAN_SLOT(host->links[link]) << 5)
 				: 0xffff;
 
 		if (count > bytes_left)

drivers/usb/musb/davinci.c

@@ -42,7 +42,7 @@
 #include "musb_core.h"
 
 #ifdef CONFIG_MACH_DAVINCI_EVM
-#define GPIO_nVBUS_DRV		120
+#define GPIO_nVBUS_DRV		144
 #endif
 
 #include "davinci.h"