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

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: Olof Johansson <olof@lixom.net>

diff --combined MAINTAINERS
index a6ecd18b7800f6281ea44cf5fb988d0d0c7a5c01,df2f61548308306ad165b5e0182abc6e4a903d3f..5b406b0e5bd565143e257ed3f3ba4729dd3dd26a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1703,9 -1703,10 +1703,10 @@@ S:    Odd Fixe
  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
@@@ -2085,12 -2086,10 +2086,12 @@@ F:   include/linux/remoteproc/st_slim_rpr
  ARM/STM32 ARCHITECTURE
  M:    Maxime Coquelin <mcoquelin.stm32@gmail.com>
  M:    Alexandre Torgue <alexandre.torgue@st.com>
 +L:    linux-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
  N:    stm32
 +N:    stm
  F:    arch/arm/boot/dts/stm32*
  F:    arch/arm/mach-stm32/
  F:    drivers/clocksource/armv7m_systick.c
@@@ -2472,42 -2471,6 +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 -2483,6 +2485,6 @@@ S:     Maintaine
  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 -2491,6 +2493,6 @@@ W:     http://atmelwlandriver.sourceforge.n
  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>
@@@ -8257,9 -8176,9 +8178,9 @@@ F:      drivers/ata/pata_arasan_cf.
  
  LIBATA PATA DRIVERS
  M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 -M:    Jens Axboe <kernel.dk>
 +M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/pata_*.c
  F:    drivers/ata/ata_generic.c
@@@ -8277,7 -8196,7 +8198,7 @@@ LIBATA SATA AHCI PLATFORM devices suppo
  M:    Hans de Goede <hdegoede@redhat.com>
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/ahci_platform.c
  F:    drivers/ata/libahci_platform.c
@@@ -8293,7 -8212,7 +8214,7 @@@ F:      drivers/ata/sata_promise.
  LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
  M:    Jens Axboe <axboe@kernel.dk>
  L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
  S:    Maintained
  F:    drivers/ata/
  F:    include/linux/ata.h
@@@ -9499,13 -9418,19 +9420,19 @@@ T:   git git://git.monstr.eu/linux-2.6-mi
  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 -9438,35 +9440,35 @@@ S:   Supporte
  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 -9485,72 +9487,72 @@@ L:    netdev@vger.kernel.or
  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 -9558,13 +9560,13 @@@ S:    Maintaine
  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 -13000,12 +13002,12 @@@ L: linux-mmc@vger.kernel.or
  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>