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

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

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

parents 87129d96 ca20aa69

drivers/scsi/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -459,6 +459,15 @@ config SCSI_ATA_PIIX 


	  If unsure, say N.



config SCSI_SATA_MV

	tristate "Marvell SATA support"

	depends on SCSI_SATA && PCI && EXPERIMENTAL

	help

	  This option enables support for the Marvell Serial ATA family.

	  Currently supports 88SX[56]0[48][01] chips.



	  If unsure, say N.



config SCSI_SATA_NV

	tristate "NVIDIA SATA support"

	depends on SCSI_SATA && PCI && EXPERIMENTAL

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ obj-$(CONFIG_SCSI_SATA_SIS) += libata.o sata_sis.o 
obj-$(CONFIG_SCSI_SATA_SX4)	+= libata.o sata_sx4.o

obj-$(CONFIG_SCSI_SATA_NV)	+= libata.o sata_nv.o

obj-$(CONFIG_SCSI_SATA_ULI)	+= libata.o sata_uli.o

obj-$(CONFIG_SCSI_SATA_MV)	+= libata.o sata_mv.o



obj-$(CONFIG_ARM)		+= arm/

drivers/scsi/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ static struct ata_port_info ahci_port_info[] = { 
		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |

				  ATA_FLAG_PIO_DMA,

		.pio_mask	= 0x03, /* pio3-4 */

		.pio_mask	= 0x1f, /* pio0-4 */

		.udma_mask	= 0x7f, /* udma0-6 ; FIXME */

		.port_ops	= &ahci_ops,

	},

drivers/scsi/sata_mv.c

0 → 100644
+843 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/scsi/sata_uli.c

+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ static struct ata_port_info uli_port_info = { 
	.sht            = &uli_sht,

	.host_flags     = ATA_FLAG_SATA | ATA_FLAG_SATA_RESET |

			  ATA_FLAG_NO_LEGACY,

	.pio_mask       = 0x03,		//support pio mode 4 (FIXME)

	.udma_mask      = 0x7f,		//support udma mode 6

	.pio_mask       = 0x1f,		/* pio0-4 */

	.udma_mask      = 0x7f,		/* udma0-6 */

	.port_ops       = &uli_ops,

};