From: Linus Torvalds Date: Fri, 28 Jun 2019 00:37:04 +0000 (+0800) Subject: Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc X-Git-Tag: microblaze-v5.4-rc1~472 X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=fe2da896fd9469317ff693fb08a86d9c435e101a;hp=-c;p=linux-2.6-microblaze.git Merge tag 'armsoc-fixes' of git://git./linux/kernel/git/soc/soc Pull ARM SoC fixes from Olof Johansson: "A smaller batch of fixes, nothing that stands out as risky or scary. Mostly DTS tweaks for a few issues: - GPU fixlets for Meson - CPU idle fix for LS1028A - PWM interrupt fixes for i.MX6UL Also, enable a driver (FSL_EDMA) on arm64 defconfig, and a warning and two MAINTAINER tweaks" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: dts: imx6ul: fix PWM[1-4] interrupts ARM: omap2: remove incorrect __init annotation ARM: dts: gemini Fix up DNS-313 compatible string ARM: dts: Blank D-Link DIR-685 console arm64: defconfig: Enable FSL_EDMA driver arm64: dts: ls1028a: Fix CPU idle fail. MAINTAINERS: BCM53573: Add internal Broadcom mailing list MAINTAINERS: BCM2835: Add internal Broadcom mailing list ARM: dts: meson8b: fix the operating voltage of the Mali GPU ARM: dts: meson8b: drop undocumented property from the Mali GPU node ARM: dts: meson8: fix GPU interrupts and drop an undocumented property --- fe2da896fd9469317ff693fb08a86d9c435e101a diff --combined MAINTAINERS index d0ed735994a5,d7fade1da0be..3c4d72755127 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -364,7 -364,7 +364,7 @@@ F: drivers/acpi/fan. ACPI FOR ARM64 (ACPI/arm64) M: Lorenzo Pieralisi -M: Hanjun Guo +M: Hanjun Guo M: Sudeep Holla L: linux-acpi@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1235,7 -1235,7 +1235,7 @@@ F: arch/arm/lib/floppydma. F: arch/arm/include/asm/floppy.h ARM PMU PROFILING AND DEBUGGING -M: Will Deacon +M: Will Deacon M: Mark Rutland S: Maintained L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1307,7 -1307,7 +1307,7 @@@ F: Documentation/devicetree/bindings/in F: drivers/irqchip/irq-vic.c ARM SMMU DRIVERS -M: Will Deacon +M: Will Deacon R: Robin Murphy L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -2550,7 -2550,7 +2550,7 @@@ F: drivers/i2c/busses/i2c-xiic. ARM64 PORT (AARCH64 ARCHITECTURE) M: Catalin Marinas -M: Will Deacon +M: Will Deacon L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git S: Maintained @@@ -2734,7 -2734,7 +2734,7 @@@ S: Maintaine F: drivers/net/wireless/atmel/atmel* ATOMIC INFRASTRUCTURE -M: Will Deacon +M: Will Deacon M: Peter Zijlstra R: Boqun Feng L: linux-kernel@vger.kernel.org @@@ -3122,6 -3122,7 +3122,7 @@@ F: arch/arm/mach-bcm BROADCOM BCM2835 ARM ARCHITECTURE M: Eric Anholt M: Stefan Wahren + L: bcm-kernel-feedback-list@broadcom.com L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux @@@ -3151,6 -3152,7 +3152,7 @@@ F: arch/arm/boot/dts/bcm953012 BROADCOM BCM53573 ARM ARCHITECTURE M: Rafał Miłecki + L: bcm-kernel-feedback-list@broadcom.com L: linux-arm-kernel@lists.infradead.org S: Maintained F: arch/arm/boot/dts/bcm53573* @@@ -6234,6 -6236,7 +6236,6 @@@ F: include/linux/ipmi-fru. K: fmc_d.*register FPGA MANAGER FRAMEWORK -M: Alan Tull M: Moritz Fischer L: linux-fpga@vger.kernel.org S: Maintained @@@ -8565,7 -8568,7 +8567,7 @@@ S: Odd Fixe KERNEL NFSD, SUNRPC, AND LOCKD SERVERS M: "J. Bruce Fields" -M: Jeff Layton +M: Chuck Lever L: linux-nfs@vger.kernel.org W: http://nfs.sourceforge.net/ T: git git://linux-nfs.org/~bfields/linux.git @@@ -9120,7 -9123,7 +9122,7 @@@ F: drivers/misc/lkdtm/ LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM) M: Alan Stern M: Andrea Parri -M: Will Deacon +M: Will Deacon M: Peter Zijlstra M: Boqun Feng M: Nicholas Piggin @@@ -9228,7 -9231,7 +9230,7 @@@ F: Documentation/admin-guide/LSM/LoadPi LOCKING PRIMITIVES M: Peter Zijlstra M: Ingo Molnar -M: Will Deacon +M: Will Deacon L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core S: Maintained @@@ -10549,7 -10552,7 +10551,7 @@@ F: arch/arm/boot/dts/mmp F: arch/arm/mach-mmp/ MMU GATHER AND TLB INVALIDATION -M: Will Deacon +M: Will Deacon M: "Aneesh Kumar K.V" M: Andrew Morton M: Nick Piggin @@@ -12038,7 -12041,7 +12040,7 @@@ S: Maintaine F: drivers/pci/controller/dwc/*layerscape* PCI DRIVER FOR GENERIC OF HOSTS -M: Will Deacon +M: Will Deacon L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -14334,15 -14337,6 +14336,15 @@@ S: Supporte K: sifive N: sifive +SIFIVE FU540 SYSTEM-ON-CHIP +M: Paul Walmsley +M: Palmer Dabbelt +L: linux-riscv@lists.infradead.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.git +S: Supported +K: fu540 +N: fu540 + SILEAD TOUCHSCREEN DRIVER M: Hans de Goede L: linux-input@vger.kernel.org @@@ -14403,7 -14397,7 +14405,7 @@@ F: lib/test_siphash. F: include/linux/siphash.h SIOX -M: Gavin Schenk +M: Thorsten Scherer M: Uwe Kleine-König R: Pengutronix Kernel Team S: Supported diff --combined arch/arm/mach-omap2/prm3xxx.c index fd4a3bf27993,dfa65fc2c82b..1b442b128569 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@@ -1,4 -1,3 +1,4 @@@ +// SPDX-License-Identifier: GPL-2.0-only /* * OMAP3xxx PRM module functions * @@@ -7,6 -6,10 +7,6 @@@ * Benoît Cousson * Paul Walmsley * Rajendra Nayak - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include @@@ -430,7 -433,7 +430,7 @@@ static void omap3_prm_reconfigure_io_ch * registers, and omap3xxx_prm_reconfigure_io_chain() must be called. * No return value. */ - static void __init omap3xxx_prm_enable_io_wakeup(void) + static void omap3xxx_prm_enable_io_wakeup(void) { if (prm_features & PRM_HAS_IO_WAKEUP) omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,