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

Commit 6ea4fa70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata updates from Tejun Heo:
 "Nothing too interesting - another ahci platform driver variant,
  additional controller support, minor fixes and cleanups"

* 'for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  ahci: Add Device ID for HighPoint RocketRaid 642L
  ata: ep93xx: use dmaengine_prep_slave_sg api instead of internal callback
  ahci: add PCI ID for Marvell 88SE91A0 SATA Controller
  sata_fsl: remove check for CONFIG_MPC8315_DS
  ahci: add support for Hisilicon sata
  libahci_platform: add host_flags parameter in ahci_platform_init_host()
  ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
  ata: use CONFIG_PM_SLEEP instead of CONFIG_PM where applicable in host drivers
  ata: ahci_mvebu: new driver for Marvell Armada 380 AHCI interfaces
  Documentation: dt-bindings: reformat and order list of ahci-platform compatibles
  libata-sff: remove dead code
  ata: SATL compliance for Inquiry Product Revision
  pata_octeon_cf: use devm_kzalloc() to allocate cf_port
parents da85d191 d2518365

Documentation/devicetree/bindings/ata/ahci-platform.txt

+10 −4
Original line number Diff line number Diff line
@@ -4,10 +4,16 @@ SATA nodes are defined to describe on-chip Serial ATA controllers. 
Each SATA controller should have its own node.



Required properties:

- compatible        : compatible list, one of "snps,spear-ahci",

                      "snps,exynos5440-ahci", "ibm,476gtr-ahci",

                      "allwinner,sun4i-a10-ahci", "fsl,imx53-ahci"

                      "fsl,imx6q-ahci" or "snps,dwc-ahci"

- compatible        : compatible string, one of:

  - "allwinner,sun4i-a10-ahci"

  - "fsl,imx53-ahci"

  - "fsl,imx6q-ahci"

  - "hisilicon,hisi-ahci"

  - "ibm,476gtr-ahci"

  - "marvell,armada-380-ahci"

  - "snps,dwc-ahci"

  - "snps,exynos5440-ahci"

  - "snps,spear-ahci"

- interrupts        : <interrupt mapping for SATA IRQ>

- reg               : <registers mapping>

drivers/ata/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -123,6 +123,15 @@ config AHCI_IMX 


	  If unsure, say N.



config AHCI_MVEBU

	tristate "Marvell EBU AHCI SATA support"

	depends on ARCH_MVEBU

	help

	  This option enables support for the Marvebu EBU SoC's

	  onboard AHCI SATA.



	  If unsure, say N.



config AHCI_SUNXI

	tristate "Allwinner sunxi AHCI SATA support"

	depends on ARCH_SUNXI

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 
obj-$(CONFIG_SATA_HIGHBANK)	+= sata_highbank.o libahci.o

obj-$(CONFIG_AHCI_DA850)	+= ahci_da850.o libahci.o libahci_platform.o

obj-$(CONFIG_AHCI_IMX)		+= ahci_imx.o libahci.o libahci_platform.o

obj-$(CONFIG_AHCI_MVEBU)	+= ahci_mvebu.o libahci.o libahci_platform.o

obj-$(CONFIG_AHCI_SUNXI)	+= ahci_sunxi.o libahci.o libahci_platform.o

obj-$(CONFIG_AHCI_ST)		+= ahci_st.o libahci.o libahci_platform.o

obj-$(CONFIG_AHCI_XGENE)	+= ahci_xgene.o libahci.o libahci_platform.o

drivers/ata/acard-ahci.c

+3 −3
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static bool acard_ahci_qc_fill_rtf(struct ata_queued_cmd *qc); 
static int acard_ahci_port_start(struct ata_port *ap);

static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);

static int acard_ahci_pci_device_resume(struct pci_dev *pdev);

#endif
@@ -118,13 +118,13 @@ static struct pci_driver acard_ahci_pci_driver = { 
	.id_table		= acard_ahci_pci_tbl,

	.probe			= acard_ahci_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	.suspend		= acard_ahci_pci_device_suspend,

	.resume			= acard_ahci_pci_device_resume,

#endif

};



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	struct ata_host *host = pci_get_drvdata(pdev);

drivers/ata/ahci.c

+4 −0
Original line number Diff line number Diff line
@@ -445,10 +445,14 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9192),

	  .driver_data = board_ahci_yes_fbs },			/* 88se9172 on some Gigabyte */

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0),

	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x91a3),

	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL_EXT, 0x9230),

	  .driver_data = board_ahci_yes_fbs },

	{ PCI_DEVICE(PCI_VENDOR_ID_TTI, 0x0642),

	  .driver_data = board_ahci_yes_fbs },



	/* Promise */

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