From: Jiri Kosina Date: Tue, 6 Nov 2018 12:57:02 +0000 (+0100) Subject: Merge branch 'master' into for-4.20/upstream-fixes X-Git-Tag: v4.20-rc2~30^2~2 X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/0c7244209588630a9b45e52490ef1390e04499a6?hp=-c Merge branch 'master' into for-4.20/upstream-fixes Pull in a merge commit that brought in 3b692c55e58d ("HID: asus: only support backlight when it's not driven by WMI") so that fixup could be applied on top of it. --- 0c7244209588630a9b45e52490ef1390e04499a6 diff --combined MAINTAINERS index 4715cb8d9584,245ba32f5364..2f9723c075c3 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -376,7 -376,7 +376,7 @@@ F: drivers/platform/x86/i2c-multi-insta ACPI PMIC DRIVERS M: "Rafael J. Wysocki" M: Len Brown - R: Andy Shevchenko + R: Andy Shevchenko R: Mika Westerberg L: linux-acpi@vger.kernel.org Q: https://patchwork.kernel.org/project/linux-acpi/list/ @@@ -535,7 -535,7 +535,7 @@@ F: Documentation/hwmon/adt747 F: drivers/hwmon/adt7475.c ADVANSYS SCSI DRIVER - M: Matthew Wilcox + M: Matthew Wilcox M: Hannes Reinecke L: linux-scsi@vger.kernel.org S: Maintained @@@ -549,6 -549,15 +549,15 @@@ W: http://ez.analog.com/community/linux S: Supported F: drivers/input/misc/adxl34x.c + ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER + M: Stefan Popa + W: http://ez.analog.com/community/linux-device-drivers + S: Supported + F: drivers/iio/accel/adxl372.c + F: drivers/iio/accel/adxl372_spi.c + F: drivers/iio/accel/adxl372_i2c.c + F: Documentation/devicetree/bindings/iio/accel/adxl372.txt + AF9013 MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org @@@ -662,6 -671,13 +671,13 @@@ L: linux-crypto@vger.kernel.or S: Maintained F: drivers/crypto/sunxi-ss/ + ALLWINNER VPU DRIVER + M: Maxime Ripard + M: Paul Kocialkowski + L: linux-media@vger.kernel.org + S: Maintained + F: drivers/staging/media/sunxi/cedrus/ + ALPHA PORT M: Richard Henderson M: Ivan Kokshaysky @@@ -932,6 -948,7 +948,7 @@@ M: Greg Kroah-Hartman M: Todd Kjos M: Martijn Coenen + M: Joel Fernandes T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git L: devel@driverdev.osuosl.org S: Supported @@@ -1077,6 -1094,29 +1094,29 @@@ F: arch/arm/include/asm/arch_timer. F: arch/arm64/include/asm/arch_timer.h F: drivers/clocksource/arm_arch_timer.c + ARM INTEGRATOR, VERSATILE AND REALVIEW SUPPORT + M: Linus Walleij + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + S: Maintained + F: Documentation/devicetree/bindings/arm/arm-boards + F: Documentation/devicetree/bindings/auxdisplay/arm-charlcd.txt + F: Documentation/devicetree/bindings/clock/arm-integrator.txt + F: Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt + F: Documentation/devicetree/bindings/mtd/arm-versatile.txt + F: arch/arm/mach-integrator/ + F: arch/arm/mach-realview/ + F: arch/arm/mach-versatile/ + F: arch/arm/plat-versatile/ + F: arch/arm/boot/dts/arm-realview-* + F: arch/arm/boot/dts/integrator* + F: arch/arm/boot/dts/versatile* + F: drivers/clk/versatile/ + F: drivers/i2c/busses/i2c-versatile.c + F: drivers/irqchip/irq-versatile-fpga.c + F: drivers/mtd/maps/physmap_of_versatile.c + F: drivers/power/reset/arm-versatile-reboot.c + F: drivers/soc/versatile/ + ARM HDLCD DRM DRIVER M: Liviu Dudau S: Supported @@@ -1149,12 -1189,26 +1189,26 @@@ S: Odd Fixe F: drivers/mmc/host/mmci.* F: include/linux/amba/mmci.h + ARM PRIMECELL SSP PL022 SPI DRIVER + M: Linus Walleij + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + S: Maintained + F: Documentation/devicetree/bindings/spi/spi_pl022.txt + F: drivers/spi/spi-pl022.c + ARM PRIMECELL UART PL010 AND PL011 DRIVERS M: Russell King S: Odd Fixes F: drivers/tty/serial/amba-pl01*.c F: include/linux/amba/serial.h + ARM PRIMECELL VIC PL190/PL192 DRIVER + M: Linus Walleij + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + S: Maintained + F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt + F: drivers/irqchip/irq-vic.c + ARM SMMU DRIVERS M: Will Deacon R: Robin Murphy @@@ -1174,18 -1228,25 +1228,25 @@@ T: git git://git.kernel.org/pub/scm/lin ARM/ACTIONS SEMI ARCHITECTURE M: Andreas Färber + R: Manivannan Sadhasivam L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained N: owl F: arch/arm/mach-actions/ F: arch/arm/boot/dts/owl-* F: arch/arm64/boot/dts/actions/ - F: drivers/clocksource/owl-* + F: drivers/clk/actions/ + 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-* F: include/linux/soc/actions/ F: Documentation/devicetree/bindings/arm/actions.txt + F: Documentation/devicetree/bindings/clock/actions,owl-cmu.txt + F: Documentation/devicetree/bindings/dma/owl-dma.txt + F: Documentation/devicetree/bindings/i2c/i2c-owl.txt F: Documentation/devicetree/bindings/pinctrl/actions,s900-pinctrl.txt F: Documentation/devicetree/bindings/power/actions,owl-sps.txt F: Documentation/devicetree/bindings/timer/actions,owl-timer.txt @@@ -1461,7 -1522,9 +1522,9 @@@ F: arch/arm/mach-mxs F: arch/arm/boot/dts/imx* F: arch/arm/configs/imx*_defconfig F: drivers/clk/imx/ + F: drivers/firmware/imx/ F: drivers/soc/imx/ + F: include/linux/firmware/imx/ F: include/soc/imx/ ARM/FREESCALE VYBRID ARM ARCHITECTURE @@@ -1598,12 -1661,10 +1661,10 @@@ L: linux-arm-kernel@lists.infradead.or S: Maintained ARM/LPC18XX ARCHITECTURE - M: Joachim Eastwood + M: Vladimir Zapolskiy L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/boot/dts/lpc43* - F: drivers/clk/nxp/clk-lpc18xx* - F: drivers/clocksource/time-lpc32xx.c F: drivers/i2c/busses/i2c-lpc2k.c F: drivers/memory/pl172.c F: drivers/mtd/spi-nor/nxp-spifi.c @@@ -1702,9 -1763,10 +1763,10 @@@ S: Odd Fixe ARM/Microchip (AT91) SoC support M: Nicolas Ferre M: Alexandre Belloni + M: Ludovic Desroches 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 @@@ -2084,22 -2146,24 +2146,24 @@@ F: include/linux/remoteproc/st_slim_rpr ARM/STM32 ARCHITECTURE M: Maxime Coquelin M: Alexandre Torgue + 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 - ARM/Synaptics Berlin SoC support + ARM/Synaptics SoC support M: Jisheng Zhang M: Sebastian Hesselbarth L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-berlin/ F: arch/arm/boot/dts/berlin* - F: arch/arm64/boot/dts/marvell/berlin* + F: arch/arm64/boot/dts/synaptics/ ARM/TANGO ARCHITECTURE M: Marc Gonzalez @@@ -2220,7 -2284,7 +2284,7 @@@ F: arch/arm/mach-vexpress F: */*/vexpress* F: */*/*/vexpress* F: drivers/clk/versatile/clk-vexpress-osc.c - F: drivers/clocksource/versatile.c + F: drivers/clocksource/timer-versatile.c N: mps2 ARM/VFP SUPPORT @@@ -2242,7 -2306,7 +2306,7 @@@ M: Tony Prisk - M: Baoyou Xie M: Shawn Guo L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -2307,7 -2370,7 +2370,7 @@@ F: drivers/cpuidle/cpuidle-zynq. F: drivers/block/xsysace.c N: zynq N: xilinx - F: drivers/clocksource/cadence_ttc_timer.c + F: drivers/clocksource/timer-cadence-ttc.c F: drivers/i2c/busses/i2c-cadence.c F: drivers/mmc/host/sdhci-of-arasan.c F: drivers/edac/synopsys_edac.c @@@ -2471,42 -2534,6 +2534,6 @@@ F: drivers/atm F: include/linux/atm* F: include/uapi/linux/atm* - ATMEL AT91 / AT32 MCI DRIVER - M: Ludovic Desroches - S: Maintained - F: drivers/mmc/host/atmel-mci.c - - ATMEL AT91 SAMA5D2-Compatible Shutdown Controller - M: Nicolas Ferre - S: Supported - F: drivers/power/reset/at91-sama5d2_shdwc.c - - ATMEL Audio ALSA driver - M: Nicolas Ferre - L: alsa-devel@alsa-project.org (moderated for non-subscribers) - S: Supported - F: sound/soc/atmel - - ATMEL I2C DRIVER - M: Ludovic Desroches - L: linux-i2c@vger.kernel.org - S: Supported - F: drivers/i2c/busses/i2c-at91.c - - ATMEL ISI DRIVER - M: Ludovic Desroches - 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 - 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 S: Supported @@@ -2519,43 -2546,6 +2546,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 - L: linux-iio@vger.kernel.org - S: Supported - F: drivers/iio/adc/at91-sama5d2_adc.c - - ATMEL SDMMC DRIVER - M: Ludovic Desroches - L: linux-mmc@vger.kernel.org - S: Supported - F: drivers/mmc/host/sdhci-of-at91.c - - ATMEL SPI DRIVER - M: Nicolas Ferre - S: Supported - F: drivers/spi/spi-atmel.* - - ATMEL 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 - - ATMEL 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 - - ATMEL USBA UDC DRIVER - M: Nicolas Ferre - 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 L: linux-wireless@vger.kernel.org @@@ -2564,13 -2554,6 +2554,6 @@@ W: http://atmelwlandriver.sourceforge.n S: Maintained F: drivers/net/wireless/atmel/atmel* - ATMEL XDMA DRIVER - M: Ludovic Desroches - 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 M: Peter Zijlstra @@@ -3184,7 -3167,7 +3167,7 @@@ F: drivers/gpio/gpio-bt8xx. BTRFS FILE SYSTEM M: Chris Mason - M: Josef Bacik + M: Josef Bacik M: David Sterba L: linux-btrfs@vger.kernel.org W: http://btrfs.wiki.kernel.org/ @@@ -3228,6 -3211,15 +3211,15 @@@ T: git git://git.alsa-project.org/alsa- S: Maintained F: sound/pci/oxygen/ + C-SKY ARCHITECTURE + M: Guo Ren + T: git https://github.com/c-sky/csky-linux.git + S: Supported + F: arch/csky/ + F: Documentation/devicetree/bindings/csky/ + K: csky + N: csky + C6X ARCHITECTURE M: Mark Salter M: Aurelien Jacquiot @@@ -3838,7 -3830,6 +3830,6 @@@ W: http://www.arm.com/products/processo S: Maintained F: drivers/cpufreq/arm_big_little.h F: drivers/cpufreq/arm_big_little.c - F: drivers/cpufreq/arm_big_little_dt.c CPU POWER MONITORING SUBSYSTEM M: Thomas Renninger @@@ -4055,7 -4046,7 +4046,7 @@@ M: Uma Krishnan L: linux-input@vger.kernel.org S: Supported - F: drivers/input/dlink-dir685-touchkeys.c + F: drivers/input/keyboard/dlink-dir685-touchkeys.c DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK M: Joshua Kinard @@@ -4216,6 -4207,12 +4207,12 @@@ M: Pali Rohár + L: platform-driver-x86@vger.kernel.org + S: Maintained + F: drivers/platform/x86/dell_rbu.c + DELL LAPTOP SMM DRIVER M: Pali Rohár S: Maintained @@@ -4223,10 -4220,11 +4220,11 @@@ F: drivers/hwmon/dell-smm-hwmon. F: include/uapi/linux/i8k.h DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas) - M: Doug Warzecha + M: Stuart Hayes + L: platform-driver-x86@vger.kernel.org S: Maintained F: Documentation/dcdbas.txt - F: drivers/firmware/dcdbas.* + F: drivers/platform/x86/dcdbas.* DELL WMI NOTIFICATIONS DRIVER M: Matthew Garrett @@@ -4378,13 -4376,6 +4376,6 @@@ L: linux-gpio@vger.kernel.or S: Maintained F: drivers/gpio/gpio-gpio-mm.c - DIGI NEO AND CLASSIC PCI PRODUCTS - M: Lidza Louina - M: Mark Hounschell - L: driverdev-devel@linuxdriverproject.org - S: Maintained - F: drivers/staging/dgnc/ - DIOLAN U2C-12 I2C DRIVER M: Guenter Roeck L: linux-i2c@vger.kernel.org @@@ -4392,7 -4383,7 +4383,7 @@@ S: Maintaine F: drivers/i2c/busses/i2c-diolan-u2c.c FILESYSTEM DIRECT ACCESS (DAX) - M: Matthew Wilcox + M: Matthew Wilcox M: Ross Zwisler M: Jan Kara L: linux-fsdevel@vger.kernel.org @@@ -4534,13 -4525,15 +4525,15 @@@ L: linux-media@vger.kernel.or T: git git://linuxtv.org/media_tree.git S: Maintained F: drivers/media/i2c/dw9714.c + F: Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt DONGWOON DW9807 LENS VOICE COIL DRIVER M: Sakari Ailus L: linux-media@vger.kernel.org T: git git://linuxtv.org/media_tree.git S: Maintained - F: drivers/media/i2c/dw9807.c + F: drivers/media/i2c/dw9807-vcm.c + F: Documentation/devicetree/bindings/media/i2c/dongwoon,dw9807-vcm.txt DOUBLETALK DRIVER M: "James R. Van Zandt" @@@ -4755,8 -4748,11 +4748,11 @@@ F: drivers/gpu/drm/tdfx DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS M: Dave Airlie + R: Sean Paul + L: dri-devel@lists.freedesktop.org S: Odd Fixes F: drivers/gpu/drm/udl/ + T: git git://anongit.freedesktop.org/drm/drm-misc DRM DRIVER FOR VMWARE VIRTUAL GPU M: "VMware Graphics" @@@ -4786,8 -4782,8 +4782,8 @@@ F: include/uapi/drm F: include/linux/vga* DRM DRIVERS AND MISC GPU PATCHES - M: Gustavo Padovan M: Maarten Lankhorst + M: Maxime Ripard M: Sean Paul W: https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html S: Maintained @@@ -4856,6 -4852,7 +4852,7 @@@ F: drivers/gpu/drm/fsl-dcu F: Documentation/devicetree/bindings/display/fsl,dcu.txt F: Documentation/devicetree/bindings/display/fsl,tcon.txt F: Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt + T: git git://anongit.freedesktop.org/drm/drm-misc DRM DRIVERS FOR FREESCALE IMX M: Philipp Zabel @@@ -4905,9 -4902,10 +4902,10 @@@ F: Documentation/devicetree/bindings/di DRM DRIVERS FOR RENESAS M: Laurent Pinchart + M: Kieran Bingham L: dri-devel@lists.freedesktop.org L: linux-renesas-soc@vger.kernel.org - T: git git://linuxtv.org/pinchartl/fbdev + T: git git://linuxtv.org/pinchartl/media drm/du/next S: Supported F: drivers/gpu/drm/rcar-du/ F: drivers/gpu/drm/shmobile/ @@@ -5364,7 -5362,8 +5362,8 @@@ S: Maintaine F: drivers/edac/r82600_edac.c EDAC-SBRIDGE - M: Mauro Carvalho Chehab + M: Tony Luck + R: Qiuxu Zhuo L: linux-edac@vger.kernel.org S: Maintained F: drivers/edac/sb_edac.c @@@ -5381,6 -5380,14 +5380,14 @@@ L: linux-edac@vger.kernel.or S: Maintained F: drivers/edac/ti_edac.c + EDAC-QCOM + M: Channagoud Kadabi + M: Venkata Narendra Kumar Gutta + L: linux-arm-msm@vger.kernel.org + L: linux-edac@vger.kernel.org + S: Maintained + F: drivers/edac/qcom_edac.c + EDIROL UA-101/UA-1000 DRIVER M: Clemens Ladisch L: alsa-devel@alsa-project.org (moderated for non-subscribers) @@@ -5659,10 -5666,9 +5666,9 @@@ F: Documentation/fault-injection F: lib/fault-inject.c FBTFT Framebuffer drivers - M: Thomas Petazzoni + S: Orphan L: dri-devel@lists.freedesktop.org L: linux-fbdev@vger.kernel.org - S: Maintained F: drivers/staging/fbtft/ FC0011 TUNER DRIVER @@@ -6588,9 -6594,9 +6594,9 @@@ F: arch/*/include/asm/suspend*. HID CORE LAYER M: Jiri Kosina -R: Benjamin Tissoires +M: Benjamin Tissoires L: linux-input@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git S: Maintained F: drivers/hid/ F: include/linux/hid* @@@ -7348,6 -7354,12 +7354,12 @@@ L: alsa-devel@alsa-project.org (moderat S: Supported F: sound/soc/intel/ + INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER + M: Hans de Goede + L: platform-driver-x86@vger.kernel.org + S: Maintained + F: drivers/platform/x86/intel_atomisp2_pm.c + INTEL C600 SERIES SAS CONTROLLER DRIVER M: Intel SCU Linux support M: Artur Paszkiewicz @@@ -7534,7 -7546,6 +7546,6 @@@ M: Rajneesh Bhardwaj L: platform-driver-x86@vger.kernel.org S: Maintained - F: arch/x86/include/asm/pmc_core.h F: drivers/platform/x86/intel_pmc_core* INTEL PMC/P-Unit IPC DRIVER @@@ -7577,16 -7588,9 +7588,9 @@@ S: Supporte F: drivers/infiniband/hw/i40iw/ F: include/uapi/rdma/i40iw-abi.h - INTEL SHA MULTIBUFFER DRIVER - M: Megha Dey - R: Tim Chen - L: linux-crypto@vger.kernel.org - S: Supported - F: arch/x86/crypto/sha*-mb/ - F: crypto/mcryptd.c - INTEL TELEMETRY DRIVER - M: Souvik Kumar Chakravarty + M: Rajneesh Bhardwaj + M: "David E. Box" L: platform-driver-x86@vger.kernel.org S: Maintained F: arch/x86/include/asm/intel_telemetry.h @@@ -7729,7 -7733,6 +7733,6 @@@ IPX NETWORK LAYE L: netdev@vger.kernel.org S: Obsolete F: include/uapi/linux/ipx.h - F: drivers/staging/ipx/ IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) M: Marc Zyngier @@@ -8164,6 -8167,7 +8167,7 @@@ F: security/keys/encrypted-keys KEYS-TRUSTED M: James Bottomley + M: Jarkko Sakkinen M: Mimi Zohar L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org @@@ -8319,6 -8323,14 +8323,14 @@@ W: http://legousb.sourceforge.net S: Maintained F: drivers/usb/misc/legousbtower.c + LG LAPTOP EXTRAS + M: Matan Ziv-Av + L: platform-driver-x86@vger.kernel.org + S: Maintained + F: Documentation/ABI/testing/sysfs-platform-lg-laptop + F: Documentation/laptops/lg-laptop.rst + F: drivers/platform/x86/lg-laptop.c + LG2160 MEDIA DRIVER M: Michael Krufky L: linux-media@vger.kernel.org @@@ -8702,11 -8714,18 +8714,18 @@@ F: drivers/message/fusion F: drivers/scsi/mpt3sas/ LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers - M: Matthew Wilcox + M: Matthew Wilcox L: linux-scsi@vger.kernel.org S: Maintained F: drivers/scsi/sym53c8xx_2/ + LTC1660 DAC DRIVER + M: Marcus Folkesson + L: linux-iio@vger.kernel.org + S: Maintained + F: Documentation/devicetree/bindings/iio/dac/ltc1660.txt + F: drivers/iio/dac/ltc1660.c + LTC4261 HARDWARE MONITOR DRIVER M: Guenter Roeck L: linux-hwmon@vger.kernel.org @@@ -8871,7 -8890,7 +8890,7 @@@ S: Maintaine F: drivers/net/phy/marvell10g.c MARVELL MVNETA ETHERNET DRIVER - M: Thomas Petazzoni + M: Thomas Petazzoni L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/marvell/mvneta.* @@@ -9070,11 -9089,10 +9089,10 @@@ F: drivers/media/dvb-frontends/cxd2880/ F: drivers/media/spi/cxd2880* MEDIA DRIVERS FOR DIGITAL DEVICES PCIE DEVICES - M: Daniel Scheller L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git - S: Maintained + S: Orphan F: drivers/media/pci/ddbridge/* MEDIA DRIVERS FOR FREESCALE IMX @@@ -9089,6 -9107,13 +9107,13 @@@ F: drivers/staging/media/imx F: include/linux/imx-media.h F: include/media/imx.h + MEDIA DRIVER FOR FREESCALE IMX PXP + M: Philipp Zabel + L: linux-media@vger.kernel.org + T: git git://linuxtv.org/media_tree.git + S: Maintained + F: drivers/media/platform/imx-pxp.[ch] + MEDIA DRIVERS FOR HELENE M: Abylay Ospan L: linux-media@vger.kernel.org @@@ -9119,11 -9144,10 +9144,10 @@@ S: Supporte F: drivers/media/dvb-frontends/lnbh25* MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS - M: Daniel Scheller L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git - S: Maintained + S: Orphan F: drivers/media/dvb-frontends/mxl5xx* MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices @@@ -9166,7 -9190,7 +9190,7 @@@ F: drivers/media/platform/rcar-fcp. F: include/media/rcar-fcp.h MEDIA DRIVERS FOR RENESAS - FDP1 - M: Kieran Bingham + M: Kieran Bingham L: linux-media@vger.kernel.org L: linux-renesas-soc@vger.kernel.org T: git git://linuxtv.org/media_tree.git @@@ -9186,6 -9210,7 +9210,7 @@@ F: drivers/media/platform/rcar-vin MEDIA DRIVERS FOR RENESAS - VSP1 M: Laurent Pinchart + M: Kieran Bingham L: linux-media@vger.kernel.org L: linux-renesas-soc@vger.kernel.org T: git git://linuxtv.org/media_tree.git @@@ -9194,19 -9219,17 +9219,17 @@@ F: Documentation/devicetree/bindings/me F: drivers/media/platform/vsp1/ MEDIA DRIVERS FOR ST STV0910 DEMODULATOR ICs - M: Daniel Scheller L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git - S: Maintained + S: Orphan F: drivers/media/dvb-frontends/stv0910* MEDIA DRIVERS FOR ST STV6111 TUNER ICs - M: Daniel Scheller L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git - S: Maintained + S: Orphan F: drivers/media/dvb-frontends/stv6111* MEDIA DRIVERS FOR STM32 - DCMI @@@ -9573,7 -9596,7 +9596,7 @@@ MEN Z069 WATCHDOG DRIVE M: Johannes Thumshirn L: linux-watchdog@vger.kernel.org S: Maintained - F: drivers/watchdog/menz069_wdt.c + F: drivers/watchdog/menz69_wdt.c MESON AO CEC DRIVER FOR AMLOGIC SOCS M: Neil Armstrong @@@ -9592,14 -9615,20 +9615,20 @@@ 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 S: Maintained F: drivers/tty/serial/atmel_serial.c F: drivers/tty/serial/atmel_serial.h F: Documentation/devicetree/bindings/mfd/atmel-usart.txt - MICROCHIP / ATMEL DMA DRIVER + MICROCHIP AUDIO ASOC DRIVERS + M: Codrin Ciubotariu + 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 @@@ -9607,27 -9636,35 +9636,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 L: linux-crypto@vger.kernel.org S: Maintained F: drivers/crypto/atmel-ecc.* - MICROCHIP / ATMEL ISC DRIVER - M: Songjun Wu + MICROCHIP I2C DRIVER + M: Ludovic Desroches + L: linux-i2c@vger.kernel.org + S: Supported + F: drivers/i2c/busses/i2c-at91.c + + MICROCHIP ISC DRIVER + M: Eugen Hristev 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 - 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 @@@ -9661,6 -9698,80 +9698,80 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/microchip/lan743x_* + 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 @@@ -9668,6 -9779,13 +9779,13 @@@ S: Maintaine F: drivers/usb/misc/usb251xb.c F: Documentation/devicetree/bindings/usb/usb251xb.txt + MICROCHIP XDMA DRIVER + M: Ludovic Desroches + 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 L: linux-mips@linux-mips.org @@@ -10006,9 -10124,19 +10124,19 @@@ F: drivers/media/tuners/mxl5007t. MXSFB DRM DRIVER M: Marek Vasut + M: Stefan Agner + L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/mxsfb/ F: Documentation/devicetree/bindings/display/mxsfb.txt + T: git git://anongit.freedesktop.org/drm/drm-misc + + MYLEX DAC960 PCI RAID Controller + M: Hannes Reinecke + L: linux-scsi@vger.kernel.org + S: Supported + F: drivers/scsi/myrb.* + F: drivers/scsi/myrs.* MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) M: Chris Lee @@@ -10041,11 -10169,6 +10169,6 @@@ NATSEMI ETHERNET DRIVER (DP8381x S: Orphan F: drivers/net/ethernet/natsemi/natsemi.c - NCP FILESYSTEM - M: Petr Vandrovec - S: Obsolete - F: drivers/staging/ncpfs/ - NCR 5380 SCSI DRIVERS M: Finn Thain M: Michael Schmitz @@@ -11146,7 -11269,7 +11269,7 @@@ S: Maintaine F: drivers/firmware/pcdp.* PCI DRIVER FOR AARDVARK (Marvell Armada 3700) - M: Thomas Petazzoni + M: Thomas Petazzoni L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained @@@ -11178,7 -11301,7 +11301,7 @@@ F: Documentation/devicetree/bindings/pc F: drivers/pci/controller/pci-versatile.c PCI DRIVER FOR ARMADA 8K - M: Thomas Petazzoni + M: Thomas Petazzoni L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org S: Maintained @@@ -11247,7 -11370,7 +11370,7 @@@ F: Documentation/devicetree/bindings/pc 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) @@@ -11298,7 -11421,7 +11421,7 @@@ M: Murali Karicheri @@@ -12513,6 -12636,12 +12636,12 @@@ S: Supporte F: drivers/i2c/busses/i2c-rcar.c F: drivers/i2c/busses/i2c-sh_mobile.c + RENESAS RIIC DRIVER + M: Chris Brandt + S: Supported + F: Documentation/devicetree/bindings/i2c/i2c-riic.txt + F: drivers/i2c/busses/i2c-riic.c + RENESAS USB PHY DRIVER M: Yoshihiro Shimoda L: linux-renesas-soc@vger.kernel.org @@@ -12799,6 -12928,18 +12928,18 @@@ W: http://www.ibm.com/developerworks/li S: Supported F: drivers/s390/crypto/ + S390 VFIO AP DRIVER + M: Tony Krowiak + M: Pierre Morel + M: Halil Pasic + L: linux-s390@vger.kernel.org + W: http://www.ibm.com/developerworks/linux/linux390/ + S: Supported + F: drivers/s390/crypto/vfio_ap_drv.c + F: drivers/s390/crypto/vfio_ap_private.h + F: drivers/s390/crypto/vfio_ap_ops.c + F: Documentation/s390/vfio-ap.txt + S390 ZFCP DRIVER M: Steffen Maier M: Benjamin Block @@@ -13140,6 -13281,12 +13281,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 + 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 M: Jaehoon Chung @@@ -13678,6 -13825,20 +13825,20 @@@ S: Maintaine F: drivers/media/i2c/imx274.c F: Documentation/devicetree/bindings/media/i2c/imx274.txt + SONY IMX319 SENSOR DRIVER + M: Bingbu Cao + L: linux-media@vger.kernel.org + T: git git://linuxtv.org/media_tree.git + S: Maintained + F: drivers/media/i2c/imx319.c + + SONY IMX355 SENSOR DRIVER + M: Tianshu Qiu + L: linux-media@vger.kernel.org + T: git git://linuxtv.org/media_tree.git + S: Maintained + F: drivers/media/i2c/imx355.c + SONY MEMORYSTICK CARD SUPPORT M: Alex Dubov W: http://tifmxx.berlios.de/ @@@ -13744,7 -13905,7 +13905,7 @@@ F: sound/soc F: include/sound/soc* SOUNDWIRE SUBSYSTEM - M: Vinod Koul + M: Vinod Koul M: Sanyog Kale R: Pierre-Louis Bossart L: alsa-devel@alsa-project.org (moderated for non-subscribers) @@@ -13880,6 -14041,13 +14041,13 @@@ L: linux-i2c@vger.kernel.or S: Maintained F: drivers/i2c/busses/i2c-stm32* + ST VL53L0X ToF RANGER(I2C) IIO DRIVER + M: Song Qiang + L: linux-iio@vger.kernel.org + S: Maintained + F: drivers/iio/proximity/vl53l0x-i2c.c + F: Documentation/devicetree/bindings/iio/proximity/vl53l0x.txt + STABLE BRANCH M: Greg Kroah-Hartman L: stable@vger.kernel.org @@@ -13899,11 -14067,6 +14067,6 @@@ L: linux-erofs@lists.ozlabs.or S: Maintained F: drivers/staging/erofs/ - STAGING - FLARION FT1000 DRIVERS - M: Marek Belisko - S: Odd Fixes - F: drivers/staging/ft1000/ - STAGING - INDUSTRIAL IO M: Jonathan Cameron L: linux-iio@vger.kernel.org @@@ -13995,7 -14158,7 +14158,7 @@@ F: sound/soc/sti STI CEC DRIVER M: Benjamin Gaignard S: Maintained - F: drivers/staging/media/st-cec/ + F: drivers/media/platform/sti/cec/ F: Documentation/devicetree/bindings/media/stih-cec.txt STK1160 USB VIDEO CAPTURE DRIVER @@@ -14547,7 -14710,6 +14710,6 @@@ F: Documentation/devicetree/bindings/ar F: drivers/firmware/ti_sci* F: include/linux/soc/ti/ti_sci_protocol.h F: Documentation/devicetree/bindings/soc/ti/sci-pm-domain.txt - F: include/dt-bindings/genpd/k2g.h F: drivers/soc/ti/ti_sci_pm_domains.c F: Documentation/devicetree/bindings/reset/ti,sci-reset.txt F: Documentation/devicetree/bindings/clock/ti,sci-clk.txt @@@ -14751,6 -14913,13 +14913,13 @@@ L: netdev@vger.kernel.or S: Maintained F: drivers/net/ethernet/ti/netcp* + TI PCM3060 ASoC CODEC DRIVER + M: Kirill Marinushkin + L: alsa-devel@alsa-project.org (moderated for non-subscribers) + S: Maintained + F: Documentation/devicetree/bindings/sound/pcm3060.txt + F: sound/soc/codecs/pcm3060* + TI TAS571X FAMILY ASoC CODEC DRIVER M: Kevin Cernekee L: alsa-devel@alsa-project.org (moderated for non-subscribers) @@@ -15254,9 -15423,9 +15423,9 @@@ F: include/linux/usb/gadget USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) M: Jiri Kosina -R: Benjamin Tissoires +M: Benjamin Tissoires L: linux-usb@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git S: Maintained F: Documentation/hid/hiddev.txt F: drivers/hid/usbhid/ @@@ -15423,6 -15592,12 +15592,12 @@@ F: Documentation/driver-api/usb/typec_b F: drivers/usb/typec/altmodes/ F: include/linux/usb/typec_altmode.h + USB TYPEC PORT CONTROLLER DRIVERS + M: Guenter Roeck + L: linux-usb@vger.kernel.org + S: Maintained + F: drivers/usb/typec/tcpm/ + USB UHCI DRIVER M: Alan Stern L: linux-usb@vger.kernel.org @@@ -15497,13 -15672,27 +15672,27 @@@ F: arch/x86/um F: fs/hostfs/ F: fs/hppfs/ + USERSPACE COPYIN/COPYOUT (UIOVEC) + M: Alexander Viro + S: Maintained + F: lib/iov_iter.c + F: include/linux/uio.h + + USERSPACE DMA BUFFER DRIVER + M: Gerd Hoffmann + S: Maintained + L: dri-devel@lists.freedesktop.org + F: drivers/dma-buf/udmabuf.c + F: include/uapi/linux/udmabuf.h + T: git git://anongit.freedesktop.org/drm/drm-misc + USERSPACE I/O (UIO) M: Greg Kroah-Hartman S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git F: Documentation/driver-api/uio-howto.rst F: drivers/uio/ - F: include/linux/uio*.h + F: include/linux/uio_driver.h UTIL-LINUX PACKAGE M: Karel Zak @@@ -15627,7 -15816,7 +15816,7 @@@ M: Marek Szyprowski L: linux-media@vger.kernel.org S: Maintained - F: drivers/media/v4l2-core/videobuf2-* + F: drivers/media/common/videobuf2/* F: include/media/videobuf2-* VIMC VIRTUAL MEDIA CONTROLLER DRIVER @@@ -16104,6 -16293,17 +16293,17 @@@ T: git git://git.kernel.org/pub/scm/lin S: Maintained F: arch/x86/entry/vdso/ + XARRAY + M: Matthew Wilcox + L: linux-fsdevel@vger.kernel.org + S: Supported + F: Documentation/core-api/xarray.rst + F: lib/idr.c + F: lib/xarray.c + F: include/linux/idr.h + F: include/linux/xarray.h + F: tools/testing/radix-tree + XC2028/3028 TUNER DRIVER M: Mauro Carvalho Chehab L: linux-media@vger.kernel.org @@@ -16145,6 -16345,7 +16345,7 @@@ F: arch/arm64/include/asm/xen XEN HYPERVISOR INTERFACE M: Boris Ostrovsky M: Juergen Gross + R: Stefano Stabellini L: xen-devel@lists.xenproject.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git S: Supported diff --combined drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c index 9ca2fcc48b5a,cac262a912c1..89f2976f9c53 --- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c +++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c @@@ -330,14 -330,6 +330,14 @@@ static const struct dmi_system_id i2c_h }, .driver_data = (void *)&sipodev_desc }, + { + .ident = "Direkt-Tek DTLAPY133-1", + .matches = { + DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Direkt-Tek"), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "DTLAPY133-1"), + }, + .driver_data = (void *)&sipodev_desc + }, { .ident = "Mediacom Flexbook Edge 11", .matches = { @@@ -345,7 -337,8 +345,8 @@@ DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"), }, .driver_data = (void *)&sipodev_desc - } + }, + { } /* Terminate list */ };