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

Commit 28c8f3b4 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] sata_sil24: rename PMP related constants 



Rename PMP related constants for consistency.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 309afcb5

drivers/ata/sata_sil24.c

+7 −6
Original line number Diff line number Diff line
@@ -100,10 +100,10 @@ enum { 
	 */

	PORT_REGS_SIZE		= 0x2000,



	PORT_LRAM		= 0x0000, /* 31 LRAM slots and PM regs */

	PORT_LRAM		= 0x0000, /* 31 LRAM slots and PMP regs */

	PORT_LRAM_SLOT_SZ	= 0x0080, /* 32 bytes PRB + 2 SGE, ACT... */



	PORT_PM			= 0x0f80, /* 8 bytes PM * 16 (128 bytes) */

	PORT_PMP		= 0x0f80, /* 8 bytes PMP * 16 (128 bytes) */

		/* 32 bit regs */

	PORT_CTRL_STAT		= 0x1000, /* write: ctrl-set, read: stat */

	PORT_CTRL_CLR		= 0x1004, /* write: ctrl-clear */
@@ -139,9 +139,9 @@ enum { 
	PORT_CS_INIT		= (1 << 2), /* port initialize */

	PORT_CS_IRQ_WOC		= (1 << 3), /* interrupt write one to clear */

	PORT_CS_CDB16		= (1 << 5), /* 0=12b cdb, 1=16b cdb */

	PORT_CS_RESUME		= (1 << 6), /* port resume */

	PORT_CS_PMP_RESUME	= (1 << 6), /* PMP resume */

	PORT_CS_32BIT_ACTV	= (1 << 10), /* 32-bit activation */

	PORT_CS_PM_EN		= (1 << 13), /* port multiplier enable */

	PORT_CS_PMP_EN		= (1 << 13), /* port multiplier enable */

	PORT_CS_RDY		= (1 << 31), /* port ready to accept commands */



	/* PORT_IRQ_STAT/ENABLE_SET/CLR */
@@ -562,7 +562,7 @@ static int sil24_softreset(struct ata_port *ap, unsigned int *class) 


	/* do SRST */

	prb->ctrl = cpu_to_le16(PRB_CTRL_SRST);

	prb->fis[1] = 0; /* no PM yet */

	prb->fis[1] = 0; /* no PMP yet */



	writel((u32)paddr, port + PORT_CMD_ACTIVATE);

	writel((u64)paddr >> 32, port + PORT_CMD_ACTIVATE + 4);
@@ -1050,7 +1050,8 @@ static void sil24_init_controller(struct pci_dev *pdev, int n_ports, 
		writel(PORT_CS_32BIT_ACTV, port + PORT_CTRL_CLR);



		/* Clear port multiplier enable and resume bits */

		writel(PORT_CS_PM_EN | PORT_CS_RESUME, port + PORT_CTRL_CLR);

		writel(PORT_CS_PMP_EN | PORT_CS_PMP_RESUME,

		       port + PORT_CTRL_CLR);

	}



	/* Turn on interrupts */