lkml.org 
[lkml]   [2010]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH/RFCv4 6/6] arm: Added CMA to Aquila and Goni
    Added the CMA initialisation code to two Samsung platforms.

    Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    ---
    arch/arm/mach-s5pv210/mach-aquila.c | 31 +++++++++++++++++++++++++++++++
    arch/arm/mach-s5pv210/mach-goni.c | 31 +++++++++++++++++++++++++++++++
    2 files changed, 62 insertions(+), 0 deletions(-)

    diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
    index 0dda801..3561859 100644
    --- a/arch/arm/mach-s5pv210/mach-aquila.c
    +++ b/arch/arm/mach-s5pv210/mach-aquila.c
    @@ -19,6 +19,7 @@
    #include <linux/gpio_keys.h>
    #include <linux/input.h>
    #include <linux/gpio.h>
    +#include <linux/cma.h>

    #include <asm/mach/arch.h>
    #include <asm/mach/map.h>
    @@ -493,6 +494,35 @@ static void __init aquila_map_io(void)
    s3c24xx_init_uarts(aquila_uartcfgs, ARRAY_SIZE(aquila_uartcfgs));
    }

    +static void __init aquila_reserve(void)
    +{
    + static struct cma_region regions[] = {
    + {
    + .name = "fw",
    + .size = 1 << 20,
    + { .alignment = 128 << 10 },
    + },
    + {
    + .name = "b1",
    + .size = 32 << 20,
    + .asterisk = 1,
    + },
    + {
    + .name = "b2",
    + .size = 16 << 20,
    + .start = 0x40000000,
    + .asterisk = 1,
    + },
    + { }
    + };
    +
    + static const char map[] __initconst =
    + "s3c-mfc5/f=fw;s3c-mfc5/a=b1;s3c-mfc5/b=b2";
    +
    + cma_set_defaults(regions, map);
    + cma_early_regions_reserve(NULL);
    +}
    +
    static void __init aquila_machine_init(void)
    {
    /* PMIC */
    @@ -523,4 +553,5 @@ MACHINE_START(AQUILA, "Aquila")
    .map_io = aquila_map_io,
    .init_machine = aquila_machine_init,
    .timer = &s3c24xx_timer,
    + .reserve = aquila_reserve,
    MACHINE_END
    diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
    index 53754d7..edeb93f 100644
    --- a/arch/arm/mach-s5pv210/mach-goni.c
    +++ b/arch/arm/mach-s5pv210/mach-goni.c
    @@ -19,6 +19,7 @@
    #include <linux/gpio_keys.h>
    #include <linux/input.h>
    #include <linux/gpio.h>
    +#include <linux/cma.h>

    #include <asm/mach/arch.h>
    #include <asm/mach/map.h>
    @@ -474,6 +475,35 @@ static void __init goni_map_io(void)
    s3c24xx_init_uarts(goni_uartcfgs, ARRAY_SIZE(goni_uartcfgs));
    }

    +static void __init goni_reserve(void)
    +{
    + static struct cma_region regions[] = {
    + {
    + .name = "fw",
    + .size = 1 << 20,
    + { .alignment = 128 << 10 },
    + },
    + {
    + .name = "b1",
    + .size = 32 << 20,
    + .asterisk = 1,
    + },
    + {
    + .name = "b2",
    + .size = 16 << 20,
    + .start = 0x40000000,
    + .asterisk = 1,
    + },
    + { }
    + };
    +
    + static const char map[] __initconst =
    + "s3c-mfc5/f=fw;s3c-mfc5/a=b1;s3c-mfc5/b=b2";
    +
    + cma_set_defaults(regions, map);
    + cma_early_regions_reserve(NULL);
    +}
    +
    static void __init goni_machine_init(void)
    {
    /* PMIC */
    @@ -498,4 +528,5 @@ MACHINE_START(GONI, "GONI")
    .map_io = goni_map_io,
    .init_machine = goni_machine_init,
    .timer = &s3c24xx_timer,
    + .reserve = goni_reserve,
    MACHINE_END
    --
    1.7.1



    \
     
     \ /
      Last update: 2010-08-20 11:55    [W:0.028 / U:60.324 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site