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

Commit bd7fc2f2 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: (49 commits)
  libata-sff: separate out BMDMA qc_issue
  libata-sff: prd is BMDMA specific
  libata-sff: ata_sff_[dumb_]qc_prep are BMDMA specific
  libata-sff: separate out BMDMA EH
  libata-sff: port_task is SFF specific
  libata-sff: ap->[last_]ctl are SFF specific
  libata-sff: rename ap->ops->drain_fifo() to sff_drain_fifo()
  libata-sff: introduce ata_sff_init/exit() and ata_sff_port_init()
  libata-sff: clean up BMDMA initialization
  libata-sff: clean up inheritance in several drivers
  libata-sff: reorder SFF/BMDMA functions
  sata_inic162x: kill PORT_PRD_ADDR initialization
  libata: kill ATA_FLAG_DISABLED
  libata-sff: kill unused prototype and make ata_dev_select() static
  libata-sff: update bmdma host bus error handling
  sata_mv: remove unnecessary initialization
  sata_inic162x: inic162x is not dependent on CONFIG_ATA_SFF
  pata_sch: use ata_pci_sff_init_one()
  pata_sil680: Do our own exec_command posting
  libata: Remove excess delay in the tf_load path
  ...
parents f39d01be 360ff783

Documentation/DocBook/libata.tmpl

+14 −4
Original line number Diff line number Diff line
@@ -81,16 +81,14 @@ void (*port_disable) (struct ata_port *); 
	</programlisting>



	<para>

	Called from ata_bus_probe() and ata_bus_reset() error paths,

	as well as when unregistering from the SCSI module (rmmod, hot

	unplug).

	Called from ata_bus_probe() error path, as well as when

	unregistering from the SCSI module (rmmod, hot unplug).

	This function should do whatever needs to be done to take the

	port out of use.  In most cases, ata_port_disable() can be used

	as this hook.

	</para>

	<para>

	Called from ata_bus_probe() on a failed probe.

	Called from ata_bus_reset() on a failed bus reset.

	Called from ata_scsi_release().

	</para>
@@ -227,6 +225,18 @@ u8 (*sff_check_altstatus)(struct ata_port *ap); 


	</sect2>



	<sect2><title>Write specific ATA shadow register</title>

	<programlisting>

void (*sff_set_devctl)(struct ata_port *ap, u8 ctl);

	</programlisting>



	<para>

	Write the device control ATA shadow register to the hardware.

	Most drivers don't need to define this.

	</para>



	</sect2>



	<sect2><title>Select ATA device on bus</title>

	<programlisting>

void (*sff_dev_select)(struct ata_port *ap, unsigned int device);

drivers/ata/Kconfig

+14 −6
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ config SATA_AHCI 


	  If unsure, say N.



config SATA_AHCI_PLATFORM

	tristate "Platform AHCI SATA support"

	help

	  This option enables support for Platform AHCI Serial ATA

	  controllers.



	  If unsure, say N.



config SATA_SIL24

	tristate "Silicon Image 3124/3132 SATA support"

	depends on PCI
@@ -73,6 +81,12 @@ config SATA_SIL24 


	  If unsure, say N.



config SATA_INIC162X

	tristate "Initio 162x SATA support"

	depends on PCI

	help

	  This option enables support for Initio 162x Serial ATA.



config SATA_FSL

	tristate "Freescale 3.0Gbps SATA support"

	depends on FSL_SOC
@@ -213,12 +227,6 @@ config SATA_VITESSE 


	  If unsure, say N.



config SATA_INIC162X

	tristate "Initio 162x SATA support"

	depends on PCI

	help

	  This option enables support for Initio 162x Serial ATA.



config PATA_ACPI

	tristate "ACPI firmware driver for PATA"

	depends on ATA_ACPI

drivers/ata/Makefile

+2 −1
Original line number Diff line number Diff line 


obj-$(CONFIG_ATA)		+= libata.o



obj-$(CONFIG_SATA_AHCI)		+= ahci.o

obj-$(CONFIG_SATA_AHCI)		+= ahci.o libahci.o

obj-$(CONFIG_SATA_AHCI_PLATFORM) += ahci_platform.o libahci.o

obj-$(CONFIG_SATA_SVW)		+= sata_svw.o

obj-$(CONFIG_ATA_PIIX)		+= ata_piix.o

obj-$(CONFIG_SATA_PROMISE)	+= sata_promise.o