Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5726a8b9 authored by Wenyou Yang's avatar Wenyou Yang Committed by Nicolas Ferre
Browse files

ARM: at91/pm: rename function name: at91_slow_clock() --> at91_pm_suspend_sram_fn() 



As the file name is renamed, rename the function name at91_slow_clock()
--> at91_pm_suspend_sram_fn(), rename the function handler's name at the
same time.

Signed-off-by: default avatarWenyou Yang <wenyou.yang@atmel.com>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tested-by: default avatarSylvain Rochet <sylvain.rochet@finsecur.com>
[nicolas.ferre@atmel.com: little update of the commit message]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 828b98fa

arch/arm/mach-at91/pm.c

+14 −13
Original line number Diff line number Diff line
@@ -120,13 +120,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)

{
@@ -135,7 +134,7 @@ 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_suspend_sram_fn(at91_pmc_base, at91_ramc_base[0],

				at91_ramc_base[1], pm_data);

}
@@ -278,21 +277,23 @@ static void __init at91_pm_sram_init(void) 
		return;

	}



	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__);

		return;

	}



	sram_pbase = gen_pool_virt_to_phys(sram_pool, sram_base);

	slow_clock = __arm_ioremap_exec(sram_pbase, at91_slow_clock_sz, false);

	if (!slow_clock) {

	at91_suspend_sram_fn = __arm_ioremap_exec(sram_pbase,

					at91_pm_suspend_in_sram_sz, false);

	if (!at91_suspend_sram_fn) {

		pr_warn("SRAM: Could not map\n");

		return;

	}



	/* Copy the slow_clock handler to SRAM */

	slow_clock = fncpy(slow_clock, &at91_slow_clock, at91_slow_clock_sz);

	/* Copy the pm suspend handler to SRAM */

	at91_suspend_sram_fn = fncpy(at91_suspend_sram_fn,

			&at91_pm_suspend_in_sram, at91_pm_suspend_in_sram_sz);

}



static void __init at91_pm_init(void)
@@ -302,7 +303,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");

arch/arm/mach-at91/pm_suspend.S

+11 −15
Original line number Diff line number Diff line
@@ -55,23 +55,19 @@ tmp2 .req r5 


	.arm



/* 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: base address of AT91_PMC

 *  	@r1: base address of SDRAM Controller (SDRAM, DDRSDR, or AT91_SYS)

 *	@r2: base address of second SDRAM Controller or 0 if not present

 *	@r3: 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
@@ -170,7 +166,7 @@ skip_enable_main_clock: 


	/* Restore registers, and return */

	ldmfd	sp!, {r4 - r12, pc}

ENDPROC(at91_slow_clock)

ENDPROC(at91_pm_suspend_in_sram)



/*

 * void at91_sramc_self_refresh(unsigned int is_active)
@@ -320,5 +316,5 @@ ENDPROC(at91_sramc_self_refresh) 
.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