xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'devel-map-io' into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-08-04 14:43:45 +03:00
parent 7e788b4289 869fef4154
commit 7590d1defd
514 changed files with 18478 additions and 6618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-omap2/board-3630sdp.c
View File

@@ -66,12 +66,6 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.reset_gpio_port[2] = -EINVAL
};
static void __init omap_sdp_map_io(void)
{
omap2_set_globals_36xx();
omap34xx_map_common_io();
}
static struct omap_board_config_kernel sdp_config[] __initdata = {
};
@@ -226,7 +220,8 @@ MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
.phys_io = 0x48000000,
.io_pg_offst = ((0xfa000000) >> 18) & 0xfffc,
.boot_params = 0x80000100,
.map_io = omap_sdp_map_io,
.map_io = omap3_map_io,
.reserve = omap_reserve,
.init_irq = omap_sdp_init_irq,
.init_machine = omap_sdp_init,
.timer = &omap_timer,