public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
* [RFC] io.c for OMAP3430
@ 2007-05-30  4:12 Syed Mohammed, Khasim
  2007-05-30 13:41 ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Syed Mohammed, Khasim @ 2007-05-30  4:12 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: Linux OMAP

Hi Tony,

I have incorporated your review comments for io.c. 

Please do let me know if you find any further issues.

I have incorporated other review comments from Andrew and Trilok, will regenerate and publish
the patch set once we agree upon these (irq.c and io.c) patch set.

Regards,
Khasim

================================================================================
--- linux-omap/arch/arm/mach-omap2/io.c	2007-05-16 14:32:40.000000000 -0500
+++ val_3430_GIT/arch/arm/mach-omap2/io.c	2007-05-29 22:57:44.000000000 -0500
@@ -4,8 +4,11 @@
  * OMAP2 I/O mapping code
  *
  * Copyright (C) 2005 Nokia Corporation
- * Author: Juha Yrjola<juha.yrjola@nokia.com>
- * Updated map desc to add 2430 support : <x0khasim@ti.com>
+ * Copyright (C) 2007 Texas Instruments
+ *
+ * Author:
+ *	Juha Yrjola <juha.yrjola@nokia.com>
+ *	Syed Khasim <x0khasim@ti.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -35,6 +38,7 @@ extern void omapfb_reserve_sdram(void);
  * The machine specific code may provide the extra mapping besides the
  * default mapping provided here.
  */
+#ifdef CONFIG_ARCH_OMAP24XX
 static struct map_desc omap2_io_desc[] __initdata = {
 	{
 		.virtual	= L3_24XX_VIRT,
@@ -95,6 +99,60 @@ static struct map_desc omap2_io_desc[] _
 		.type		= MT_DEVICE
 	},
 };
+#endif
+
+#ifdef	CONFIG_ARCH_OMAP34XX
+static struct map_desc omap2_io_desc[] __initdata = {
+	{
+		.virtual	= L3_34XX_VIRT,
+		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
+		.length		= L3_34XX_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= L4_34XX_VIRT,
+		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
+		.length		= L4_34XX_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= L4_WK_34XX_VIRT,
+		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),
+		.length		= L4_WK_34XX_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= OMAP34XX_GPMC_VIRT,
+		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
+		.length		= OMAP34XX_GPMC_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= OMAP343X_SMS_VIRT,
+		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
+		.length		= OMAP343X_SMS_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= OMAP343X_SDRC_VIRT,
+		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
+		.length		= OMAP343X_SDRC_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= L4_PER_34XX_VIRT,
+		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),
+		.length		= L4_PER_34XX_SIZE,
+		.type		= MT_DEVICE
+	},
+	{
+		.virtual	= L4_EMU_34XX_VIRT,
+		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
+		.length		= L4_EMU_34XX_SIZE,
+		.type		= MT_DEVICE
+	},
+};
+#endif
 
 void __init omap2_map_common_io(void)
 {

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC] io.c for OMAP3430
  2007-05-30  4:12 [RFC] io.c for OMAP3430 Syed Mohammed, Khasim
@ 2007-05-30 13:41 ` Tony Lindgren
  2007-05-30 17:17   ` Syed Mohammed, Khasim
  0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2007-05-30 13:41 UTC (permalink / raw)
  To: Syed Mohammed, Khasim; +Cc: Linux OMAP

* Syed Mohammed, Khasim <x0khasim@ti.com> [070529 21:13]:
> Hi Tony,
> 
> I have incorporated your review comments for io.c. 
> 
> Please do let me know if you find any further issues.
> 
> I have incorporated other review comments from Andrew and Trilok, will regenerate and publish
> the patch set once we agree upon these (irq.c and io.c) patch set.

Well I was thinking we'd have different structs:

#ifdef CONFIG_ARCH_OMAP24XX
static struct map_desc omap24xx_io_desc[] __initdata = {
       ...
};
#endif

