| Message ID | 1348839609-10456-4-git-send-email-lokeshvutla@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 28, 2012 at 07:10:08PM +0530, Lokesh Vutla wrote: > omap_reserve() is a stub for omap1. So creating a > stub locally in mach-omap1. And moving the definition > to mach-omap2. > This helps in moving plat/omap_secure.h local to > mach-omap2 > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com> > --- > arch/arm/mach-omap1/common.h | 3 +++ > arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ > arch/arm/mach-omap2/common.h | 1 + > arch/arm/plat-omap/common.c | 17 ----------------- > arch/arm/plat-omap/include/plat/common.h | 1 - > 5 files changed, 24 insertions(+), 18 deletions(-) > > diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h > index c2552b2..f7b01f1 100644 > --- a/arch/arm/mach-omap1/common.h > +++ b/arch/arm/mach-omap1/common.h > @@ -90,4 +90,7 @@ extern int ocpi_enable(void); > static inline int ocpi_enable(void) { return 0; } > #endif > > +static inline void omap_reserve(void) > +{ } This is the wrong approach. If OMAP1 doesn't need to do any reservation, then OMAP1 platforms should not be calling omap_reserve() and OMAP1 should not have this defined. Just because OMAP2 does something one way does not mean OMAP1 needs to copy it in every detail.
On Sun, Sep 30, 2012 at 1:09 AM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > > On Fri, Sep 28, 2012 at 07:10:08PM +0530, Lokesh Vutla wrote: > > omap_reserve() is a stub for omap1. So creating a > > stub locally in mach-omap1. And moving the definition > > to mach-omap2. > > This helps in moving plat/omap_secure.h local to > > mach-omap2 > > > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > > Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com> > > --- > > arch/arm/mach-omap1/common.h | 3 +++ > > arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ > > arch/arm/mach-omap2/common.h | 1 + > > arch/arm/plat-omap/common.c | 17 ----------------- > > arch/arm/plat-omap/include/plat/common.h | 1 - > > 5 files changed, 24 insertions(+), 18 deletions(-) > > > > diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h > > index c2552b2..f7b01f1 100644 > > --- a/arch/arm/mach-omap1/common.h > > +++ b/arch/arm/mach-omap1/common.h > > @@ -90,4 +90,7 @@ extern int ocpi_enable(void); > > static inline int ocpi_enable(void) { return 0; } > > #endif > > > > +static inline void omap_reserve(void) > > +{ } > > This is the wrong approach. If OMAP1 doesn't need to do any reservation, > then OMAP1 platforms should not be calling omap_reserve() and OMAP1 should > not have this defined. > > Just because OMAP2 does something one way does not mean OMAP1 needs to > copy it in every detail. This patch just updated the code as is. I mean the empty reserve callback already exist before this patch. But I do agree with you. I think we can drop the reserve callback completly from OMAP1 board files and then its easier to just make the omap_reserve() local to OMAP2+ machines. Tony, Are you ok in dropping OMAP1 reserve callback from all OMAP1 machines ? Regards Santosh
* Shilimkar, Santosh <santosh.shilimkar@ti.com> [120930 01:21]: > On Sun, Sep 30, 2012 at 1:09 AM, Russell King - ARM Linux > <linux@arm.linux.org.uk> wrote: > > > > On Fri, Sep 28, 2012 at 07:10:08PM +0530, Lokesh Vutla wrote: > > > omap_reserve() is a stub for omap1. So creating a > > > stub locally in mach-omap1. And moving the definition > > > to mach-omap2. > > > This helps in moving plat/omap_secure.h local to > > > mach-omap2 > > > > > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> > > > Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com> > > > --- > > > arch/arm/mach-omap1/common.h | 3 +++ > > > arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ > > > arch/arm/mach-omap2/common.h | 1 + > > > arch/arm/plat-omap/common.c | 17 ----------------- > > > arch/arm/plat-omap/include/plat/common.h | 1 - > > > 5 files changed, 24 insertions(+), 18 deletions(-) > > > > > > diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h > > > index c2552b2..f7b01f1 100644 > > > --- a/arch/arm/mach-omap1/common.h > > > +++ b/arch/arm/mach-omap1/common.h > > > @@ -90,4 +90,7 @@ extern int ocpi_enable(void); > > > static inline int ocpi_enable(void) { return 0; } > > > #endif > > > > > > +static inline void omap_reserve(void) > > > +{ } > > > > This is the wrong approach. If OMAP1 doesn't need to do any reservation, > > then OMAP1 platforms should not be calling omap_reserve() and OMAP1 should > > not have this defined. > > > > Just because OMAP2 does something one way does not mean OMAP1 needs to > > copy it in every detail. > > This patch just updated the code as is. I mean the empty reserve > callback already > exist before this patch. > > But I do agree with you. I think we can drop the reserve callback completly from > OMAP1 board files and then its easier to just make the omap_reserve() local to > OMAP2+ machines. > > Tony, > Are you ok in dropping OMAP1 reserve callback from all OMAP1 machines ? Sure if it's not doing anything. Regards, Tony
On Sun, Sep 30, 2012 at 11:35 PM, Tony Lindgren <tony@atomide.com> wrote: > * Shilimkar, Santosh <santosh.shilimkar@ti.com> [120930 01:21]: >> On Sun, Sep 30, 2012 at 1:09 AM, Russell King - ARM Linux >> <linux@arm.linux.org.uk> wrote: >> > >> > On Fri, Sep 28, 2012 at 07:10:08PM +0530, Lokesh Vutla wrote: >> > > omap_reserve() is a stub for omap1. So creating a >> > > stub locally in mach-omap1. And moving the definition >> > > to mach-omap2. >> > > This helps in moving plat/omap_secure.h local to >> > > mach-omap2 >> > > >> > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> >> > > Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com> >> > > --- >> > > arch/arm/mach-omap1/common.h | 3 +++ >> > > arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ >> > > arch/arm/mach-omap2/common.h | 1 + >> > > arch/arm/plat-omap/common.c | 17 ----------------- >> > > arch/arm/plat-omap/include/plat/common.h | 1 - >> > > 5 files changed, 24 insertions(+), 18 deletions(-) >> > > >> > > diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h >> > > index c2552b2..f7b01f1 100644 >> > > --- a/arch/arm/mach-omap1/common.h >> > > +++ b/arch/arm/mach-omap1/common.h >> > > @@ -90,4 +90,7 @@ extern int ocpi_enable(void); >> > > static inline int ocpi_enable(void) { return 0; } >> > > #endif >> > > >> > > +static inline void omap_reserve(void) >> > > +{ } >> > >> > This is the wrong approach. If OMAP1 doesn't need to do any reservation, >> > then OMAP1 platforms should not be calling omap_reserve() and OMAP1 should >> > not have this defined. >> > >> > Just because OMAP2 does something one way does not mean OMAP1 needs to >> > copy it in every detail. >> >> This patch just updated the code as is. I mean the empty reserve >> callback already >> exist before this patch. >> >> But I do agree with you. I think we can drop the reserve callback completly from >> OMAP1 board files and then its easier to just make the omap_reserve() local to >> OMAP2+ machines. >> >> Tony, >> Are you ok in dropping OMAP1 reserve callback from all OMAP1 machines ? > > Sure if it's not doing anything. Ok, Ill drop omap_reserve() callback from all OMAP1 machines and repost the patches.. Thanks Lokesh > > Regards, > > Tony
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h index c2552b2..f7b01f1 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -90,4 +90,7 @@ extern int ocpi_enable(void); static inline int ocpi_enable(void) { return 0; } #endif +static inline void omap_reserve(void) +{ } + #endif /* __ARCH_ARM_MACH_OMAP1_COMMON_H */ diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 17950c6..4ce0d63 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -16,8 +16,11 @@ #include <linux/init.h> #include <linux/clk.h> #include <linux/io.h> +#include <linux/platform_data/dsp-omap.h> #include <plat/clock.h> +#include <plat/omap-secure.h> +#include <plat/vram.h> #include "soc.h" #include "iomap.h" @@ -200,3 +203,20 @@ void __init omap5_map_io(void) omap5_map_common_io(); } #endif + +/* + * Stub function for OMAP2 so that common files + * continue to build when custom builds are used + */ +int __weak omap_secure_ram_reserve_memblock(void) +{ + return 0; +} + +void __init omap_reserve(void) +{ + omap_vram_reserve_sdram_memblock(); + omap_dsp_reserve_sdram_memblock(); + omap_secure_ram_reserve_memblock(); + omap_barrier_reserve_memblock(); +} diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index 7045e4d..e84c589 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -338,6 +338,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap_sdrc_params *sdrc_cs1); struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); +extern void omap_reserve(void); #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 18a837f..8cd5c46 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -23,26 +23,9 @@ #include <plat/omap-secure.h> -void __init omap_reserve(void) -{ - omap_vram_reserve_sdram_memblock(); - omap_dsp_reserve_sdram_memblock(); - omap_secure_ram_reserve_memblock(); - omap_barrier_reserve_memblock(); -} - void __init omap_init_consistent_dma_size(void) { #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); #endif } - -/* - * Stub function for OMAP2 so that common files - * continue to build when custom builds are used - */ -int __weak omap_secure_ram_reserve_memblock(void) -{ - return 0; -} diff --git a/arch/arm/plat-omap/include/plat/common.h b/arch/arm/plat-omap/include/plat/common.h index d1cb6f5..cb337c3 100644 --- a/arch/arm/plat-omap/include/plat/common.h +++ b/arch/arm/plat-omap/include/plat/common.h @@ -34,7 +34,6 @@ extern int __init omap_init_clocksource_32k(void __iomem *vbase); extern void __init omap_check_revision(void); -extern void omap_reserve(void); extern int omap_dss_reset(struct omap_hwmod *); void omap_sram_init(void);
omap_reserve() is a stub for omap1. So creating a stub locally in mach-omap1. And moving the definition to mach-omap2. This helps in moving plat/omap_secure.h local to mach-omap2 Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Acked-by : Santosh Shilimkar <santosh.shilimkar@ti.com> --- arch/arm/mach-omap1/common.h | 3 +++ arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ arch/arm/mach-omap2/common.h | 1 + arch/arm/plat-omap/common.c | 17 ----------------- arch/arm/plat-omap/include/plat/common.h | 1 - 5 files changed, 24 insertions(+), 18 deletions(-)