> -----Original Message----- > From: linux-omap-owner@xxxxxxxxxxxxxxx > [mailto:linux-omap-owner@xxxxxxxxxxxxxxx] On Behalf Of Paul Walmsley > Sent: Saturday, October 02, 2010 3:06 AM > To: linux-omap@xxxxxxxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Subject: [PATCH 08/10] OMAP: split plat-omap/common.c > > Split plat-omap/common.c into three pieces: > > 1. the 32KiHz sync timer and clocksource code, which now lives in > plat-omap/32ksynctimer.c; > > 2. the OMAP2+ common code, which has been moved to > mach-omap2/common.c; > > 3. and the remainder of the OMAP-wide common code, which includes the > deprecated ATAGs code and a deprecated video RAM > reservation function. > > The primary motivation for doing this is to move the > OMAP2+-specific parts > into an OMAP2+-specific file, so that build breakage related to the > System Control Module code can be resolved. > > Signed-off-by: Paul Walmsley <paul@xxxxxxxxx> > --- > arch/arm/mach-omap2/Makefile | 3 > arch/arm/mach-omap2/common.c | 138 ++++++++++++++++++ > arch/arm/plat-omap/32ksynctimer.c | 184 +++++++++++++++++++++++ > arch/arm/plat-omap/Makefile | 2 > arch/arm/plat-omap/common.c | 291 > ------------------------------------- > arch/arm/plat-omap/devices.c | 1 > arch/arm/plat-omap/sram.c | 3 > 7 files changed, 325 insertions(+), 297 deletions(-) > create mode 100644 arch/arm/mach-omap2/common.c > create mode 100644 arch/arm/plat-omap/32ksynctimer.c > > diff --git a/arch/arm/mach-omap2/Makefile > b/arch/arm/mach-omap2/Makefile > index 9edacb0..d543533 100644 > --- a/arch/arm/mach-omap2/Makefile > +++ b/arch/arm/mach-omap2/Makefile > @@ -3,7 +3,8 @@ > # > > # Common support > -obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o > timer-gp.o pm.o > +obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o > timer-gp.o pm.o \ > + common.o > > omap-2-3-common = irq.o sdrc.o > prm2xxx_3xxx.o > hwmod-common = omap_hwmod.o \ > diff --git a/arch/arm/mach-omap2/common.c > b/arch/arm/mach-omap2/common.c > new file mode 100644 > index 0000000..4e0469d > --- /dev/null > +++ b/arch/arm/mach-omap2/common.c > @@ -0,0 +1,138 @@ > +/* > + * linux/arch/arm/mach-omap2/common.c > + * > + * Code common to all OMAP2+ machines. > + * > + * Copyright (C) 2009 Texas Instruments > + * Copyright (C) 2010 Nokia Corporation > + * Tony Lindgren <tony@xxxxxxxxxxx> > + * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@xxxxxx> > + * Paul Walmsley > + * > + * 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/kernel.h> > +#include <linux/init.h> > +#include <linux/clk.h> > +#include <linux/io.h> > + > +#include <plat/common.h> > +#include <plat/board.h> > +#include <plat/control.h> > +#include <plat/mux.h> > + > +#include <plat/clock.h> > + > +#include "sdrc.h" > + > +/* Global address base setup code */ > + > +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) > + > +static void __init __omap2_set_globals(struct omap_globals > *omap2_globals) > +{ > + omap2_set_globals_tap(omap2_globals); > + omap2_set_globals_sdrc(omap2_globals); > + omap2_set_globals_control(omap2_globals); > + omap2_set_globals_prcm(omap2_globals); > + omap2_set_globals_uart(omap2_globals); > +} > + > +#endif > + > +#if defined(CONFIG_ARCH_OMAP2420) > + > +static struct omap_globals omap242x_globals = { > + .class = OMAP242X_CLASS, > + .tap = OMAP2_L4_IO_ADDRESS(0x48014000), > + .sdrc = OMAP2420_SDRC_BASE, > + .sms = OMAP2420_SMS_BASE, > + .ctrl = OMAP242X_CTRL_BASE, > + .prm = OMAP2420_PRM_BASE, > + .cm = OMAP2420_CM_BASE, > + .uart1_phys = OMAP2_UART1_BASE, > + .uart2_phys = OMAP2_UART2_BASE, > + .uart3_phys = OMAP2_UART3_BASE, > +}; > + > +void __init omap2_set_globals_242x(void) > +{ > + __omap2_set_globals(&omap242x_globals); > +} > +#endif > + > +#if defined(CONFIG_ARCH_OMAP2430) > + > +static struct omap_globals omap243x_globals = { > + .class = OMAP243X_CLASS, > + .tap = OMAP2_L4_IO_ADDRESS(0x4900a000), > + .sdrc = OMAP243X_SDRC_BASE, > + .sms = OMAP243X_SMS_BASE, > + .ctrl = OMAP243X_CTRL_BASE, > + .prm = OMAP2430_PRM_BASE, > + .cm = OMAP2430_CM_BASE, > + .uart1_phys = OMAP2_UART1_BASE, > + .uart2_phys = OMAP2_UART2_BASE, > + .uart3_phys = OMAP2_UART3_BASE, > +}; > + > +void __init omap2_set_globals_243x(void) > +{ > + __omap2_set_globals(&omap243x_globals); > +} > +#endif > + > +#if defined(CONFIG_ARCH_OMAP3) Do you really need these #ifdefs? It would be better to avoid these #ifdefs and use cpu_is* checks. Same comment holds good across this patch. > + > +static struct omap_globals omap3_globals = { > + .class = OMAP343X_CLASS, > + .tap = OMAP2_L4_IO_ADDRESS(0x4830A000), > + .sdrc = OMAP343X_SDRC_BASE, > + .sms = OMAP343X_SMS_BASE, > + .ctrl = OMAP343X_CTRL_BASE, > + .prm = OMAP3430_PRM_BASE, > + .cm = OMAP3430_CM_BASE, > + .uart1_phys = OMAP3_UART1_BASE, > + .uart2_phys = OMAP3_UART2_BASE, > + .uart3_phys = OMAP3_UART3_BASE, > + .uart4_phys = OMAP3_UART4_BASE, /* Only on 3630 */ > +}; > + > +void __init omap2_set_globals_3xxx(void) > +{ > + __omap2_set_globals(&omap3_globals); > +} > + > +void __init omap3_map_io(void) > +{ > + omap2_set_globals_3xxx(); > + omap34xx_map_common_io(); > +} > +#endif > + > +#if defined(CONFIG_ARCH_OMAP4) > +static struct omap_globals omap4_globals = { > + .class = OMAP443X_CLASS, > + .tap = OMAP2_L4_IO_ADDRESS(OMAP443X_SCM_BASE), > + .ctrl = OMAP443X_SCM_BASE, > + .ctrl_pad = OMAP443X_CTRL_BASE, > + .prm = OMAP4430_PRM_BASE, > + .cm = OMAP4430_CM_BASE, > + .cm2 = OMAP4430_CM2_BASE, > + .uart1_phys = OMAP4_UART1_BASE, > + .uart2_phys = OMAP4_UART2_BASE, > + .uart3_phys = OMAP4_UART3_BASE, > + .uart4_phys = OMAP4_UART4_BASE, > +}; > + > +void __init omap2_set_globals_443x(void) > +{ > + omap2_set_globals_tap(&omap4_globals); > + omap2_set_globals_control(&omap4_globals); > + omap2_set_globals_prcm(&omap4_globals); > + omap2_set_globals_uart(&omap4_globals); > +} > +#endif > + > diff --git a/arch/arm/plat-omap/32ksynctimer.c > b/arch/arm/plat-omap/32ksynctimer.c > new file mode 100644 > index 0000000..b7f458c > --- /dev/null > +++ b/arch/arm/plat-omap/32ksynctimer.c > @@ -0,0 +1,184 @@ > +/* > + * linux/arch/arm/plat-omap/clocksource.c No need to have file name and path here. > + * > + * OMAP clocksource-related code > + * > + * Copyright (C) 2009 Texas Instruments > + * Copyright (C) 2010 Nokia Corporation > + * Tony Lindgren <tony@xxxxxxxxxxx> > + * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@xxxxxx> > + * Paul Walmsley > + * > + * 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/kernel.h> > +#include <linux/init.h> > +#include <linux/clk.h> > +#include <linux/io.h> > + > +#include <plat/common.h> > +#include <plat/board.h> > + > +#include <plat/clock.h> > + <<snip>> > +static int __init omap_init_clocksource_32k(void) > +{ > + static char err[] __initdata = KERN_ERR > + "%s: can't register clocksource!\n"; > + > + if (cpu_is_omap16xx() || cpu_class_is_omap2()) { > + struct clk *sync_32k_ick; > + > + if (cpu_is_omap16xx()) Avoid cpu_is* checks in plat-omap. > + clocksource_32k.read = omap16xx_32k_read; > + else if (cpu_is_omap2420()) > + clocksource_32k.read = omap2420_32k_read; > + else if (cpu_is_omap2430()) > + clocksource_32k.read = omap2430_32k_read; > + else if (cpu_is_omap34xx()) > + clocksource_32k.read = omap34xx_32k_read; > + else if (cpu_is_omap44xx()) > + clocksource_32k.read = omap44xx_32k_read; > + else > + return -ENODEV; > + > + sync_32k_ick = clk_get(NULL, "omap_32ksync_ick"); > + if (sync_32k_ick) > + clk_enable(sync_32k_ick); > + > + clocksource_32k.mult = clocksource_hz2mult(32768, > + clocksource_32k.shift); > + > + offset_32k = clocksource_32k.read(&clocksource_32k); > + > + if (clocksource_register(&clocksource_32k)) > + printk(err, clocksource_32k.name); > + } > + return 0; > +} > +arch_initcall(omap_init_clocksource_32k); > + <<snip>>-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
