AT91 SoC for 5.4
- MAINTAINERS updates - a generated headers parallel build fix -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEycoQi/giopmpPgB12wIijOdRNOUFAl1i7TUACgkQ2wIijOdR NOWiLA/7BEmdnsnrfDxK+fKvAP1h7U+r/5SXeIrDfBZ5BVeYKR2hiF6go8UoNuaQ LWcB6GFTSj+Js26qrmgMs7S9eb8u4OkLN6j9mI6TaWpvsWKZyR3ffpb4SYgLqgPK GHVB7xI2GyJzlGklmGX63NkBDcBAaol+oOO8YznXkruxASfZzCes/ibCQfj5Ce7x PTKZppASsOhUo+bEipyBTyYnu9xotmPD6CHYZ4kKL9IOqOJkXJHf5su/pgBMkHGd Sa3SGFOWPw5PqZLZdC/VN98oiaFC7/AiF/YNV1VuJ+Fj/VZ9yk4F9wHGPoG3Sv+7 x8INFPw9gDkAy1Fuoh87ImVkaTpCWJYLpurGhSj77WwaUdq1D0ciPn2yf3BTq6Kl pUBi8sRq5pr45/oKkVQ191VLtkMO2FXhzyriCu+NdRmI7OEiuQ47bdysC/kcOg+Z lrGveqWOa+aOPI3ZyHA3vQMmNaR1yxRhU6CyWJn9skAFIQUAbi7dDF4b1+32nQvm 8u1ydE4vYt0OJpMJIJkpUB6NIC3vF1USp83OKKc6D3OpiFXi0d9hgx/GMyWuiSvt w01JGwQ9j3KiyCvi1YsIhlzhuAThiOPbLAsutWB2t9/kgsXHWD48GgzovsJDbIld pmh0enifJXjpJLAsHMGrL1m6ITdpUqFyaBAJRV2Df3THWlC/ZdE= =pqcm -----END PGP SIGNATURE----- Merge tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/soc AT91 SoC for 5.4 - MAINTAINERS updates - a generated headers parallel build fix * tag 'at91-5.4-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: mailmap: map old company name to new one @microchip.com MAINTAINERS: at91: remove the TC entry MAINTAINERS: at91: Collect all pinctrl/gpio drivers in same entry ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Link: https://lore.kernel.org/r/20190825203222.GA22800@piout.net Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
7bbf869310
1
.mailmap
1
.mailmap
|
@ -173,6 +173,7 @@ Morten Welinder <welinder@darter.rentec.com>
|
|||
Morten Welinder <welinder@troll.com>
|
||||
Mythri P K <mythripk@ti.com>
|
||||
Nguyen Anh Quynh <aquynh@gmail.com>
|
||||
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
|
||||
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
|
||||
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
|
||||
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
|
||||
|
|
14
MAINTAINERS
14
MAINTAINERS
|
@ -10584,12 +10584,6 @@ M: Nicolas Ferre <nicolas.ferre@microchip.com>
|
|||
S: Supported
|
||||
F: drivers/power/reset/at91-sama5d2_shdwc.c
|
||||
|
||||
MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO
|
||||
M: Andrei Stefanescu <andrei.stefanescu@microchip.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-gpio@vger.kernel.org
|
||||
F: drivers/gpio/gpio-sama5d2-piobu.c
|
||||
|
||||
MICROCHIP SPI DRIVER
|
||||
M: Nicolas Ferre <nicolas.ferre@microchip.com>
|
||||
S: Supported
|
||||
|
@ -10602,13 +10596,6 @@ S: Supported
|
|||
F: drivers/misc/atmel-ssc.c
|
||||
F: include/linux/atmel-ssc.h
|
||||
|
||||
MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS
|
||||
M: Nicolas Ferre <nicolas.ferre@microchip.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
S: Supported
|
||||
F: drivers/misc/atmel_tclib.c
|
||||
F: drivers/clocksource/tcb_clksrc.c
|
||||
|
||||
MICROCHIP USBA UDC DRIVER
|
||||
M: Cristian Birsan <cristian.birsan@microchip.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
|
@ -12650,6 +12637,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
|||
L: linux-gpio@vger.kernel.org
|
||||
S: Supported
|
||||
F: drivers/pinctrl/pinctrl-at91*
|
||||
F: drivers/gpio/gpio-sama5d2-piobu.c
|
||||
|
||||
PIN CONTROLLER - FREESCALE
|
||||
M: Dong Aisheng <aisheng.dong@nxp.com>
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
pm_data-offsets.h
|
|
@ -19,9 +19,10 @@ ifeq ($(CONFIG_PM_DEBUG),y)
|
|||
CFLAGS_pm.o += -DDEBUG
|
||||
endif
|
||||
|
||||
include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE
|
||||
$(obj)/pm_data-offsets.h: $(obj)/pm_data-offsets.s FORCE
|
||||
$(call filechk,offsets,__PM_DATA_OFFSETS_H__)
|
||||
|
||||
arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h
|
||||
$(obj)/pm_suspend.o: $(obj)/pm_data-offsets.h
|
||||
|
||||
targets += pm_data-offsets.s
|
||||
clean-files += pm_data-offsets.h
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include <linux/linkage.h>
|
||||
#include <linux/clk/at91_pmc.h>
|
||||
#include "pm.h"
|
||||
#include "generated/at91_pm_data-offsets.h"
|
||||
#include "pm_data-offsets.h"
|
||||
|
||||
#define SRAMC_SELF_FRESH_ACTIVE 0x01
|
||||
#define SRAMC_SELF_FRESH_EXIT 0x00
|
||||
|
|
Loading…
Reference in New Issue