Hi,
On Friday 17 of May 2013 18:24:29 Tomasz Figa wrote:
> This patch makes legacy code on suspend/resume path being executed
> conditionally, on non-DT platforms only, to fix suspend/resume of
> DT-enabled systems, for which the code is inappropriate.
>
> Signed-off-by: Tomasz Figa <t.figa@xxxxxxxxxxx>
> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> arch/arm/plat-samsung/pm.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
It seems like this patch did not make it into 3.10-rc5, while rest of patches
did, which ended up with suspend/resume still being broken.
What should we do in this case?
Best regards,
Tomasz
> diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c
> index 53210ec..8ac2b2d 100644
> --- a/arch/arm/plat-samsung/pm.c
> +++ b/arch/arm/plat-samsung/pm.c
> @@ -261,7 +261,8 @@ static int s3c_pm_enter(suspend_state_t state)
> * require a full power-cycle)
> */
>
> - if (!any_allowed(s3c_irqwake_intmask, s3c_irqwake_intallow) &&
> + if (!of_have_populated_dt() &&
> + !any_allowed(s3c_irqwake_intmask, s3c_irqwake_intallow) &&
> !any_allowed(s3c_irqwake_eintmask, s3c_irqwake_eintallow)) {
> printk(KERN_ERR "%s: No wake-up sources!\n", __func__);
> printk(KERN_ERR "%s: Aborting sleep\n", __func__);
> @@ -270,8 +271,11 @@ static int s3c_pm_enter(suspend_state_t state)
>
> /* save all necessary core registers not covered by the drivers */
>
> - samsung_pm_save_gpios();
> - samsung_pm_saved_gpios();
> + if (!of_have_populated_dt()) {
> + samsung_pm_save_gpios();
> + samsung_pm_saved_gpios();
> + }
> +
> s3c_pm_save_uarts();
> s3c_pm_save_core();
>
> @@ -310,8 +314,11 @@ static int s3c_pm_enter(suspend_state_t state)
>
> s3c_pm_restore_core();
> s3c_pm_restore_uarts();
> - samsung_pm_restore_gpios();
> - s3c_pm_restored_gpios();
> +
> + if (!of_have_populated_dt()) {
> + samsung_pm_restore_gpios();
> + s3c_pm_restored_gpios();
> + }
>
> s3c_pm_debug_init();
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
