LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Wenyou Yang <wenyou.yang@atmel.com> To: <nicolas.ferre@atmel.com>, <linux@arm.linux.org.uk> Cc: <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>, <alexandre.belloni@free-electrons.com>, <sylvain.rochet@finsecur.com>, <peda@axentia.se>, <wenyou.yang@atmel.com> Subject: [PATCH 09/12] pm: at91: rename function name: at91_slow_clock()-->at91_pm_suspend_sram_fn Date: Tue, 20 Jan 2015 16:24:05 +0800 [thread overview] Message-ID: <1421742245-18356-1-git-send-email-wenyou.yang@atmel.com> (raw) In-Reply-To: <1421741825-18226-1-git-send-email-wenyou.yang@atmel.com> 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 | 23 +++++++++++------------ arch/arm/mach-at91/pm_suspend.S | 26 ++++++++++++-------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index a1010f0..98dfeb2 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -137,13 +137,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) { @@ -152,8 +151,8 @@ static void at91_pm_suspend(suspend_state_t state) pm_data |= (state == PM_SUSPEND_MEM) ? (AT91_PM_SLOW_CLOCK << AT91_PM_MODE_OFFSET) : 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) @@ -253,17 +252,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__); 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 slow_clock handler to SRAM, and call it */ - memcpy(slow_clock, at91_slow_clock, at91_slow_clock_sz); + /* Copy pm suspend handler to SRAM, and call it */ + memcpy(at91_suspend_sram_fn, + at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz); put_node: of_node_put(node); @@ -312,8 +313,6 @@ static void __init at91_pm_init(void) at91_pm_sram_init(); - pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : "")); - if (at91_cpuidle_device.dev.platform_data) platform_device_register(&at91_cpuidle_device); diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index 420e730..6c3fc50 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -54,23 +54,21 @@ 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, + * least byte: SDRAM controller type + * 2nd byte: 1 -> suspend to memory, 0 -> standby */ -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 @@ -276,5 +274,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
next prev parent reply other threads:[~2015-01-20 8:25 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-20 8:16 [PATCH 00/12] AT91 pm cleanup for 3.20 Wenyou Yang 2015-01-20 8:16 ` [PATCH 01/12] pm: at91: pm_slowclock: improve reliability of suspend/resume Wenyou Yang 2015-01-20 8:16 ` [PATCH 02/12] pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories Wenyou Yang 2015-01-20 8:16 ` [PATCH 03/12] pm: at91: pm_slowclock: remove the unused code related with SLOWDOWN_MASTER_CLOCK Wenyou Yang 2015-01-20 8:16 ` [PATCH 04/12] pm: at91: move the copying the sram function to the sram initializationi phase Wenyou Yang 2015-01-20 8:16 ` [PATCH 05/12] ARM: at91: move select SRAM to ARCH_AT91 Wenyou Yang 2015-01-23 10:24 ` Alexandre Belloni 2015-01-26 1:10 ` Yang, Wenyou 2015-01-20 8:16 ` [PATCH 06/12] pm: at91: remove the config item CONFIG_AT91_SLOW_CLOCK Wenyou Yang 2015-01-20 8:17 ` [PATCH 07/12] pm: at91: the standby mode uses the same sram function as the suspend to memory mode Wenyou Yang 2015-01-23 10:30 ` Alexandre Belloni 2015-01-23 16:50 ` Sylvain Rochet 2015-01-23 23:13 ` Alexandre Belloni 2015-01-27 3:08 ` Yang, Wenyou 2015-01-23 17:32 ` Sylvain Rochet 2015-01-23 23:02 ` Alexandre Belloni 2015-01-26 3:08 ` Yang, Wenyou 2015-01-26 3:06 ` Yang, Wenyou 2015-01-20 8:17 ` [PATCH 08/12] pm: at91: rename file name: pm_slowclock.S -->pm_suspend.S Wenyou Yang 2015-01-23 19:17 ` Sylvain Rochet 2015-01-23 23:17 ` Alexandre Belloni 2015-01-25 13:30 ` Sylvain Rochet 2015-01-26 1:25 ` Yang, Wenyou 2015-01-20 8:17 ` [PATCH 09/12] pm: at91: rename function name: at91_slow_clock()-->at91_pm_suspend_sram_fn Wenyou Yang 2015-01-20 8:24 ` Wenyou Yang [this message] 2015-01-20 8:24 ` [PATCH 10/12] pm: at91: remove the at91_xxx_standby() function definitions in the pm.h Wenyou Yang 2015-01-20 8:25 ` [PATCH 11/12] pm: at91: remove the struct ramc_ids .data at91_xxx_standby members Wenyou Yang 2015-01-20 8:26 ` [PATCH 12/12] pm: at91: amend the pm_suspend entry for at91_cpuidle_device Wenyou Yang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1421742245-18356-1-git-send-email-wenyou.yang@atmel.com \ --to=wenyou.yang@atmel.com \ --cc=alexandre.belloni@free-electrons.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=nicolas.ferre@atmel.com \ --cc=peda@axentia.se \ --cc=sylvain.rochet@finsecur.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).