* Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> [090618 03:00]: > From: Tero Kristo <tero.kristo@xxxxxxxxx> > > SRAM size fix for HS/EMU devices > > Signed-off-by: Tero Kristo <tero.kristo@xxxxxxxxx> > Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx> > --- > arch/arm/plat-omap/sram.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > mode change 100644 => 100755 arch/arm/plat-omap/sram.c This one also has some mode change going on, please check your repos. Will fix before applying. Tony > diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c > old mode 100644 > new mode 100755 > index 65006df..80bf3b1 > --- a/arch/arm/plat-omap/sram.c > +++ b/arch/arm/plat-omap/sram.c > @@ -133,7 +133,11 @@ void __init omap_detect_sram(void) > if (cpu_is_omap34xx()) { > omap_sram_base = OMAP3_SRAM_PUB_VA; > omap_sram_start = OMAP3_SRAM_PUB_PA; > - omap_sram_size = 0x8000; /* 32K */ > + if ((omap_type() == OMAP2_DEVICE_TYPE_EMU) || > + (omap_type() == OMAP2_DEVICE_TYPE_SEC)) { > + omap_sram_size = 0x7000; /* 28K */ > + else > + omap_sram_size = 0x8000; /* 32K */ > } else { > omap_sram_base = OMAP2_SRAM_PUB_VA; > omap_sram_start = OMAP2_SRAM_PUB_PA; > -- > 1.6.3.2 > > -- > 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 -- 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