Skip to content

Commit

Permalink
qong: remove AIPS[12] mappings from machine-specific iotable
Browse files Browse the repository at this point in the history
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: Ilya Yanok <yanok@emcraft.com>
  • Loading branch information
Ilya Yanok authored and Sascha Hauer committed Apr 16, 2009
1 parent 9070e7a commit 248ca85
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions arch/arm/mach-mx3/qong.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 248ca85

Please sign in to comment.