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

Commit 51f37801 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-core-v3.14' of... 

Merge tag 'ux500-core-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/soc

From Linus Walleij:
Ux500 core patches for the v3.14 series:
- Enable PRINTK_TIME
- Enable suspend with WFI

* tag 'ux500-core-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: Enable system suspend with WFI support
  ARM: ux500: turn on PRINTK_TIME in u8500_defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ced015aa ead9e293

arch/arm/configs/u8500_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ CONFIG_NFS_FS=y 
CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

arch/arm/mach-ux500/pm.c

+27 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
 * Author: Rickard Andersson <rickard.andersson@stericsson.com> for

 *         ST-Ericsson.

 * Author: Daniel Lezcano <daniel.lezcano@linaro.org> for Linaro.

 * Author: Ulf Hansson <ulf.hansson@linaro.org> for Linaro.

 *

 * License terms: GNU General Public License (GPL) version 2

 *

 */
@@ -11,6 +13,7 @@ 
#include <linux/irqchip/arm-gic.h>

#include <linux/delay.h>

#include <linux/io.h>

#include <linux/suspend.h>

#include <linux/platform_data/arm-ux500-pm.h>



#include "db8500-regs.h"
@@ -152,6 +155,27 @@ int prcmu_copy_gic_settings(void) 
	return 0;

}



#ifdef CONFIG_SUSPEND

static int ux500_suspend_enter(suspend_state_t state)

{

	cpu_do_idle();

	return 0;

}



static int ux500_suspend_valid(suspend_state_t state)

{

	return state == PM_SUSPEND_MEM || state == PM_SUSPEND_STANDBY;

}



static const struct platform_suspend_ops ux500_suspend_ops = {

	.enter	      = ux500_suspend_enter,

	.valid	      = ux500_suspend_valid,

};

#define UX500_SUSPEND_OPS	(&ux500_suspend_ops)

#else

#define UX500_SUSPEND_OPS	NULL

#endif



void __init ux500_pm_init(u32 phy_base, u32 size)

{

	prcmu_base = ioremap(phy_base, size);
@@ -164,4 +188,7 @@ void __init ux500_pm_init(u32 phy_base, u32 size) 
	 * This will make sure that the GIC is correctly configured.

	 */

	prcmu_gic_recouple();



	/* Set up ux500 suspend callbacks. */

	suspend_set_ops(UX500_SUSPEND_OPS);

}