lkml.org 
[lkml]   [2015]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 10/13] pm: at91: rename function name: at91_slow_clock()-->at91_pm_suspend_sram_fn
    Date
    As the file name's renaming, rename the file name at91_slow_clock()-->
    at91_pm_suspend_sram_fn, rename the function handler's name at the same time.

    Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
    Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    ---
    arch/arm/mach-at91/pm.c | 25 +++++++++++++------------
    arch/arm/mach-at91/pm_suspend.S | 24 ++++++++++--------------
    2 files changed, 23 insertions(+), 26 deletions(-)

    diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
    index c3a697f..ce15013 100644
    --- a/arch/arm/mach-at91/pm.c
    +++ b/arch/arm/mach-at91/pm.c
    @@ -131,13 +131,12 @@ int at91_suspend_entering_slow_clock(void)
    }
    EXPORT_SYMBOL(at91_suspend_entering_slow_clock);

    -
    -static void (*slow_clock)(void __iomem *pmc, void __iomem *ramc0,
    +static void (*at91_suspend_sram_fn)(void __iomem *pmc, void __iomem *ramc0,
    void __iomem *ramc1, int memctrl);

    -extern void at91_slow_clock(void __iomem *pmc, void __iomem *ramc0,
    +extern void at91_pm_suspend_in_sram(void __iomem *pmc, void __iomem *ramc0,
    void __iomem *ramc1, int memctrl);
    -extern u32 at91_slow_clock_sz;
    +extern u32 at91_pm_suspend_in_sram_sz;

    static void at91_pm_suspend(suspend_state_t state)
    {
    @@ -146,8 +145,8 @@ static void at91_pm_suspend(suspend_state_t state)
    pm_data |= (state == PM_SUSPEND_MEM) ?
    AT91_PM_MODE(AT91_PM_SLOW_CLOCK) : 0;

    - slow_clock(at91_pmc_base, at91_ramc_base[0],
    - at91_ramc_base[1], pm_data);
    + at91_suspend_sram_fn(at91_pmc_base, at91_ramc_base[0],
    + at91_ramc_base[1], pm_data);
    }

    static int at91_pm_enter(suspend_state_t state)
    @@ -288,17 +287,19 @@ static void __init at91_pm_sram_init(void)
    goto put_node;
    }

    - sram_base = gen_pool_alloc(sram_pool, at91_slow_clock_sz);
    + sram_base = gen_pool_alloc(sram_pool, at91_pm_suspend_in_sram_sz);
    if (!sram_base) {
    - pr_warn("%s: unable to alloc ocram!\n", __func__);
    + pr_warn("%s: unable to alloc sram!\n", __func__);
    goto put_node;
    }

    sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);
    - slow_clock = __arm_ioremap_exec(sram_pbase, at91_slow_clock_sz, false);
    + at91_suspend_sram_fn = __arm_ioremap_exec(sram_pbase,
    + at91_pm_suspend_in_sram_sz, false);

    - /* Copy the slow_clock handler to SRAM */
    - memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz);
    + /* Copy the pm suspend handler to SRAM */
    + memcpy(at91_suspend_sram_fn,
    + at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);

    put_node:
    of_node_put(node);
    @@ -311,7 +312,7 @@ static void __init at91_pm_init(void)
    if (at91_cpuidle_device.dev.platform_data)
    platform_device_register(&at91_cpuidle_device);

    - if (slow_clock)
    + if (at91_suspend_sram_fn)
    suspend_set_ops(&at91_pm_ops);
    else
    pr_info("AT91: PM : Not supported, due to no sram allocated\n");
    diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
    index 8edbad0..122a3f1 100644
    --- a/arch/arm/mach-at91/pm_suspend.S
    +++ b/arch/arm/mach-at91/pm_suspend.S
    @@ -55,23 +55,19 @@ mode .req r6

    .text

    -/* void at91_slow_clock(void __iomem *pmc, void __iomem *sdramc,
    +/*
    + * void at91_pm_suspend_in_sram(void __iomem *pmc, void __iomem *sdramc,
    * void __iomem *ramc1, int memctrl)
    + * @input param:
    + * @r0: the base address of AT91_PMC
    + * @r1: the base address of SDRAM Controller (SDRAM, DDRSDR, or AT91_SYS)
    + * @r2: the base address of second SDRAM Controller or 0 if not present
    + * @r3: the pm information
    */
    -ENTRY(at91_slow_clock)
    +ENTRY(at91_pm_suspend_in_sram)
    /* Save registers on stack */
    stmfd sp!, {r4 - r12, lr}

    - /*
    - * Register usage:
    - * R0 = Base address of AT91_PMC
    - * R1 = Base address of RAM Controller (SDRAM, DDRSDR, or AT91_SYS)
    - * R2 = Base address of second RAM Controller or 0 if not present
    - * R3 = Memory controller
    - * R4 = temporary register
    - * R5 = temporary register
    - */
    -
    /* Drain write buffer */
    mov tmp1, #0
    mcr p15, 0, tmp1, c7, c10, 4
    @@ -277,5 +273,5 @@ ram_restored:
    .saved_sam9_mdr1:
    .word 0

    -ENTRY(at91_slow_clock_sz)
    - .word .-at91_slow_clock
    +ENTRY(at91_pm_suspend_in_sram_sz)
    + .word .-at91_pm_suspend_in_sram
    --
    1.7.9.5


    \
     
     \ /
      Last update: 2015-01-29 08:21    [W:3.182 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site