lkml.org 
[lkml]   [2010]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 4/4] 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/Kconfig | 1 +
    arch/arm/mach-s5pv210/Kconfig | 1 +
    arch/arm/mach-s5pv210/mach-aquila.c | 7 +++++++
    arch/arm/mach-s5pv210/mach-goni.c | 7 +++++++
    4 files changed, 16 insertions(+), 0 deletions(-)

    diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
    index 2e5b0f3..40c7380 100644
    --- a/arch/arm/Kconfig
    +++ b/arch/arm/Kconfig
    @@ -691,6 +691,7 @@ config ARCH_S5PC100
    select CPU_V7
    select ARM_L1_CACHE_SHIFT_6
    select ARCH_USES_GETTIMEOFFSET
    + select ARCH_CMA_POSSIBLE
    help
    Samsung S5PC100 series based systems

    diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
    index e65825f..5fa1378 100644
    --- a/arch/arm/mach-s5pv210/Kconfig
    +++ b/arch/arm/mach-s5pv210/Kconfig
    @@ -14,6 +14,7 @@ config CPU_S5PV210
    select PLAT_S5P
    select S3C_PL330_DMA
    select S5P_EXT_INT
    + select ARCH_CMA_POSSIBLE
    help
    Enable S5PV210 CPU support

    diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
    index 0992618..4044233 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-int.h>

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

    +static void __init aquila_reserve(void)
    +{
    + cma_regions_allocate(NULL);
    +}
    +
    static void __init aquila_machine_init(void)
    {
    /* PMIC */
    @@ -478,4 +484,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 7b18505..8ab0751 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-int.h>

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

    +static void __init goni_reserve(void)
    +{
    + cma_regions_allocate(NULL);
    +}
    +
    static void __init goni_machine_init(void)
    {
    /* PMIC */
    @@ -456,4 +462,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-07-20 17:53    [W:0.024 / U:0.052 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site