aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/ata_piix.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2007-11-24 07:16:07 -0500
committerJeff Garzik <jeff@garzik.org>2008-01-23 05:24:12 -0500
commit9cde9ed151e170f2e2a530f7ec0032dfbe9f443b (patch)
tree4a29944e4969e2334817765a78fba34d7c4f59c3 /drivers/ata/ata_piix.c
parent46a671430dfa4ca59c7a69f01326e99edddb21bd (diff)
ata_piix: separate controller IDs into separate enum
Separate controller IDs into a separate enum as Jeff requested. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/ata_piix.c')
-rw-r--r--drivers/ata/ata_piix.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 0d8bd19a5345..2db635817edf 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -118,22 +118,6 @@ enum {
118 PIIX_80C_PRI = (1 << 5) | (1 << 4), 118 PIIX_80C_PRI = (1 << 5) | (1 << 4),
119 PIIX_80C_SEC = (1 << 7) | (1 << 6), 119 PIIX_80C_SEC = (1 << 7) | (1 << 6),
120 120
121 /* controller IDs */
122 piix_pata_mwdma = 0, /* PIIX3 MWDMA only */
123 piix_pata_33, /* PIIX4 at 33Mhz */
124 ich_pata_33, /* ICH up to UDMA 33 only */
125 ich_pata_66, /* ICH up to 66 Mhz */
126 ich_pata_100, /* ICH up to UDMA 100 */
127 ich5_sata,
128 ich6_sata,
129 ich6_sata_ahci,
130 ich6m_sata_ahci,
131 ich8_sata_ahci,
132 ich8_2port_sata,
133 ich8m_apple_sata_ahci, /* locks up on second port enable */
134 tolapai_sata_ahci,
135 piix_pata_vmw, /* PIIX4 for VMware, spurious DMA_ERR */
136
137 /* constants for mapping table */ 121 /* constants for mapping table */
138 P0 = 0, /* port 0 */ 122 P0 = 0, /* port 0 */
139 P1 = 1, /* port 1 */ 123 P1 = 1, /* port 1 */
@@ -149,6 +133,24 @@ enum {
149 PIIX_HOST_BROKEN_SUSPEND = (1 << 24), 133 PIIX_HOST_BROKEN_SUSPEND = (1 << 24),
150}; 134};
151 135
136enum piix_controller_ids {
137 /* controller IDs */
138 piix_pata_mwdma, /* PIIX3 MWDMA only */
139 piix_pata_33, /* PIIX4 at 33Mhz */
140 ich_pata_33, /* ICH up to UDMA 33 only */
141 ich_pata_66, /* ICH up to 66 Mhz */
142 ich_pata_100, /* ICH up to UDMA 100 */
143 ich5_sata,
144 ich6_sata,
145 ich6_sata_ahci,
146 ich6m_sata_ahci,
147 ich8_sata_ahci,
148 ich8_2port_sata,
149 ich8m_apple_sata_ahci, /* locks up on second port enable */
150 tolapai_sata_ahci,
151 piix_pata_vmw, /* PIIX4 for VMware, spurious DMA_ERR */
152};
153
152struct piix_map_db { 154struct piix_map_db {
153 const u32 mask; 155 const u32 mask;
154 const u16 port_enable; 156 const u16 port_enable;