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

Commit 09a3e791 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: make m68k host drivers use IDE_HFLAG_MMIO 



Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent e354c1d8

drivers/ide/buddha.c

+1 −5
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, 
}



static const struct ide_port_info buddha_port_info = {

	.host_flags		= IDE_HFLAG_NO_DMA,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

};



    /*
@@ -176,10 +176,6 @@ static int __init buddha_init(void) 
		

		board = z->resource.start;



/*

 * FIXME: we now have selectable mmio v/s iomio transports.

 */



		if(type != BOARD_XSURF) {

			if (!request_mem_region(board+BUDDHA_BASE1, 0x800, "IDE"))

				continue;

drivers/ide/falconide.c

+2 −1
Original line number Diff line number Diff line
@@ -103,7 +103,8 @@ static const struct ide_port_info falconide_port_info = { 
	.get_lock		= falconide_get_lock,

	.release_lock		= falconide_release_lock,

	.tp_ops			= &falconide_tp_ops,

	.host_flags		= IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_DMA,

};



static void __init falconide_setup_ports(hw_regs_t *hw)

drivers/ide/gayle.c

+2 −4
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ static void __init gayle_setup_ports(hw_regs_t *hw, unsigned long base, 
}



static const struct ide_port_info gayle_port_info = {

	.host_flags		= IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_DMA,

};



    /*
@@ -163,9 +164,6 @@ static int __init gayle_init(void) 
	    irqport = (unsigned long)ZTWO_VADDR(GAYLE_IRQ_1200);

	    ack_intr = gayle_ack_intr_a1200;

	}

/*

 * FIXME: we now have selectable modes between mmio v/s iomio

 */



	res_start = ((unsigned long)phys_base) & ~(GAYLE_NEXT_PORT-1);

	res_n = GAYLE_IDEREG_SIZE;

drivers/ide/macide.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base, 
}



static const struct ide_port_info macide_port_info = {

	.host_flags		= IDE_HFLAG_NO_DMA,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

};



static const char *mac_ide_name[] =

drivers/ide/q40ide.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static const struct ide_tp_ops q40ide_tp_ops = { 


static const struct ide_port_info q40ide_port_info = {

	.tp_ops			= &q40ide_tp_ops,

	.host_flags		= IDE_HFLAG_NO_DMA,

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

};



/*