#ifdef CONFIG_ARCH_OMAP34XX
static struct map_desc omap34xx_io_desc[] __initdata = {
       ...
       };
#endif
       
void __init omap2_map_common_io(void)
{
 	if (cpu_is_omap24xx()) {
        	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
	} else if (cpu_is_omap34xx()) {
		iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
	}
	...
}

We should actually have separate one for 2420 and 2430 too to avoid
ifdefs within the structs.

Regards,

Tony

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [RFC] io.c for OMAP3430
  2007-05-30 13:41 ` Tony Lindgren
@ 2007-05-30 17:17   ` Syed Mohammed, Khasim
  2007-05-30 22:32     ` Syed Mohammed, Khasim
  0 siblings, 1 reply; 6+ messages in thread
From: Syed Mohammed, Khasim @ 2007-05-30 17:17 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: Linux OMAP

Hi Tony,

>Well I was thinking we'd have different structs:

Is this fine?

#ifdef CONFIG_ARCH_OMAP24XX
static struct map_desc omap24xx_io_desc[] __initdata = {
	{
		.virtual	= L3_24XX_VIRT,
		.pfn		= __phys_to_pfn(L3_24XX_PHYS),
		.length		= L3_24XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_24XX_VIRT,
		.pfn		= __phys_to_pfn(L4_24XX_PHYS),
		.length		= L4_24XX_SIZE,
		.type		= MT_DEVICE
	},
};

#ifdef CONFIG_ARCH_OMAP242X
static struct map_desc omap242x_io_desc[] __initdata = {
	{
		.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,
		.type		= MT_DEVICE
	},
};

static struct map_desc omap243x_io_desc[] = {};
#endif

#ifdef CONFIG_ARCH_OMAP2430
static struct map_desc omap242x_io_desc[] = {};

static struct map_desc omap243x_io_desc[] __initdata = {
	{
		.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

static struct map_desc omap34xx_io_desc[] = {};
#endif

#ifdef	CONFIG_ARCH_OMAP34XX
static struct map_desc omap24xx_io_desc[] = {};
static struct map_desc omap242x_io_desc[] = {};
static struct map_desc omap243x_io_desc[] = {};

static struct map_desc omap34xx_io_desc[] __initdata = {
	{
		.virtual	= L3_34XX_VIRT,
		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
		.length		= L3_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
		.length		= L4_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_WK_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),
		.length		= L4_WK_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP34XX_GPMC_VIRT,
		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
		.length		= OMAP34XX_GPMC_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP343X_SMS_VIRT,
		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
		.length		= OMAP343X_SMS_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP343X_SDRC_VIRT,
		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
		.length		= OMAP343X_SDRC_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_PER_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),
		.length		= L4_PER_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_EMU_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
		.length		= L4_EMU_34XX_SIZE,
		.type		= MT_DEVICE
	},
};
#endif

void __init omap2_map_common_io(void)
{
	if (cpu_is_omap24xx()) {
		iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
		if (cpu_is_omap242x()) {
			iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
		} else if (cpu_is_omap243x()) {
			iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
		}
	} else if (cpu_is_omap34xx()) {
		iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
	}
...
..
.

}

If I don't add dummy arrays for other platforms then compilation will break and we will end up adding more ifdefs in common_io() function.

Regards,
Khasim

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [RFC] io.c for OMAP3430
  2007-05-30 17:17   ` Syed Mohammed, Khasim
@ 2007-05-30 22:32     ` Syed Mohammed, Khasim
  2007-05-31  3:38       ` Syed Mohammed, Khasim
  0 siblings, 1 reply; 6+ messages in thread
From: Syed Mohammed, Khasim @ 2007-05-30 22:32 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: Linux OMAP

Hi Tony,

