Commit 248ca85f authored by Ilya Yanok's avatar Ilya Yanok Committed by Sascha Hauer
Browse files

qong: remove AIPS[12] mappings from machine-specific iotable 



AIPS[12] are no mapped from generic MX3 code so we don't need to
map them from machine-specific map_io function anymore.

Signed-off-by: default avatarIlya Yanok <yanok@emcraft.com>
parent 9070e7af

arch/arm/mach-mx3/qong.c

+1 −27
Original line number Diff line number Diff line
@@ -250,32 +250,6 @@ static void __init qong_init_fpga(void) 
	qong_init_dnet();

}



/*

 * This structure defines the MX31 memory map.

 */

static struct map_desc qong_io_desc[] __initdata = {

	{

		.virtual = AIPS1_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(AIPS1_BASE_ADDR),

		.length = AIPS1_SIZE,

		.type = MT_DEVICE_NONSHARED

	}, {

		.virtual = AIPS2_BASE_ADDR_VIRT,

		.pfn = __phys_to_pfn(AIPS2_BASE_ADDR),

		.length = AIPS2_SIZE,

		.type = MT_DEVICE_NONSHARED

	}

};



/*

 * Set up static virtual mappings.

 */

static void __init qong_map_io(void)

{

	mxc_map_io();

	iotable_init(qong_io_desc, ARRAY_SIZE(qong_io_desc));

}



/*

 * Board specific initialization.

 */
@@ -305,7 +279,7 @@ MACHINE_START(QONG, "Dave/DENX QongEVB-LITE") 
	.phys_io        = AIPS1_BASE_ADDR,

	.io_pg_offst    = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,

	.boot_params    = PHYS_OFFSET + 0x100,

	.map_io         = qong_map_io,

	.map_io         = mxc_map_io,

	.init_irq       = mxc_init_irq,

	.init_machine   = mxc_board_init,

	.timer          = &qong_timer,