From: Linus Torvalds Date: Wed, 17 Jul 2019 16:42:03 +0000 (-0700) Subject: Merge tag 'mips_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux X-Git-Tag: v5.3-rc1~62 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fa121bb3fed6313b1f0af23952301e06cf6d32ed;p=linux-2.6-block.git Merge tag 'mips_5.3' of git://git./linux/kernel/git/mips/linux Pull MIPS updates from Paul Burton: "A light batch this time around but significant improvements for certain systems: - Removal of readq & writeq for MIPS32 kernels where they would simply BUG() anyway, allowing drivers or other code that #ifdefs on their presence to work properly. - Improvements for Ingenic JZ4740 systems, including support for the external memory controller & pinmuxing fixes for qi_lb60/NanoNote systems. - Improvements for Lantiq systems, in particular around SMP & IPIs. - DT updates for ralink/MediaTek MT7628a systems to probe & configure a bunch more devices. - Miscellaneous cleanups & build fixes" * tag 'mips_5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (30 commits) MIPS: fix some more fall through errors in arch/mips MIPS: perf events: handle switch statement falling through warnings mips/kprobes: Export kprobe_fault_handler() MAINTAINERS: Add myself as Ingenic SoCs maintainer MIPS: ralink: mt7628a.dtsi: Add watchdog controller DT node MIPS: ralink: mt7628a.dtsi: Add SPI controller DT node MIPS: ralink: mt7628a.dtsi: Add GPIO controller DT node MIPS: ralink: mt7628a.dtsi: Add pinctrl DT properties to the UART nodes MIPS: ralink: mt7628a.dtsi: Add pinmux DT node MIPS: ralink: mt7628a.dtsi: Add SPDX GPL-2.0 license identifier MIPS: lantiq: Add SMP support for lantiq interrupt controller MIPS: lantiq: Shorten register names, remove unused macros MIPS: lantiq: Fix bitfield masking MIPS: lantiq: Remove unused macros MIPS: lantiq: Fix attributes of of_device_id structure MIPS: lantiq: Change variables to the same type as the source MIPS: lantiq: Move macro directly to iomem function mips: Remove q-accessors from non-64bit platforms FDDI: defza: Include linux/io-64-nonatomic-lo-hi.h MIPS: configs: Remove useless UEVENT_HELPER_PATH ... --- fa121bb3fed6313b1f0af23952301e06cf6d32ed diff --cc MAINTAINERS index c144bd6a432e,5f0ac16503a8..51ef58f15cdd --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -7953,8 -7788,35 +7953,35 @@@ INGENIC JZ4780 NAND DRIVE M: Harvey Hunt L: linux-mtd@lists.infradead.org S: Maintained -F: drivers/mtd/nand/raw/jz4780_* +F: drivers/mtd/nand/raw/ingenic/ + INGENIC JZ47xx SoCs + M: Paul Cercueil + S: Maintained + F: arch/mips/boot/dts/ingenic/ + F: arch/mips/include/asm/mach-jz4740/ + F: arch/mips/jz4740/ + F: drivers/clk/ingenic/ + F: drivers/dma/dma-jz4780.c + F: drivers/gpu/drm/ingenic/ + F: drivers/i2c/busses/i2c-jz4780.c + F: drivers/iio/adc/ingenic-adc.c + F: drivers/irqchip/irq-ingenic.c + F: drivers/memory/jz4780-nemc.c + F: drivers/mmc/host/jz4740_mmc.c + F: drivers/mtd/nand/raw/ingenic/ + F: drivers/pinctrl/pinctrl-ingenic.c + F: drivers/power/supply/ingenic-battery.c + F: drivers/pwm/pwm-jz4740.c + F: drivers/rtc/rtc-jz4740.c + F: drivers/tty/serial/8250/8250_ingenic.c + F: drivers/usb/musb/jz4740.c + F: drivers/watchdog/jz4740_wdt.c + F: include/dt-bindings/iio/adc/ingenic,adc.h + F: include/linux/mfd/ingenic-tcu.h + F: sound/soc/jz4740/ + F: sound/soc/codecs/jz47* + INOTIFY M: Jan Kara R: Amir Goldstein diff --cc arch/mips/configs/rb532_defconfig index 864c70fbe668,97d96117e11a..5b947183852b --- a/arch/mips/configs/rb532_defconfig +++ b/arch/mips/configs/rb532_defconfig @@@ -103,8 -103,8 +103,7 @@@ CONFIG_GACT_PROB= CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_PEDIT=m -CONFIG_NET_CLS_IND=y CONFIG_HAMRADIO=y - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK2MTD=y diff --cc arch/mips/include/asm/mach-ralink/pinmux.h index e54d4e1533b4,33647f796140..048309348be0 --- a/arch/mips/include/asm/mach-ralink/pinmux.h +++ b/arch/mips/include/asm/mach-ralink/pinmux.h @@@ -1,6 -1,5 +1,5 @@@ -// SPDX-License-Identifier: GPL-2.0 +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * * Copyright (C) 2012 John Crispin */