>	if (cpu_is_omap24xx()) {
>		iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
>		if (cpu_is_omap242x()) {
>			iotable_init(omap242x_io_desc,
>ARRAY_SIZE(omap242x_io_desc));
>		} else if (cpu_is_omap243x()) {
>			iotable_init(omap243x_io_desc,
>ARRAY_SIZE(omap243x_io_desc));
>		}
>	} else if (cpu_is_omap34xx()) {
>		iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
>	}

We cannot put this kind of check in common_io function. I was trying to validate 2420 / 2430 platforms and I found that "cpu_is_" function calls returning "0" (when "1" was expected). 

Basically the omap2_check_revision function which sets the system_rev for handling the cpu_is macro, gets called after common_io. So putting "cpu_is_" checks in common_io will not work.

I tried making omap2_check_revision as arch_init and sub_sysinit call but it didn't help, the first call for common_io happens from board file's map_io() and we can't avoid the same.

The other possibility is to explicitly call omap2_check_revision from board file's _map_io() functions. But this will have to be updated in many board files.

Any suggestions are appreciated. 

For now I can post a separate patch with #ifdef's instead of if ( cpu_is_ ) later we can work on the correct approach.

Others please review and comment on the approach.

Regards,
Khasim

^ permalink raw reply	[flat|nested] 6+ messages in thread

* RE: [RFC] io.c for OMAP3430
  2007-05-30 22:32     ` Syed Mohammed, Khasim
@ 2007-05-31  3:38       ` Syed Mohammed, Khasim
  2007-06-04 10:02         ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Syed Mohammed, Khasim @ 2007-05-31  3:38 UTC (permalink / raw)
  To: Tony Lindgren, Linux OMAP

Hi all:

>
>>		if (cpu_is_omap242x()) {
>>			iotable_init(omap242x_io_desc,
>>ARRAY_SIZE(omap242x_io_desc));
>>		} else if (cpu_is_omap243x()) {
>>			iotable_init(omap243x_io_desc,
>>ARRAY_SIZE(omap243x_io_desc));
>>		}
>We cannot put this kind of check in common_io function. I was trying to
>validate 2420 / 2430 platforms and I found that "cpu_is_" function calls
>returning "0" (when "1" was expected).

Please let me know your views on the following approach for io.c.

=========================================================================

/*
 * linux/arch/arm/mach-omap2/io.c
 *
 * OMAP2 I/O mapping code
 *
 * Copyright (C) 2005 Nokia Corporation
 * Copyright (C) 2007 Texas Instruments
 *
 * Author:
 *	Juha Yrjola <juha.yrjola@nokia.com>
 *	Syed Khasim <x0khasim@ti.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>

#include <asm/tlb.h>
#include <asm/io.h>

#include <asm/mach/map.h>

#include <asm/arch/mux.h>
#include <asm/arch/omapfb.h>

extern void omap_sram_init(void);
extern int omap2_clk_init(void);
extern void omap2_check_revision(void);
extern void omap2_init_memory(void);
extern void gpmc_init(void);
extern void omapfb_reserve_sdram(void);

/*
 * The machine specific code may provide the extra mapping besides the
 * default mapping provided here.
 */

#ifdef CONFIG_ARCH_OMAP24XX
static struct map_desc omap24xx_io_desc[] __initdata = {
	{
		.virtual	= L3_24XX_VIRT,
		.pfn		= __phys_to_pfn(L3_24XX_PHYS),
		.length		= L3_24XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_24XX_VIRT,
		.pfn		= __phys_to_pfn(L4_24XX_PHYS),
		.length		= L4_24XX_SIZE,
		.type		= MT_DEVICE
	},
};

#ifdef CONFIG_ARCH_OMAP2420
static struct map_desc omap242x_io_desc[] __initdata = {
	{
		.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,
		.type		= MT_DEVICE
	},
};

#endif

