From 070a73d466712da28ba8b870fddec7c6220ed49f Mon Sep 17 00:00:00 2001 From: Olav Kongas Date: Thu, 28 Jul 2005 03:26:12 -0700 Subject: [PATCH] [PATCH] ARM: OMAP: [PATCH] IO mappings for omap16xx chips Here comes the updated patch, extending the mapping for all 16xx omap chips and combining the identical mapping for 5912. Patch modified to test for 16xx only. Also renamed omap1610_io_desc to omap16xx_io_desc. --- arch/arm/mach-omap1/io.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 6981a2a6aa2..eb8261d7dea 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -44,12 +44,7 @@ static struct map_desc omap1510_io_desc[] __initdata = { #endif #if defined(CONFIG_ARCH_OMAP16XX) -static struct map_desc omap1610_io_desc[] __initdata = { - { OMAP16XX_DSP_BASE, OMAP16XX_DSP_START, OMAP16XX_DSP_SIZE, MT_DEVICE }, - { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE }, -}; - -static struct map_desc omap5912_io_desc[] __initdata = { +static struct map_desc omap16xx_io_desc[] __initdata = { { OMAP16XX_DSP_BASE, OMAP16XX_DSP_START, OMAP16XX_DSP_SIZE, MT_DEVICE }, { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE }, }; @@ -77,11 +72,8 @@ static void __init _omap_map_io(void) } #endif #if defined(CONFIG_ARCH_OMAP16XX) - if (cpu_is_omap1610() || cpu_is_omap1710()) { - iotable_init(omap1610_io_desc, ARRAY_SIZE(omap1610_io_desc)); - } - if (cpu_is_omap5912()) { - iotable_init(omap5912_io_desc, ARRAY_SIZE(omap5912_io_desc)); + if (cpu_is_omap16xx()) { + iotable_init(omap16xx_io_desc, ARRAY_SIZE(omap16xx_io_desc)); } #endif -- 2.41.1