diff options
-rw-r--r-- | arch/arm/configs/u8500_android_defconfig | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | arch/arm/configs/u8500_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-ux500/pm/runtime.c | 13 |
4 files changed, 15 insertions, 4 deletions
diff --git a/arch/arm/configs/u8500_android_defconfig b/arch/arm/configs/u8500_android_defconfig index 3a1262379fe..7a7fd9e28f9 100644 --- a/arch/arm/configs/u8500_android_defconfig +++ b/arch/arm/configs/u8500_android_defconfig @@ -32,7 +32,7 @@ CONFIG_UX500_SOC_DB8500=y CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y CONFIG_DBX500_PRCMU_DEBUG=y -CONFIG_UX500_SUSPEND=y +# CONFIG_UX500_SUSPEND is not set CONFIG_UX500_SUSPEND_STANDBY=y CONFIG_UX500_SUSPEND_MEM=y CONFIG_UX500_SUSPEND_DBG=y diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 300152899c7..2511cad8617 100755..100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -25,7 +25,7 @@ CONFIG_MACH_HREFV60=y CONFIG_MACH_SNOWBALL=y CONFIG_UX500_GPIO_KEYS=y CONFIG_DBX500_PRCMU_DEBUG=y -CONFIG_UX500_SUSPEND=y +# CONFIG_UX500_SUSPEND is not set CONFIG_UX500_SUSPEND_STANDBY=y CONFIG_UX500_SUSPEND_MEM=y CONFIG_UX500_SUSPEND_DBG=y diff --git a/arch/arm/mach-ux500/pm/pm.c b/arch/arm/mach-ux500/pm/pm.c index b1337d8ba9f..691642e4200 100644 --- a/arch/arm/mach-ux500/pm/pm.c +++ b/arch/arm/mach-ux500/pm/pm.c @@ -48,7 +48,9 @@ #define PRCM_IOCR 0x310 #define PRCM_IOCR_IOFORCE 0x1 +#ifdef CONFIG_UX500_SUSPEND int ux500_console_uart_gpio_pin = CONFIG_UX500_CONSOLE_UART_GPIO_PIN; +#endif static u32 u8500_gpio_banks[] = {U8500_GPIOBANK0_BASE, U8500_GPIOBANK1_BASE, diff --git a/arch/arm/mach-ux500/pm/runtime.c b/arch/arm/mach-ux500/pm/runtime.c index a91e90443d9..710bd8aae3d 100644 --- a/arch/arm/mach-ux500/pm/runtime.c +++ b/arch/arm/mach-ux500/pm/runtime.c @@ -201,7 +201,7 @@ static int ux500_pd_resume_noirq(struct device *dev) */ return ux500_pd_runtime_resume(dev); } - +#ifdef CONFIG_UX500_SUSPEND static int ux500_pd_amba_suspend_noirq(struct device *dev) { struct pm_runtime_data *prd = __to_prd(dev); @@ -257,7 +257,16 @@ static int ux500_pd_amba_resume_noirq(struct device *dev) return ret; } - +#else +static int ux500_pd_amba_suspend_noirq(struct device *dev) +{ + return 0; +} +static int ux500_pd_amba_resume_noirq(struct device *dev) +{ + return 0; +} +#endif static int ux500_pd_amba_runtime_suspend(struct device *dev) { struct pm_runtime_data *prd = __to_prd(dev); |