From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 19 Oct 2014 01:11:04 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.18-rc1~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52d589a01d4545ce1dc5c3892bb8c7b55edfe714;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine updates from Vinod Koul:
 "For dmaengine contributions we have:
   - designware cleanup by Andy
   - my series moving device_control users to dmanegine_xxx APIs for
     later removal of device_control API
   - minor fixes spread over drivers mainly mv_xor, pl330, mmp, imx-sdma
     etc"

* 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma: (60 commits)
  serial: atmel: add missing dmaengine header
  dmaengine: remove FSLDMA_EXTERNAL_START
  dmaengine: freescale: remove FSLDMA_EXTERNAL_START control method
  carma-fpga: move to fsl_dma_external_start()
  carma-fpga: use dmaengine_xxx() API
  dmaengine: freescale: add and export fsl_dma_external_start()
  dmaengine: add dmaengine_prep_dma_sg() helper
  video: mx3fb: use dmaengine_terminate_all() API
  serial: sh-sci: use dmaengine_terminate_all() API
  net: ks8842: use dmaengine_terminate_all() API
  mtd: sh_flctl: use dmaengine_terminate_all() API
  mtd: fsmc_nand: use dmaengine_terminate_all() API
  V4L2: mx3_camer: use dmaengine_pause() API
  dmaengine: coh901318: use dmaengine_terminate_all() API
  pata_arasan_cf: use dmaengine_terminate_all() API
  dmaengine: edma: check for echan->edesc => NULL in edma_dma_pause()
  dmaengine: dw: export probe()/remove() and Co to users
  dmaengine: dw: enable and disable controller when needed
  dmaengine: dw: always export dw_dma_{en,dis}able
  dmaengine: dw: introduce dw_dma_on() helper
  ...
---

52d589a01d4545ce1dc5c3892bb8c7b55edfe714
diff --cc drivers/tty/serial/8250/8250_pci.c
index 4f1cd29,85a2eb9..beb9d71
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@@ -1888,11 -1934,18 +1922,25 @@@ static struct pci_serial_quirk pci_seri
  	},
  	{
  		.vendor		= PCI_VENDOR_ID_INTEL,
 +		.device		= PCI_DEVICE_ID_INTEL_QRK_UART,
 +		.subvendor	= PCI_ANY_ID,
 +		.subdevice	= PCI_ANY_ID,
 +		.setup		= pci_default_setup,
 +	},
++	{
++		.vendor		= PCI_VENDOR_ID_INTEL,
+ 		.device		= PCI_DEVICE_ID_INTEL_BSW_UART1,
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 		.setup		= byt_serial_setup,
+ 	},
+ 	{
+ 		.vendor		= PCI_VENDOR_ID_INTEL,
+ 		.device		= PCI_DEVICE_ID_INTEL_BSW_UART2,
+ 		.subvendor	= PCI_ANY_ID,
+ 		.subdevice	= PCI_ANY_ID,
+ 		.setup		= byt_serial_setup,
+ 	},
  	/*
  	 * ITE
  	 */