#ifdef CONFIG_ARCH_OMAP2430
static struct map_desc omap243x_io_desc[] __initdata = {
	{
		.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
#endif

#ifdef	CONFIG_ARCH_OMAP34XX
static struct map_desc omap34xx_io_desc[] __initdata = {
	{
		.virtual	= L3_34XX_VIRT,
		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
		.length		= L3_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
		.length		= L4_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_WK_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),
		.length		= L4_WK_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP34XX_GPMC_VIRT,
		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
		.length		= OMAP34XX_GPMC_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP343X_SMS_VIRT,
		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
		.length		= OMAP343X_SMS_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= OMAP343X_SDRC_VIRT,
		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
		.length		= OMAP343X_SDRC_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_PER_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),
		.length		= L4_PER_34XX_SIZE,
		.type		= MT_DEVICE
	},
	{
		.virtual	= L4_EMU_34XX_VIRT,
		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
		.length		= L4_EMU_34XX_SIZE,
		.type		= MT_DEVICE
	},
};
#endif

void __init omap2_map_common_io(void)
{
#if defined(CONFIG_ARCH_OMAP2420)
	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
#elif defined(CONFIG_ARCH_OMAP2430)
	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
#elif defined(CONFIG_ARCH_OMAP34XX)
	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
#endif
	/* Normally devicemaps_init() would flush caches and tlb after
	 * mdesc->map_io(), but we must also do it here because of the CPU
	 * revision check below.
	 */
	local_flush_tlb_all();
	flush_cache_all();

	omap2_check_revision();
	omap_sram_init();
	omapfb_reserve_sdram();
}

void __init omap2_init_common_hw(void)
{
	omap2_mux_init();
	omap2_clk_init();
	omap2_init_memory();
	gpmc_init();
}

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [RFC] io.c for OMAP3430
  2007-05-31  3:38       ` Syed Mohammed, Khasim
@ 2007-06-04 10:02         ` Tony Lindgren
  0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2007-06-04 10:02 UTC (permalink / raw)
  To: Syed Mohammed, Khasim; +Cc: Linux OMAP

Hi,

