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

Commit c5dd43ec authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_MMIO host flag (take 2) 



* Add IDE_HFLAG_MMIO host flag and set it for hosts which use
  default_hwif_mmiops().

v2:
* Fix kernel panic in pmac host driver (',' should be '|').

  Thanks to Kamalesh for reporting it + testing the fix
  and to Andrew for hinting me about the source of the issue.

Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f04ff9cb

drivers/ide/arm/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static const struct ide_port_info icside_v6_port_info __initdata = { 
	.init_dma		= icside_dma_off_init,

	.port_ops		= &icside_v6_no_dma_port_ops,

	.dma_ops		= &icside_v6_dma_ops,

	.host_flags		= IDE_HFLAG_SERIALIZE,

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_MMIO,

	.mwdma_mask		= ATA_MWDMA2,

	.swdma_mask		= ATA_SWDMA2,

};

drivers/ide/arm/palm_bk3710.c

+1 −0
Original line number Diff line number Diff line
@@ -342,6 +342,7 @@ static const struct ide_port_ops palm_bk3710_ports_ops = { 
static const struct ide_port_info __devinitdata palm_bk3710_port_info = {

	.init_dma		= palm_bk3710_init_dma,

	.port_ops		= &palm_bk3710_ports_ops,

	.host_flags		= IDE_HFLAG_MMIO,

	.pio_mask		= ATA_PIO4,

	.udma_mask		= ATA_UDMA4,	/* (input clk 99MHz) */

	.mwdma_mask		= ATA_MWDMA2,

drivers/ide/arm/rapide.c

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) 


		ide_init_port_hw(hwif, &hw);



		hwif->host_flags = IDE_HFLAG_MMIO;

		default_hwif_mmiops(hwif);



		idx[0] = hwif->index;

drivers/ide/legacy/ide_platform.c

+3 −1
Original line number Diff line number Diff line
@@ -101,8 +101,10 @@ static int __devinit plat_ide_probe(struct platform_device *pdev) 


	ide_init_port_hw(hwif, &hw);



	if (mmio)

	if (mmio) {

		hwif->host_flags = IDE_HFLAG_MMIO;

		default_hwif_mmiops(hwif);

	}



	idx[0] = hwif->index;

drivers/ide/mips/swarm.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static int __devinit swarm_ide_probe(struct device *dev) 
	base = ioremap(offset, size);



	/* Setup MMIO ops.  */

	hwif->host_flags = IDE_HFLAG_MMIO;

	default_hwif_mmiops(hwif);



	hwif->chipset = ide_generic;