Merge tag 'at91-5.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...

AT91 SoC for 5.2

 - PM changes for SAM9X60

* tag 'at91-5.2-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: pm: do not disable/enable PLLA for ULP modes
  ARM: at91: pm: disable RC oscillator in ULP0
  ARM: at91: pm: add ULP1 support for SAM9X60
  ARM: at91: pm: add support for per SoC wakeup source configuration
  ARM: at91: pm: keep at91_pm_backup_init() only for SAMA5D2 SoCs
  ARM: at91: pm: initial PM support for SAM9X60
  dt-bindings: arm: atmel: add binding for SAM9X60 SoC
  ARM: at91: pm: introduce at91_soc_pm structure

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/mach-at91/pm.c
index 2a757dc,5571658..6c81475
--- 1/arch/arm/mach-at91/pm.c
--- 2/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@@ -620,10 -676,8 +676,10 @@@ static int __init at91_pm_backup_init(v
        return 0;
  
  securam_fail:
-       iounmap(pm_data.sfrbu);
-       pm_data.sfrbu = NULL;
 +      put_device(&pdev->dev);
 +securam_fail_no_ref_dev:
+       iounmap(soc_pm.data.sfrbu);
+       soc_pm.data.sfrbu = NULL;
        return ret;
  }
  

diff --cc include/linux/clk/at91_pmc.h
Simple merge