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

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

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

Pull libata updates from Jeff Garzik:
 "Simple stuff.  See one-line summaries."

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  pata_samsung_cf: use module_platform_driver_probe()
  [libata] Avoid specialized TLA's in ZPODD's Kconfig
  libata-acpi.c: fix copy and paste mistake in ata_acpi_register_power_resource
  sata_fsl: Remove redundant NULL check before kfree
  ahci: Add Device IDs for Intel Wellsburg PCH
  ata_piix: Add MODULE_PARM_DESC to prefer_ms_hyperv
parents df2a8f39 b186affe

drivers/ata/Kconfig

+7 −6
Original line number Diff line number Diff line
@@ -59,15 +59,16 @@ config ATA_ACPI 
	  option libata.noacpi=1



config SATA_ZPODD

	bool "SATA Zero Power ODD Support"

	bool "SATA Zero Power Optical Disc Drive (ZPODD) support"

	depends on ATA_ACPI

	default n

	help

	  This option adds support for SATA ZPODD. It requires both

	  ODD and the platform support, and if enabled, will automatically

	  power on/off the ODD when certain condition is satisfied. This

	  does not impact user's experience of the ODD, only power is saved

	  when ODD is not in use(i.e. no disc inside).

	  This option adds support for SATA Zero Power Optical Disc

	  Drive (ZPODD). It requires both the ODD and the platform

	  support, and if enabled, will automatically power on/off the

	  ODD when certain condition is satisfied. This does not impact

	  end user's experience of the ODD, only power is saved when

	  the ODD is not in use (i.e. no disc inside).



	  If unsure, say N.

drivers/ata/ahci.c

+2 −0
Original line number Diff line number Diff line
@@ -281,6 +281,8 @@ static const struct pci_device_id ahci_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, 0x1f37), board_ahci }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3e), board_ahci }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x1f3f), board_ahci }, /* Avoton RAID */

	{ PCI_VDEVICE(INTEL, 0x2823), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x2827), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d02), board_ahci }, /* Wellsburg AHCI */

	{ PCI_VDEVICE(INTEL, 0x8d04), board_ahci }, /* Wellsburg RAID */

	{ PCI_VDEVICE(INTEL, 0x8d06), board_ahci }, /* Wellsburg RAID */

drivers/ata/ata_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -1547,6 +1547,10 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev) 


static int prefer_ms_hyperv = 1;

module_param(prefer_ms_hyperv, int, 0);

MODULE_PARM_DESC(prefer_ms_hyperv,

	"Prefer Hyper-V paravirtualization drivers instead of ATA, "

	"0 - Use ATA drivers, "

	"1 (Default) - Use the paravirtualization drivers.");



static void piix_ignore_devices_quirk(struct ata_host *host)

{

drivers/ata/libata-acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1027,7 +1027,7 @@ static void ata_acpi_register_power_resource(struct ata_device *dev) 


	handle = ata_dev_acpi_handle(dev);

	if (handle)

		acpi_dev_pm_remove_dependent(handle, &sdev->sdev_gendev);

		acpi_dev_pm_add_dependent(handle, &sdev->sdev_gendev);

}



static void ata_acpi_unregister_power_resource(struct ata_device *dev)

drivers/ata/pata_samsung_cf.c

+1 −12
Original line number Diff line number Diff line
@@ -661,18 +661,7 @@ static struct platform_driver pata_s3c_driver = { 
	},

};



static int __init pata_s3c_init(void)

{

	return platform_driver_probe(&pata_s3c_driver, pata_s3c_probe);

}



static void __exit pata_s3c_exit(void)

{

	platform_driver_unregister(&pata_s3c_driver);

}



module_init(pata_s3c_init);

module_exit(pata_s3c_exit);

module_platform_driver_probe(pata_s3c_driver, pata_s3c_probe);



MODULE_AUTHOR("Abhilash Kesavan, <a.kesavan@samsung.com>");

MODULE_DESCRIPTION("low-level driver for Samsung PATA controller");