* Syed Mohammed, Khasim <x0khasim@ti.com> [070530 20:38]:
> Hi all:
> 
> >
> >>		if (cpu_is_omap242x()) {
> >>			iotable_init(omap242x_io_desc,
> >>ARRAY_SIZE(omap242x_io_desc));
> >>		} else if (cpu_is_omap243x()) {
> >>			iotable_init(omap243x_io_desc,
> >>ARRAY_SIZE(omap243x_io_desc));
> >>		}
> >We cannot put this kind of check in common_io function. I was trying to
> >validate 2420 / 2430 platforms and I found that "cpu_is_" function calls
> >returning "0" (when "1" was expected).
> 
> Please let me know your views on the following approach for io.c.
> 
> =========================================================================
> 
> /*
>  * linux/arch/arm/mach-omap2/io.c
>  *
>  * OMAP2 I/O mapping code
>  *
>  * Copyright (C) 2005 Nokia Corporation
>  * Copyright (C) 2007 Texas Instruments
>  *
>  * Author:
>  *	Juha Yrjola <juha.yrjola@nokia.com>
>  *	Syed Khasim <x0khasim@ti.com>
>  *
>  * This program is free software; you can redistribute it and/or modify
>  * it under the terms of the GNU General Public License version 2 as
>  * published by the Free Software Foundation.
>  */
> 
> #include <linux/module.h>
> #include <linux/kernel.h>
> #include <linux/init.h>
> 
> #include <asm/tlb.h>
> #include <asm/io.h>
> 
> #include <asm/mach/map.h>
> 
> #include <asm/arch/mux.h>
> #include <asm/arch/omapfb.h>
> 
> extern void omap_sram_init(void);
> extern int omap2_clk_init(void);
> extern void omap2_check_revision(void);
> extern void omap2_init_memory(void);
> extern void gpmc_init(void);
> extern void omapfb_reserve_sdram(void);
> 
> /*
>  * The machine specific code may provide the extra mapping besides the
>  * default mapping provided here.
>  */
> 
> #ifdef CONFIG_ARCH_OMAP24XX
> static struct map_desc omap24xx_io_desc[] __initdata = {
> 	{
> 		.virtual	= L3_24XX_VIRT,
> 		.pfn		= __phys_to_pfn(L3_24XX_PHYS),
> 		.length		= L3_24XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= L4_24XX_VIRT,
> 		.pfn		= __phys_to_pfn(L4_24XX_PHYS),
> 		.length		= L4_24XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> };
> 
> #ifdef CONFIG_ARCH_OMAP2420
> static struct map_desc omap242x_io_desc[] __initdata = {
> 	{
> 		.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,
> 		.type		= MT_DEVICE
> 	},
> };
> 
> #endif
> 
> #ifdef CONFIG_ARCH_OMAP2430
> static struct map_desc omap243x_io_desc[] __initdata = {
> 	{
> 		.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
> #endif
> 
> #ifdef	CONFIG_ARCH_OMAP34XX
> static struct map_desc omap34xx_io_desc[] __initdata = {
> 	{
> 		.virtual	= L3_34XX_VIRT,
> 		.pfn		= __phys_to_pfn(L3_34XX_PHYS),
> 		.length		= L3_34XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= L4_34XX_VIRT,
> 		.pfn		= __phys_to_pfn(L4_34XX_PHYS),
> 		.length		= L4_34XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= L4_WK_34XX_VIRT,
> 		.pfn		= __phys_to_pfn(L4_WK_34XX_PHYS),
> 		.length		= L4_WK_34XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= OMAP34XX_GPMC_VIRT,
> 		.pfn		= __phys_to_pfn(OMAP34XX_GPMC_PHYS),
> 		.length		= OMAP34XX_GPMC_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= OMAP343X_SMS_VIRT,
> 		.pfn		= __phys_to_pfn(OMAP343X_SMS_PHYS),
> 		.length		= OMAP343X_SMS_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= OMAP343X_SDRC_VIRT,
> 		.pfn		= __phys_to_pfn(OMAP343X_SDRC_PHYS),
> 		.length		= OMAP343X_SDRC_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= L4_PER_34XX_VIRT,
> 		.pfn		= __phys_to_pfn(L4_PER_34XX_PHYS),
> 		.length		= L4_PER_34XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> 	{
> 		.virtual	= L4_EMU_34XX_VIRT,
> 		.pfn		= __phys_to_pfn(L4_EMU_34XX_PHYS),
> 		.length		= L4_EMU_34XX_SIZE,
> 		.type		= MT_DEVICE
> 	},
> };
> #endif
> 
> void __init omap2_map_common_io(void)
> {
> #if defined(CONFIG_ARCH_OMAP2420)
> 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
> 	iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
> #elif defined(CONFIG_ARCH_OMAP2430)
> 	iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
> 	iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
> #elif defined(CONFIG_ARCH_OMAP34XX)
> 	iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
> #endif
> 	/* Normally devicemaps_init() would flush caches and tlb after
> 	 * mdesc->map_io(), but we must also do it here because of the CPU
> 	 * revision check below.
> 	 */
> 	local_flush_tlb_all();
> 	flush_cache_all();
> 
> 	omap2_check_revision();
> 	omap_sram_init();
> 	omapfb_reserve_sdram();
> }
> 
> void __init omap2_init_common_hw(void)
> {
> 	omap2_mux_init();
> 	omap2_clk_init();
> 	omap2_init_memory();
> 	gpmc_init();
> }
> 

Looks good to me. We can improve it further once the hardware based
detection issues are solved.

Tony

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2007-06-04 10:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-30  4:12 [RFC] io.c for OMAP3430 Syed Mohammed, Khasim
2007-05-30 13:41 ` Tony Lindgren
2007-05-30 17:17   ` Syed Mohammed, Khasim
2007-05-30 22:32     ` Syed Mohammed, Khasim
2007-05-31  3:38       ` Syed Mohammed, Khasim
2007-06-04 10:02         ` Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox