Commit d7f59da4 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

AT91 SoC for 4.20

 - rename MAINTAINERS entries and change maintainers
 - two pm cleanups

* tag 'at91-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  MAINTAINERS: sdhci: move the Microchip entry to proper location
  MAINTAINERS: move former ATMEL entries to proper MICROCHIP location
  MAINTAINERS: remove the / ATMEL string from MICROCHIP entries
  MAINTAINERS: iio: add co-maintainer to SAMA5D2-compatible ADC driver
  MAINTAINERS: pwm: add entry for Microchip pwm driver
  MAINTAINERS: dmaengine: add files to Microchip dma entry
  MAINTAINERS: USB: change maintainer for Microchip USBA gadget driver
  MAINTAINERS: ASoC: change maintainer for Microchip ALSA drivers
  MAINTAINERS: media: change Microchip ISI, ISC maintainers
  MAINTAINERS: update entry for Microchip NAND driver support
  MAINTAINERS: ARM: at91: add co-maintainer for ARM/Microchip
  ARM: at91: pm: call put_device instead of of_node_put in at91_pm_config_ws
  ARM: at91: pm: remove pm_bu initialization in at91_pm_backup_init()

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 827f847b 34d2a7db

MAINTAINERS

+105 −91
Original line number Diff line number Diff line
@@ -1703,9 +1703,10 @@ S: Odd Fixes 
ARM/Microchip (AT91) SoC support

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

M:	Alexandre Belloni <alexandre.belloni@bootlin.com>

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.linux4sam.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git

S:	Supported

N:	at91

N:	atmel
@@ -2472,42 +2473,6 @@ F: drivers/atm/ 
F:	include/linux/atm*

F:	include/uapi/linux/atm*



ATMEL AT91 / AT32 MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c



ATMEL AT91 SAMA5D2-Compatible Shutdown Controller

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/power/reset/at91-sama5d2_shdwc.c



ATMEL Audio ALSA driver

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel



ATMEL I2C DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-i2c@vger.kernel.org

S:	Supported

F:	drivers/i2c/busses/i2c-at91.c



ATMEL ISI DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/platform/atmel/atmel-isi.c

F:	include/media/atmel-isi.h



ATMEL LCDFB DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/fbdev/atmel_lcdfb.c

F:	include/video/atmel_lcdc.h



ATMEL MACB ETHERNET DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported
@@ -2520,43 +2485,6 @@ S: Maintained 
F:	Documentation/devicetree/bindings/input/atmel,maxtouch.txt

F:	drivers/input/touchscreen/atmel_mxt_ts.c



ATMEL SAMA5D2 ADC DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-iio@vger.kernel.org

S:	Supported

F:	drivers/iio/adc/at91-sama5d2_adc.c



ATMEL SDMMC DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-mmc@vger.kernel.org

S:	Supported

F:	drivers/mmc/host/sdhci-of-at91.c



ATMEL SPI DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/spi/spi-atmel.*



ATMEL SSC DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/misc/atmel-ssc.c

F:	include/linux/atmel-ssc.h



ATMEL 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



ATMEL USBA UDC DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	drivers/usb/gadget/udc/atmel_usba_udc.*



ATMEL WIRELESS DRIVER

M:	Simon Kelley <simon@thekelleys.org.uk>

L:	linux-wireless@vger.kernel.org
@@ -2565,13 +2493,6 @@ W: http://atmelwlandriver.sourceforge.net/ 
S:	Maintained

F:	drivers/net/wireless/atmel/atmel*



ATMEL XDMA DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org

L:	dmaengine@vger.kernel.org

S:	Supported

F:	drivers/dma/at_xdmac.c



ATOMIC INFRASTRUCTURE

M:	Will Deacon <will.deacon@arm.com>

M:	Peter Zijlstra <peterz@infradead.org>
@@ -9499,13 +9420,19 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git 
S:	Supported

F:	arch/microblaze/



MICROCHIP / ATMEL AT91 SERIAL DRIVER

MICROCHIP AT91 SERIAL DRIVER

M:	Richard Genoud <richard.genoud@gmail.com>

S:	Maintained

F:	drivers/tty/serial/atmel_serial.c

F:	drivers/tty/serial/atmel_serial.h



MICROCHIP / ATMEL DMA DRIVER

MICROCHIP AUDIO ASOC DRIVERS

M:	Codrin Ciubotariu <codrin.ciubotariu@microchip.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/atmel



MICROCHIP DMA DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	dmaengine@vger.kernel.org
@@ -9513,27 +9440,35 @@ S: Supported 
F:	drivers/dma/at_hdmac.c

F:	drivers/dma/at_hdmac_regs.h

F:	include/linux/platform_data/dma-atmel.h

F:	Documentation/devicetree/bindings/dma/atmel-dma.txt

F:	include/dt-bindings/dma/at91.h



MICROCHIP / ATMEL ECC DRIVER

MICROCHIP ECC DRIVER

M:	Tudor Ambarus <tudor.ambarus@microchip.com>

L:	linux-crypto@vger.kernel.org

S:	Maintained

F:	drivers/crypto/atmel-ecc.*



MICROCHIP / ATMEL ISC DRIVER

M:	Songjun Wu <songjun.wu@microchip.com>

MICROCHIP I2C DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-i2c@vger.kernel.org

S:	Supported

F:	drivers/i2c/busses/i2c-at91.c



MICROCHIP ISC DRIVER

M:	Eugen Hristev <eugen.hristev@microchip.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/platform/atmel/atmel-isc.c

F:	drivers/media/platform/atmel/atmel-isc-regs.h

F:	devicetree/bindings/media/atmel-isc.txt



MICROCHIP / ATMEL NAND DRIVER

M:	Josh Wu <rainyfeeling@outlook.com>

L:	linux-mtd@lists.infradead.org

MICROCHIP ISI DRIVER

M:	Eugen Hristev <eugen.hristev@microchip.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/mtd/nand/raw/atmel/*

F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt

F:	drivers/media/platform/atmel/atmel-isi.c

F:	include/media/atmel-isi.h



MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER

M:	Woojung Huh <Woojung.Huh@microchip.com>
@@ -9552,6 +9487,72 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ethernet/microchip/lan743x_*



MICROCHIP LCDFB DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/fbdev/atmel_lcdfb.c

F:	include/video/atmel_lcdc.h



MICROCHIP MMC/SD/SDIO MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c



MICROCHIP NAND DRIVER

M:	Tudor Ambarus <tudor.ambarus@microchip.com>

L:	linux-mtd@lists.infradead.org

S:	Supported

F:	drivers/mtd/nand/raw/atmel/*

F:	Documentation/devicetree/bindings/mtd/atmel-nand.txt



MICROCHIP PWM DRIVER

M:	Claudiu Beznea <claudiu.beznea@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-pwm@vger.kernel.org

S:	Supported

F:	drivers/pwm/pwm-atmel.c

F:	Documentation/devicetree/bindings/pwm/atmel-pwm.txt



MICROCHIP SAMA5D2-COMPATIBLE ADC DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

M:	Eugen Hristev <eugen.hristev@microchip.com>

L:	linux-iio@vger.kernel.org

S:	Supported

F:	drivers/iio/adc/at91-sama5d2_adc.c

F:	Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

F:	include/dt-bindings/iio/adc/at91-sama5d2_adc.h



MICROCHIP SAMA5D2-COMPATIBLE SHUTDOWN CONTROLLER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/power/reset/at91-sama5d2_shdwc.c



MICROCHIP SPI DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

S:	Supported

F:	drivers/spi/spi-atmel.*



MICROCHIP SSC DRIVER

M:	Nicolas Ferre <nicolas.ferre@microchip.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

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)

S:	Supported

F:	drivers/usb/gadget/udc/atmel_usba_udc.*



MICROCHIP USB251XB DRIVER

M:	Richard Leitner <richard.leitner@skidata.com>

L:	linux-usb@vger.kernel.org
@@ -9559,6 +9560,13 @@ S: Maintained 
F:	drivers/usb/misc/usb251xb.c

F:	Documentation/devicetree/bindings/usb/usb251xb.txt



MICROCHIP XDMA DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-arm-kernel@lists.infradead.org

L:	dmaengine@vger.kernel.org

S:	Supported

F:	drivers/dma/at_xdmac.c



MICROSEMI MIPS SOCS

M:	Alexandre Belloni <alexandre.belloni@bootlin.com>

L:	linux-mips@linux-mips.org
@@ -12994,6 +13002,12 @@ L: linux-mmc@vger.kernel.org 
S:	Maintained

F:	drivers/mmc/host/sdhci-pci-dwc-mshc.c



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER

M:	Ludovic Desroches <ludovic.desroches@microchip.com>

L:	linux-mmc@vger.kernel.org

S:	Supported

F:	drivers/mmc/host/sdhci-of-at91.c



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER

M:	Ben Dooks <ben-linux@fluff.org>

M:	Jaehoon Chung <jh80.chung@samsung.com>

arch/arm/mach-at91/pm.c

+3 −6
Original line number Diff line number Diff line
@@ -143,15 +143,15 @@ static int at91_pm_config_ws(unsigned int pm_mode, bool set) 


			/* Check if enabled on SHDWC. */

			if (wsi->shdwc_mr_bit && !(val & wsi->shdwc_mr_bit))

				goto put_node;

				goto put_device;



			mode |= wsi->pmc_fsmr_bit;

			if (wsi->set_polarity)

				polarity |= wsi->pmc_fsmr_bit;

		}



put_node:

		of_node_put(np);

put_device:

		put_device(&pdev->dev);

	}



	if (mode) {
@@ -580,8 +580,6 @@ static int __init at91_pm_backup_init(void) 
	if (!at91_is_pm_mode_active(AT91_PM_BACKUP))

		return 0;



	pm_bu = NULL;



	np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-sfrbu");

	if (!np) {

		pr_warn("%s: failed to find sfrbu!\n", __func__);
@@ -590,7 +588,6 @@ static int __init at91_pm_backup_init(void) 


	pm_data.sfrbu = of_iomap(np, 0);

	of_node_put(np);

	pm_bu = NULL;



	np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");

	if (!np)

CRA Git | Maintained and supported by SUSTech CRA and CCSE