| Message ID | 20190423062243.27437-1-ludovic.desroches@microchip.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | 2725d70aa5138284ba2cebf0ef51dd23e0c9ea21 |
| Headers | show |
| Series | [GIT,PULL] ARM: at91: SoC for 5.2 | expand |
On Tue, Apr 23, 2019 at 08:22:43AM +0200, Ludovic Desroches wrote: > Hi Arnd, Kevin, Olof, > > Changes are about PM for the SAM9X60 SoC. > > There should be a conflict between "ARM: at91: pm: introduce at91_soc_pm structure" > and a fixes for 5.1 "ARM: at91: pm: introduce at91_soc_pm structure" which has > been solved in linux-next. > > Regards > > Ludovic I just noticed you're not using signed tags -- I missed that on the DT branch. Please get setup with a key and use tags, and use those to describe your pull requests. Given that you've got kernel.org access you must already have a key signed by people so that step is already taken care of. -Olof
Hi Arnd, Kevin, Olof, Changes are about PM for the SAM9X60 SoC. There should be a conflict between "ARM: at91: pm: introduce at91_soc_pm structure" and a fixes for 5.1 "ARM: at91: pm: introduce at91_soc_pm structure" which has been solved in linux-next. Regards Ludovic The following changes since commit 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b: Linux 5.1-rc1 (2019-03-17 14:22:26 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-soc for you to fetch changes up to 2725d70aa5138284ba2cebf0ef51dd23e0c9ea21: ARM: at91: pm: do not disable/enable PLLA for ULP modes (2019-03-28 11:05:53 +0100) ---------------------------------------------------------------- Claudiu Beznea (8): ARM: at91: pm: introduce at91_soc_pm structure dt-bindings: arm: atmel: add binding for SAM9X60 SoC ARM: at91: pm: initial PM support for SAM9X60 ARM: at91: pm: keep at91_pm_backup_init() only for SAMA5D2 SoCs ARM: at91: pm: add support for per SoC wakeup source configuration ARM: at91: pm: add ULP1 support for SAM9X60 ARM: at91: pm: disable RC oscillator in ULP0 ARM: at91: pm: do not disable/enable PLLA for ULP modes .../devicetree/bindings/arm/atmel-at91.txt | 1 + arch/arm/mach-at91/at91sam9.c | 18 ++ arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/pm.c | 193 ++++++++++++++------- arch/arm/mach-at91/pm_suspend.S | 111 ++++++++---- include/linux/clk/at91_pmc.h | 1 + 6 files changed, 232 insertions(+), 94 deletions(-)