tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Arnd Bergmann 7bbf8693 e6dde5cc

+7 -16
+1
.mailmap
··· 173 173 Morten Welinder <welinder@troll.com> 174 174 Mythri P K <mythripk@ti.com> 175 175 Nguyen Anh Quynh <aquynh@gmail.com> 176 + Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com> 176 177 Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org> 177 178 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org> 178 179 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+1 -13
MAINTAINERS
··· 10584 10584 S: Supported 10585 10585 F: drivers/power/reset/at91-sama5d2_shdwc.c 10586 10586 10587 - MICROCHIP SAMA5D2-COMPATIBLE PIOBU GPIO 10588 - M: Andrei Stefanescu <andrei.stefanescu@microchip.com> 10589 - L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 10590 - L: linux-gpio@vger.kernel.org 10591 - F: drivers/gpio/gpio-sama5d2-piobu.c 10592 - 10593 10587 MICROCHIP SPI DRIVER 10594 10588 M: Nicolas Ferre <nicolas.ferre@microchip.com> 10595 10589 S: Supported ··· 10595 10601 S: Supported 10596 10602 F: drivers/misc/atmel-ssc.c 10597 10603 F: include/linux/atmel-ssc.h 10598 - 10599 - MICROCHIP TIMER COUNTER (TC) AND CLOCKSOURCE DRIVERS 10600 - M: Nicolas Ferre <nicolas.ferre@microchip.com> 10601 - L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 10602 - S: Supported 10603 - F: drivers/misc/atmel_tclib.c 10604 - F: drivers/clocksource/tcb_clksrc.c 10605 10604 10606 10605 MICROCHIP USBA UDC DRIVER 10607 10606 M: Cristian Birsan <cristian.birsan@microchip.com> ··· 12637 12650 L: linux-gpio@vger.kernel.org 12638 12651 S: Supported 12639 12652 F: drivers/pinctrl/pinctrl-at91* 12653 + F: drivers/gpio/gpio-sama5d2-piobu.c 12640 12654 12641 12655 PIN CONTROLLER - FREESCALE 12642 12656 M: Dong Aisheng <aisheng.dong@nxp.com>
+1
arch/arm/mach-at91/.gitignore
··· 1 + pm_data-offsets.h
+3 -2
arch/arm/mach-at91/Makefile
··· 19 19 CFLAGS_pm.o += -DDEBUG 20 20 endif 21 21 22 - include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE 22 + $(obj)/pm_data-offsets.h: $(obj)/pm_data-offsets.s FORCE 23 23 $(call filechk,offsets,__PM_DATA_OFFSETS_H__) 24 24 25 - arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h 25 + $(obj)/pm_suspend.o: $(obj)/pm_data-offsets.h 26 26 27 27 targets += pm_data-offsets.s 28 + clean-files += pm_data-offsets.h
+1 -1
arch/arm/mach-at91/pm_suspend.S
··· 10 10 #include <linux/linkage.h> 11 11 #include <linux/clk/at91_pmc.h> 12 12 #include "pm.h" 13 - #include "generated/at91_pm_data-offsets.h" 13 + #include "pm_data-offsets.h" 14 14 15 15 #define SRAMC_SELF_FRESH_ACTIVE 0x01 16 16 #define SRAMC_SELF_FRESH_EXIT 0x00