Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abab012a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (29 commits)
  ahci: add another PCI ID for marvell
  libata: Use 'bool' return value for ata_id_XXX
  sata_fsl: Update RX_WATER_MARK for TRANSCFG
  sata_fsl: Fix wrong Device Error Register usage
  libata: Include WWN ID in inquiry VPD emulation
  ata/pata_arasan_cf: fill dma chan->private from pdata->dma_priv
  ata: pata: Convert pr_*(DRV_NAME ...) to pr_fmt/pr_<level>
  pata_arasan_cf: fix printk format string warning
  pata_arasan_cf: Adding support for arasan compact flash host controller
  libata-sff: add ata_sff_queue_work() & ata_sff_queue_delayed_work()
  ahci: AHCI mode SATA patch for Intel Patsburg SATA RAID controller
  ahci: recognize Marvell 88se9125 PCIe SATA 6.0 Gb/s controller
  libata: remove ATA_FLAG_LPM
  libata: remove ATA_FLAG_NO_LEGACY
  libata: remove ATA_FLAG_MMIO
  libata: remove ATA_FLAG_{SRST|SATA_RESET}
  ipr/sas_ata: use mode mask macros from <linux/ata.h>
  sata_dwc_460ex: add debugging options
  sata_dwc_460ex: fix misuse of ata_get_cmd_descript()
  sata_dwc_460ex: fix return value of dma_dwc_xfer_setup()
  ...
parents 79d8a8f7 50be5e36

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -557,6 +557,13 @@ S: Maintained 
F:	drivers/net/appletalk/

F:	net/appletalk/



ARASAN COMPACT FLASH PATA CONTROLLER

M:	Viresh Kumar <viresh.kumar@st.com>

L:	linux-ide@vger.kernel.org

S:	Maintained

F:	include/linux/pata_arasan_cf_data.h

F:	drivers/ata/pata_arasan_cf.c



ARC FRAMEBUFFER DRIVER

M:	Jaya Kumar <jayalk@intworks.biz>

S:	Maintained

drivers/ata/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -202,6 +202,18 @@ config SATA_DWC 


	  If unsure, say N.



config SATA_DWC_DEBUG

	bool "Debugging driver version"

	depends on SATA_DWC

	help

	  This option enables debugging output in the driver.



config SATA_DWC_VDEBUG

	bool "Verbose debug output"

	depends on SATA_DWC_DEBUG

	help

	  This option enables the taskfile dumping and NCQ debugging.



config SATA_MV

	tristate "Marvell SATA support"

	help
@@ -299,6 +311,12 @@ config PATA_AMD 


	  If unsure, say N.



config PATA_ARASAN_CF

	tristate "ARASAN CompactFlash PATA Controller Support"

	select DMA_ENGINE

	help

	  Say Y here to support the ARASAN CompactFlash PATA controller



config PATA_ARTOP

	tristate "ARTOP 6210/6260 PATA support"

	depends on PCI

drivers/ata/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_SATA_DWC) += sata_dwc_460ex.o 


# SFF w/ custom DMA

obj-$(CONFIG_PDC_ADMA)		+= pdc_adma.o

obj-$(CONFIG_PATA_ARASAN_CF)	+= pata_arasan_cf.o

obj-$(CONFIG_PATA_OCTEON_CF)	+= pata_octeon_cf.o

obj-$(CONFIG_SATA_QSTOR)	+= sata_qstor.o

obj-$(CONFIG_SATA_SX4)		+= sata_sx4.o

drivers/ata/ahci.c

+6 −2
Original line number Diff line number Diff line
@@ -175,8 +175,7 @@ static const struct ata_port_info ahci_port_info[] = { 
	{

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |

				 AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),

		.flags		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA,

		.flags		= ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,
@@ -260,6 +259,7 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1d02), board_ahci }, /* PBG AHCI */

	{ PCI_VDEVICE(INTEL, 0x1d04), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x1d06), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2826), board_ahci }, /* PBG RAID */

	{ PCI_VDEVICE(INTEL, 0x2323), board_ahci }, /* DH89xxCC AHCI */



	/* JMicron 360/1/3/5/6, match class to avoid IDE function */
@@ -383,6 +383,10 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .class = PCI_CLASS_STORAGE_SATA_AHCI,

	  .class_mask = 0xffffff,

	  .driver_data = board_ahci_yes_fbs },			/* 88se9128 */

	{ PCI_DEVICE(0x1b4b, 0x9125),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9125 */

	{ PCI_DEVICE(0x1b4b, 0x91a3),

	  .driver_data = board_ahci_yes_fbs },



	/* Promise */

	{ PCI_VDEVICE(PROMISE, 0x3f20), board_ahci },	/* PDC42819 */

drivers/ata/ahci.h

+2 −4
Original line number Diff line number Diff line
@@ -213,10 +213,8 @@ enum { 


	/* ap->flags bits */



	AHCI_FLAG_COMMON		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

					  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |

					  ATA_FLAG_LPM,

	AHCI_FLAG_COMMON		= ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |

					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN,



	ICH_MAP				= 0x90, /* ICH MAP register */