Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more icside breakage (from next ide merge)

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro 2008-04-28 06:59:25 +01:00 committed by Linus Torvalds
parent b750568053
commit 7d896e0b8e
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/ide/arm/icside.c
View file

@ -419,17 +419,19 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
hwif = ide_find_port(); hwif = ide_find_port();
if (hwif) { if (hwif) {
int i;
/* /*
* Ensure we're using MMIO * Ensure we're using MMIO
*/ */
default_hwif_mmiops(hwif); default_hwif_mmiops(hwif);
for (i = 0; i <= 7; i++) { hwif->io_ports.data_addr = port;
hwif->io_ports_array[i] = port; hwif->io_ports.error_addr = port + (1 << info->stepping);
port += 1 << info->stepping; hwif->io_ports.nsect_addr = port + (2 << info->stepping);
} hwif->io_ports.lbal_addr = port + (3 << info->stepping);
hwif->io_ports.lbam_addr = port + (4 << info->stepping);
hwif->io_ports.lbah_addr = port + (5 << info->stepping);
hwif->io_ports.device_addr = port + (6 << info->stepping);
hwif->io_ports.status_addr = port + (7 << info->stepping);
hwif->io_ports.ctl_addr = hwif->io_ports.ctl_addr =
(unsigned long)base + info->ctrloffset; (unsigned long)base + info->ctrloffset;
hwif->irq = ec->irq; hwif->irq = ec->irq;