From 713a5ee426303fc86d66a967da3236f0acf8895b Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 16 Apr 2007 20:45:12 +0000 Subject: [PATCH] Fix N800 booting Fix bad extern patch and undo some automerge damage to io.c Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/io.c | 44 ++----------------------- include/asm-arm/arch-omap/board-nokia.h | 17 +++++----- 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 5fa7fc2be03..871fde3f02b 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -42,48 +42,10 @@ static struct map_desc omap2_io_desc[] __initdata = { .length = L3_24XX_SIZE, .type = MT_DEVICE }, -#ifdef CONFIG_ARCH_OMAP2430 { - .virtual = L4_WK_243X_VIRT, - .pfn = __phys_to_pfn(L4_WK_243X_PHYS), - .length = L4_WK_243X_SIZE, - .type = MT_DEVICE - }, - { - .virtual = OMAP243X_GPMC_VIRT, - .pfn = __phys_to_pfn(OMAP243X_GPMC_PHYS), - .length = OMAP243X_GPMC_SIZE, - .type = MT_DEVICE - }, - { - .virtual = OMAP243X_SDRC_VIRT, - .pfn = __phys_to_pfn(OMAP243X_SDRC_PHYS), - .length = OMAP243X_SDRC_SIZE, - .type = MT_DEVICE - }, - { - .virtual = OMAP243X_SMS_VIRT, - .pfn = __phys_to_pfn(OMAP243X_SMS_PHYS), - .length = OMAP243X_SMS_SIZE, - .type = MT_DEVICE - }, -#endif - { - .virtual = DSP_MEM_24XX_VIRT, - .pfn = __phys_to_pfn(DSP_MEM_24XX_PHYS), - .length = DSP_MEM_24XX_SIZE, - .type = MT_DEVICE - }, - { - .virtual = DSP_IPI_24XX_VIRT, - .pfn = __phys_to_pfn(DSP_IPI_24XX_PHYS), - .length = DSP_IPI_24XX_SIZE, - .type = MT_DEVICE - }, - { - .virtual = DSP_MMU_24XX_VIRT, - .pfn = __phys_to_pfn(DSP_MMU_24XX_PHYS), - .length = DSP_MMU_24XX_SIZE, + .virtual = L4_24XX_VIRT, + .pfn = __phys_to_pfn(L4_24XX_PHYS), + .length = L4_24XX_SIZE, .type = MT_DEVICE }, #ifdef CONFIG_ARCH_OMAP2430 diff --git a/include/asm-arm/arch-omap/board-nokia.h b/include/asm-arm/arch-omap/board-nokia.h index a1ee877f450..010eb052e36 100644 --- a/include/asm-arm/arch-omap/board-nokia.h +++ b/include/asm-arm/arch-omap/board-nokia.h @@ -11,13 +11,15 @@ #include -extern void __init n800_flash_init(void); -extern void __init n800_mmc_init(void); -extern void __init n800_bt_init(void); -extern void __init n800_audio_init(struct tsc2301_platform_data *); -extern void __init n800_dsp_init(void); -extern void __init n800_usb_init(void); -extern void __init n800_pm_init(void); +struct tsc2301_platform_data; +struct dsp_kfunc_device; +extern void n800_bt_init(void); +extern void n800_dsp_init(void); +extern void n800_flash_init(void); +extern void n800_mmc_init(void); +extern void n800_pm_init(void); +extern void n800_usb_init(void); +extern void n800_audio_init(struct tsc2301_platform_data *); extern int n800_audio_enable(struct dsp_kfunc_device *kdev, int stage); extern int n800_audio_disable(struct dsp_kfunc_device *kdev, int stage); extern void n800_mmc_slot1_cover_handler(void *arg, int state); @@ -27,7 +29,6 @@ extern void n800_mmc_slot1_cover_handler(void *arg, int state); #define OMAP_TAG_CBUS 0x4e03 #define OMAP_TAG_EM_ASIC_BB5 0x4e04 - #define BT_CHIP_CSR 1 #define BT_CHIP_TI 2 -- 2.41.1