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

Commit 81c2af35 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] sata_sil: replace sil_3112_m15w board id with sil_3112 



All 3112's have m15w.  Replace sil_3112_m15w with sil_3112 and flag
sil_3112 with SIL_FLAG_MOD15WRITE.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Cc: Carlos Pardo <Carlos.Pardo@siliconimage.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 219e6214

drivers/scsi/sata_sil.c

+7 −18
Original line number Diff line number Diff line
@@ -53,9 +53,8 @@ enum { 
	SIL_FLAG_MOD15WRITE	= (1 << 30),



	sil_3112		= 0,

	sil_3112_m15w		= 1,

	sil_3512		= 2,

	sil_3114		= 3,

	sil_3512		= 1,

	sil_3114		= 2,



	SIL_FIFO_R0		= 0x40,

	SIL_FIFO_W0		= 0x41,
@@ -90,13 +89,13 @@ static void sil_post_set_mode (struct ata_port *ap); 




static const struct pci_device_id sil_pci_tbl[] = {

	{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },

	{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },

	{ 0x1095, 0x3112, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1095, 0x0240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1095, 0x3512, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3512 },

	{ 0x1095, 0x3114, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3114 },

	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },

	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },

	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112_m15w },

	{ 0x1002, 0x436e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1002, 0x4379, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ 0x1002, 0x437a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, sil_3112 },

	{ }	/* terminate list */

};
@@ -179,16 +178,6 @@ static const struct ata_port_operations sil_ops = { 


static const struct ata_port_info sil_port_info[] = {

	/* sil_3112 */

	{

		.sht		= &sil_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

				  ATA_FLAG_MMIO,

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

		.mwdma_mask	= 0x07,			/* mwdma0-2 */

		.udma_mask	= 0x3f,			/* udma0-5 */

		.port_ops	= &sil_ops,

	},

	/* sil_3112_15w - keep it sync'd w/ sil_3112 */

	{

		.sht		= &sil_sht,

		.host_flags	= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |