From: Linus Torvalds Date: Mon, 29 Oct 2018 22:37:33 +0000 (-0700) Subject: Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: v4.20-rc1~63 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4b42745211af552f170f38a1b97f4a112b5da6b2;p=linux.git Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform updates from Arnd Bergmann: "A couple of platforms change hands in the MAINTAINERS file: - Linus Walleij lists himself for the ARM Reference platforms: versatile, vexpress, integrator and realview. He has been the main contributor for these for a while, and makes it official now. - Vladimir Zapolskiy takes over the LPC18xx platform from Joachim Eastwood - Manivannan Sadhasivam becomes a secondary maintainer for the Actions Semi machines - Nicolas Ferre lists updates the MAINTAINER listing for the AT91 platform: Ludovic Desroches is now a co-maintainer for the platform, and several other people (Claudiu Beznea, Cristian Birsan, Eugen Hristev, Codrin Ciubotariu) take over individual device drivers. Thanks everyone for working on this, and welcome to the new maintainers! The "virt" platform on qemy or kvm can now be used in big-endian mode without additional tricks, thanks to Jason Donenfeld. Once again, we gain support for another NXP i.MX6 variant, this time it's the i.MX 6ULZ 32-bit single-core version. On arm64, we add support for two SoCs from Renesas: RZ/G2E (r8a774c0) and RZ/G2M (r8a774a1). These are described as microcontrollers on the manufacturer website, but appear to be rather powerful. The RZ/G2M is used on the reference board for the CIP Super Long Term Support (SLTS) Linux Kernels" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits) MAINTAINERS: Assign myself as a maintainer of ARM/LPC18XX architecture arm64: exynos: Enable generic power domain support MAINTAINERS: remove non-exsiting email address of Baoyou MAINTAINERS: fix pattern in ARM/Synaptics berlin SoC section MAINTAINERS: Drop dt-bindings/genpd/k2g.h ARM: samsung: Limit SAMSUNG_PM_CHECK config option to non-Exynos platforms arm64: actions: Enable PINCTRL in platforms Kconfig MAINTAINERS: Add entry for Actions Semi Owl SoCs DMA driver MAINTAINERS: Add entry for Actions Semiconductor Owl I2C driver MAINTAINERS: Update clock binding entry for Actions Semi Owl SoCs ARM: imx: add i.mx6ulz msl support ARM: Assume maintainership of ARM reference designs ARM: support big-endian for the virt architecture 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 ... --- 4b42745211af552f170f38a1b97f4a112b5da6b2 diff --cc MAINTAINERS index 85365afe3059,c6d249825200..930241eb6e2d --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -1190,7 -1219,10 +1228,10 @@@ N: ow F: arch/arm/mach-actions/ F: arch/arm/boot/dts/owl-* F: arch/arm64/boot/dts/actions/ + F: drivers/clk/actions/ -F: drivers/clocksource/owl-* +F: drivers/clocksource/timer-owl* + F: drivers/dma/owl-dma.c + F: drivers/i2c/busses/i2c-owl.c F: drivers/pinctrl/actions/* F: drivers/soc/actions/ F: include/dt-bindings/power/owl-* @@@ -9629,9 -9466,14 +9593,15 @@@ M: Richard Genoud + L: alsa-devel@alsa-project.org (moderated for non-subscribers) + S: Supported + F: sound/soc/atmel + + MICROCHIP DMA DRIVER M: Ludovic Desroches L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: dmaengine@vger.kernel.org @@@ -9654,28 -9504,13 +9632,28 @@@ F: drivers/media/platform/atmel/atmel-i F: drivers/media/platform/atmel/atmel-isc-regs.h F: devicetree/bindings/media/atmel-isc.txt - MICROCHIP / ATMEL NAND DRIVER - M: Josh Wu - L: linux-mtd@lists.infradead.org + MICROCHIP ISI DRIVER + M: Eugen Hristev + 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 AT91 USART MFD DRIVER +M: Radu Pirea +L: linux-kernel@vger.kernel.org +S: Supported +F: drivers/mfd/at91-usart.c +F: include/dt-bindings/mfd/at91-usart.h +F: Documentation/devicetree/bindings/mfd/atmel-usart.txt + +MICROCHIP AT91 USART SPI DRIVER +M: Radu Pirea +L: linux-spi@vger.kernel.org +S: Supported +F: drivers/spi/spi-at91-usart.c +F: Documentation/devicetree/bindings/mfd/atmel-usart.txt + MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER M: Woojung Huh M: Microchip Linux Driver Support @@@ -9693,14 -9528,72 +9671,80 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/microchip/lan743x_* - MICROCHIP / ATMEL MCP3911 ADC DRIVER + MICROCHIP LCDFB DRIVER + M: Nicolas Ferre + 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 + S: Maintained + F: drivers/mmc/host/atmel-mci.c + ++MICROCHIP MCP3911 ADC DRIVER +M: Marcus Folkesson +M: Kent Gustavsson +L: linux-iio@vger.kernel.org +S: Supported +F: drivers/iio/adc/mcp3911.c +F: Documentation/devicetree/bindings/iio/adc/mcp3911.txt + + MICROCHIP NAND DRIVER + M: Tudor Ambarus + 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 + 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 + M: Eugen Hristev + 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 + S: Supported + F: drivers/power/reset/at91-sama5d2_shdwc.c + + MICROCHIP SPI DRIVER + M: Nicolas Ferre + S: Supported + F: drivers/spi/spi-atmel.* + + MICROCHIP SSC DRIVER + M: Nicolas Ferre + 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 + 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 + 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 L: linux-usb@vger.kernel.org @@@ -11284,15 -11171,8 +11335,15 @@@ F: include/uapi/linux/switchtec_ioctl. F: include/linux/switchtec.h F: drivers/ntb/hw/mscc/ +PCI DRIVER FOR MOBIVEIL PCIE IP +M: Subrahmanya Lingappa +L: linux-pci@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/pci/mobiveil-pcie.txt +F: drivers/pci/controller/pcie-mobiveil.c + PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support) - M: Thomas Petazzoni + M: Thomas Petazzoni M: Jason Cooper L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) diff --cc include/linux/platform_data/gpio-omap.h index 8485c6a9a383,ed071f76b642..6d07eebb3f75 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@@ -205,4 -206,18 +208,6 @@@ struct omap_gpio_platform_data int (*get_context_loss_count)(struct device *dev); }; -#if IS_BUILTIN(CONFIG_GPIO_OMAP) -extern void omap2_gpio_prepare_for_idle(int off_mode); -extern void omap2_gpio_resume_after_idle(void); -#else -static inline void omap2_gpio_prepare_for_idle(int off_mode) -{ -} - -static inline void omap2_gpio_resume_after_idle(void) -{ -} -#endif + #endif /* __ASSEMBLER__ */ + #endif