From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 May 2011 19:35:15 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: v3.0-rc1~27
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4cb865deec59ef31d966622d1ec87411ae32dfab;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (33 commits)
  x86: poll waiting for I/OAT DMA channel status
  maintainers: add dma engine tree details
  dmaengine: add TODO items for future work on dma drivers
  dmaengine: Add API documentation for slave dma usage
  dmaengine/dw_dmac: Update maintainer-ship
  dmaengine: move link order
  dmaengine/dw_dmac: implement pause and resume in dwc_control
  dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback
  dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT
  dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS
  dmaengine/dw_dmac: don't call callback routine in case dmaengine_terminate_all() is called
  dmaengine: at_hdmac: pause: no need to wait for FIFO empty
  pch_dma: modify pci device table definition
  pch_dma: Support new device ML7223 IOH
  pch_dma: Support I2S for ML7213 IOH
  pch_dma: Fix DMA setting issue
  pch_dma: modify for checkpatch
  pch_dma: fix dma direction issue for ML7213 IOH video-in
  dmaengine: at_hdmac: use descriptor chaining help function
  dmaengine: at_hdmac: implement pause and resume in atc_control
  ...

Fix up trivial conflict in drivers/dma/dw_dmac.c
---

4cb865deec59ef31d966622d1ec87411ae32dfab
diff --cc drivers/Makefile
index 6b17f58,e68423d..09f3232
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -92,10 -95,9 +95,9 @@@ obj-$(CONFIG_EISA)		+= eisa
  obj-y				+= lguest/
  obj-$(CONFIG_CPU_FREQ)		+= cpufreq/
  obj-$(CONFIG_CPU_IDLE)		+= cpuidle/
- obj-$(CONFIG_DMA_ENGINE)	+= dma/
  obj-$(CONFIG_MMC)		+= mmc/
  obj-$(CONFIG_MEMSTICK)		+= memstick/
 -obj-$(CONFIG_NEW_LEDS)		+= leds/
 +obj-y				+= leds/
  obj-$(CONFIG_INFINIBAND)	+= infiniband/
  obj-$(CONFIG_SGI_SN)		+= sn/
  obj-y				+= firmware/
diff --cc drivers/dma/at_hdmac.c
index 235f53b,3134003..36144f8
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@@ -165,9 -165,32 +165,32 @@@ static void atc_desc_put(struct at_dma_
  }
  
  /**
+  * atc_desc_chain - build chain adding a descripor
+  * @first: address of first descripor of the chain
+  * @prev: address of previous descripor of the chain
+  * @desc: descriptor to queue
+  *
+  * Called from prep_* functions
+  */
+ static void atc_desc_chain(struct at_desc **first, struct at_desc **prev,
+ 			   struct at_desc *desc)
+ {
+ 	if (!(*first)) {
+ 		*first = desc;
+ 	} else {
+ 		/* inform the HW lli about chaining */
+ 		(*prev)->lli.dscr = desc->txd.phys;
+ 		/* insert the link descriptor to the LD ring */
+ 		list_add_tail(&desc->desc_node,
+ 				&(*first)->tx_list);
+ 	}
+ 	*prev = desc;
+ }
+ 
+ /**
   * atc_assign_cookie - compute and assign new cookie
   * @atchan: channel we work on
 - * @desc: descriptor to asign cookie for
 + * @desc: descriptor to assign cookie for
   *
   * Called with atchan->lock held and bh disabled
   */
diff --cc drivers/dma/dw_dmac.c
index 2a2e2fa,efd836d..4d180ca
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@@ -1486,4 -1575,5 +1575,5 @@@ module_exit(dw_exit)
  
  MODULE_LICENSE("GPL v2");
  MODULE_DESCRIPTION("Synopsys DesignWare DMA Controller driver");
 -MODULE_AUTHOR("Haavard Skinnemoen <haavard.skinnemoen@atmel.com>");
 +MODULE_AUTHOR("Haavard Skinnemoen (Atmel)");
+ MODULE_AUTHOR("Viresh Kumar <viresh.kumar@st.com>");