Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bbf8693 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents e6dde5cc 2cb831e0

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -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>

MAINTAINERS

+1 −13
Original line number Diff line number Diff line
@@ -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>

arch/arm/mach-at91/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
pm_data-offsets.h

arch/arm/mach-at91/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-at91/pm_suspend.S

+1 −1
Original line number Diff line number Diff line
@@ -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