Merge tag 'char-misc-6.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc (c5522822) · Commits · git / linux-net

Documentation/devicetree/bindings/iio/dac/adi,ad5686.yaml

+17 −36

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		$id: http://devicetree.org/schemas/iio/dac/adi,ad5686.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Analog Devices AD5360 and similar DACs
		title: Analog Devices AD5360 and similar SPI DACs

		maintainers:
		- Michael Hennerich <michael.hennerich@analog.com>
		@@ -12,8 +12,6 @@ maintainers:

		properties:
		compatible:
		oneOf:
		- description: SPI devices
		enum:
		- adi,ad5310r
		- adi,ad5672r
		@@ -30,23 +28,6 @@ properties:
		- adi,ad5685r
		- adi,ad5686
		- adi,ad5686r
		- description: I2C devices
		enum:
		- adi,ad5311r
		- adi,ad5337r
		- adi,ad5338r
		- adi,ad5671r
		- adi,ad5675r
		- adi,ad5691r
		- adi,ad5692r
		- adi,ad5693
		- adi,ad5693r
		- adi,ad5694
		- adi,ad5694r
		- adi,ad5695r
		- adi,ad5696
		- adi,ad5696r


		reg:
		maxItems: 1

Documentation/devicetree/bindings/iio/dac/adi,ad5696.yaml

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		$id: http://devicetree.org/schemas/iio/dac/adi,ad5696.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Analog Devices AD5696 and similar multi-channel DACs
		title: Analog Devices AD5696 and similar I2C multi-channel DACs

		maintainers:
		- Michael Auchter <michael.auchter@ni.com>
		@@ -16,6 +16,7 @@ properties:
		compatible:
		enum:
		- adi,ad5311r
		- adi,ad5337r
		- adi,ad5338r
		- adi,ad5671r
		- adi,ad5675r

MAINTAINERS

+0 −177

Original line number	Diff line number	Diff line
		@@ -258,12 +258,6 @@ L: linux-acenic@sunsite.dk
		S: Maintained
		F: drivers/net/ethernet/alteon/acenic*

		ACER ASPIRE 1 EMBEDDED CONTROLLER DRIVER
		M: Nikita Travkin <nikita@trvn.ru>
		S: Maintained
		F: Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml
		F: drivers/platform/arm64/acer-aspire1-ec.c

		ACER ASPIRE ONE TEMPERATURE AND FAN DRIVER
		M: Peter Kaestle <peter@piie.net>
		L: platform-driver-x86@vger.kernel.org
		@@ -888,7 +882,6 @@ F: drivers/staging/media/sunxi/cedrus/

		ALPHA PORT
		M: Richard Henderson <richard.henderson@linaro.org>
		M: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
		M: Matt Turner <mattst88@gmail.com>
		L: linux-alpha@vger.kernel.org
		S: Odd Fixes
		@@ -2263,12 +2256,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Maintained
		F: arch/arm/mach-ep93xx/ts72xx.c

		ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
		M: Alexander Shiyan <shc_work@mail.ru>
		L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
		S: Odd Fixes
		N: clps711x

		ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
		M: Hartley Sweeten <hsweeten@visionengravers.com>
		M: Alexander Sverdlin <alexander.sverdlin@gmail.com>
		@@ -3815,14 +3802,6 @@ F: drivers/video/backlight/
		F: include/linux/backlight.h
		F: include/linux/pwm_backlight.h

		BAIKAL-T1 PVT HARDWARE MONITOR DRIVER
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-hwmon@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
		F: Documentation/hwmon/bt1-pvt.rst
		F: drivers/hwmon/bt1-pvt.[ch]

		BARCO P50 GPIO DRIVER
		M: Santosh Kumar Yadav <santoshkumar.yadav@barco.com>
		M: Peter Korsgaard <peter.korsgaard@barco.com>
		@@ -6476,7 +6455,6 @@ F: drivers/mtd/nand/raw/denali*

		DESIGNWARE EDMA CORE IP DRIVER
		M: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
		R: Serge Semin <fancer.lancer@gmail.com>
		L: dmaengine@vger.kernel.org
		S: Maintained
		F: drivers/dma/dw-edma/
		@@ -9759,14 +9737,6 @@ F: drivers/gpio/gpiolib-cdev.c
		F: include/uapi/linux/gpio.h
		F: tools/gpio/

		GRE DEMULTIPLEXER DRIVER
		M: Dmitry Kozlov <xeb@mail.ru>
		L: netdev@vger.kernel.org
		S: Maintained
		F: include/net/gre.h
		F: net/ipv4/gre_demux.c
		F: net/ipv4/gre_offload.c

		GRETH 10/100/1G Ethernet MAC device driver
		M: Andreas Larsson <andreas@gaisler.com>
		L: netdev@vger.kernel.org
		@@ -12959,12 +12929,6 @@ S: Maintained
		F: drivers/ata/pata_arasan_cf.c
		F: include/linux/pata_arasan_cf_data.h

		LIBATA PATA DRIVERS
		R: Sergey Shtylyov <s.shtylyov@omp.ru>
		L: linux-ide@vger.kernel.org
		F: drivers/ata/ata_*.c
		F: drivers/ata/pata_*.c

		LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
		M: Linus Walleij <linus.walleij@linaro.org>
		L: linux-ide@vger.kernel.org
		@@ -12981,14 +12945,6 @@ F: drivers/ata/ahci_platform.c
		F: drivers/ata/libahci_platform.c
		F: include/linux/ahci_platform.h

		LIBATA SATA AHCI SYNOPSYS DWC CONTROLLER DRIVER
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-ide@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/ata/baikal,bt1-ahci.yaml
		F: Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml
		F: drivers/ata/ahci_dwc.c

		LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
		M: Mikael Pettersson <mikpelinux@gmail.com>
		L: linux-ide@vger.kernel.org
		@@ -14184,16 +14140,6 @@ S: Maintained
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/platform/nxp/imx-pxp.[ch]

		MEDIA DRIVERS FOR ASCOT2E
		M: Sergey Kozlov <serjk@netup.ru>
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/ascot2e*

		MEDIA DRIVERS FOR CXD2099AR CI CONTROLLERS
		M: Jasmin Jessich <jasmin@anw.at>
		L: linux-media@vger.kernel.org
		@@ -14202,16 +14148,6 @@ W: https://linuxtv.org
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/cxd2099*

		MEDIA DRIVERS FOR CXD2841ER
		M: Sergey Kozlov <serjk@netup.ru>
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/cxd2841er*

		MEDIA DRIVERS FOR CXD2880
		M: Yasunari Takiguchi <Yasunari.Takiguchi@sony.com>
		L: linux-media@vger.kernel.org
		@@ -14256,35 +14192,6 @@ F: drivers/media/platform/nxp/imx-mipi-csis.c
		F: drivers/media/platform/nxp/imx7-media-csi.c
		F: drivers/media/platform/nxp/imx8mq-mipi-csi2.c

		MEDIA DRIVERS FOR HELENE
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/helene*

		MEDIA DRIVERS FOR HORUS3A
		M: Sergey Kozlov <serjk@netup.ru>
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/horus3a*

		MEDIA DRIVERS FOR LNBH25
		M: Sergey Kozlov <serjk@netup.ru>
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/lnbh25*

		MEDIA DRIVERS FOR MXL5XX TUNER DEMODULATORS
		L: linux-media@vger.kernel.org
		S: Orphan
		@@ -14292,16 +14199,6 @@ W: https://linuxtv.org
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/dvb-frontends/mxl5xx*

		MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
		M: Sergey Kozlov <serjk@netup.ru>
		M: Abylay Ospan <aospan@netup.ru>
		L: linux-media@vger.kernel.org
		S: Supported
		W: https://linuxtv.org
		W: http://netup.tv/
		T: git git://linuxtv.org/media_tree.git
		F: drivers/media/pci/netup_unidvb/*

		MEDIA DRIVERS FOR NVIDIA TEGRA - VDE
		M: Dmitry Osipenko <digetx@gmail.com>
		L: linux-media@vger.kernel.org
		@@ -14945,13 +14842,6 @@ F: drivers/mtd/
		F: include/linux/mtd/
		F: include/uapi/mtd/

		MEMSENSING MICROSYSTEMS MSA311 DRIVER
		M: Dmitry Rokosov <ddrokosov@sberdevices.ru>
		L: linux-iio@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/iio/accel/memsensing,msa311.yaml
		F: drivers/iio/accel/msa311.c

		MEN A21 WATCHDOG DRIVER
		M: Johannes Thumshirn <morbidrsa@gmail.com>
		L: linux-watchdog@vger.kernel.org
		@@ -15285,7 +15175,6 @@ F: drivers/tty/serial/8250/8250_pci1xxxx.c

		MICROCHIP POLARFIRE FPGA DRIVERS
		M: Conor Dooley <conor.dooley@microchip.com>
		R: Vladimir Georgiev <v.georgiev@metrotek.ru>
		L: linux-fpga@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml
		@@ -15540,17 +15429,6 @@ F: arch/mips/
		F: drivers/platform/mips/
		F: include/dt-bindings/mips/

		MIPS BAIKAL-T1 PLATFORM
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-mips@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/bus/baikal,bt1-*.yaml
		F: Documentation/devicetree/bindings/clock/baikal,bt1-*.yaml
		F: drivers/bus/bt1-*.c
		F: drivers/clk/baikal-t1/
		F: drivers/memory/bt1-l2-ctl.c
		F: drivers/mtd/maps/physmap-bt1-rom.[ch]

		MIPS BOSTON DEVELOPMENT BOARD
		M: Paul Burton <paulburton@kernel.org>
		L: linux-mips@vger.kernel.org
		@@ -15563,7 +15441,6 @@ F: include/dt-bindings/clock/boston-clock.h

		MIPS CORE DRIVERS
		M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-mips@vger.kernel.org
		S: Supported
		F: drivers/bus/mips_cdmm.c
		@@ -16531,12 +16408,6 @@ F: include/linux/ntb.h
		F: include/linux/ntb_transport.h
		F: tools/testing/selftests/ntb/

		NTB IDT DRIVER
		M: Serge Semin <fancer.lancer@gmail.com>
		L: ntb@lists.linux.dev
		S: Supported
		F: drivers/ntb/hw/idt/

		NTB INTEL DRIVER
		M: Dave Jiang <dave.jiang@intel.com>
		L: ntb@lists.linux.dev
		@@ -18557,13 +18428,6 @@ F: drivers/pps/
		F: include/linux/pps*.h
		F: include/uapi/linux/pps.h

		PPTP DRIVER
		M: Dmitry Kozlov <xeb@mail.ru>
		L: netdev@vger.kernel.org
		S: Maintained
		W: http://sourceforge.net/projects/accel-pptp
		F: drivers/net/ppp/pptp.c

		PRESSURE STALL INFORMATION (PSI)
		M: Johannes Weiner <hannes@cmpxchg.org>
		M: Suren Baghdasaryan <surenb@google.com>
		@@ -19654,15 +19518,6 @@ S: Supported
		F: Documentation/devicetree/bindings/i2c/renesas,iic-emev2.yaml
		F: drivers/i2c/busses/i2c-emev2.c

		RENESAS ETHERNET AVB DRIVER
		R: Sergey Shtylyov <s.shtylyov@omp.ru>
		L: netdev@vger.kernel.org
		L: linux-renesas-soc@vger.kernel.org
		F: Documentation/devicetree/bindings/net/renesas,etheravb.yaml
		F: drivers/net/ethernet/renesas/Kconfig
		F: drivers/net/ethernet/renesas/Makefile
		F: drivers/net/ethernet/renesas/ravb*

		RENESAS ETHERNET SWITCH DRIVER
		R: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
		L: netdev@vger.kernel.org
		@@ -19712,14 +19567,6 @@ F: Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml
		F: drivers/i2c/busses/i2c-rcar.c
		F: drivers/i2c/busses/i2c-sh_mobile.c

		RENESAS R-CAR SATA DRIVER
		R: Sergey Shtylyov <s.shtylyov@omp.ru>
		L: linux-ide@vger.kernel.org
		L: linux-renesas-soc@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
		F: drivers/ata/sata_rcar.c

		RENESAS R-CAR THERMAL DRIVERS
		M: Niklas Söderlund <niklas.soderlund@ragnatech.se>
		L: linux-renesas-soc@vger.kernel.org
		@@ -19795,16 +19642,6 @@ S: Supported
		F: Documentation/devicetree/bindings/i2c/renesas,rzv2m.yaml
		F: drivers/i2c/busses/i2c-rzv2m.c

		RENESAS SUPERH ETHERNET DRIVER
		R: Sergey Shtylyov <s.shtylyov@omp.ru>
		L: netdev@vger.kernel.org
		L: linux-renesas-soc@vger.kernel.org
		F: Documentation/devicetree/bindings/net/renesas,ether.yaml
		F: drivers/net/ethernet/renesas/Kconfig
		F: drivers/net/ethernet/renesas/Makefile
		F: drivers/net/ethernet/renesas/sh_eth*
		F: include/linux/sh_eth.h

		RENESAS USB PHY DRIVER
		M: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
		L: linux-renesas-soc@vger.kernel.org
		@@ -22458,19 +22295,11 @@ F: drivers/tty/serial/8250/8250_lpss.c

		SYNOPSYS DESIGNWARE APB GPIO DRIVER
		M: Hoan Tran <hoan@os.amperecomputing.com>
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-gpio@vger.kernel.org
		S: Maintained
		F: Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml
		F: drivers/gpio/gpio-dwapb.c

		SYNOPSYS DESIGNWARE APB SSI DRIVER
		M: Serge Semin <fancer.lancer@gmail.com>
		L: linux-spi@vger.kernel.org
		S: Supported
		F: Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
		F: drivers/spi/spi-dw*

		SYNOPSYS DESIGNWARE AXI DMAC DRIVER
		M: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
		S: Maintained
		@@ -23780,12 +23609,6 @@ L: linux-input@vger.kernel.org
		S: Maintained
		F: drivers/hid/hid-udraw-ps3.c

		UFS FILESYSTEM
		M: Evgeniy Dushistov <dushistov@mail.ru>
		S: Maintained
		F: Documentation/admin-guide/ufs.rst
		F: fs/ufs/

		UHID USERSPACE HID IO DRIVER
		M: David Rheinsberg <david@readahead.eu>
		L: linux-input@vger.kernel.org

drivers/iio/accel/Kconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -447,6 +447,8 @@ config IIO_ST_ACCEL_SPI_3AXIS

		config IIO_KX022A
		tristate
		select IIO_BUFFER
		select IIO_TRIGGERED_BUFFER

		config IIO_KX022A_SPI
		tristate "Kionix KX022A tri-axis digital accelerometer SPI interface"

drivers/iio/accel/bma400_core.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1218,7 +1218,8 @@ static int bma400_activity_event_en(struct bma400_data *data,
		static int bma400_tap_event_en(struct bma400_data *data,
		enum iio_event_direction dir, int state)
		{
		unsigned int mask, field_value;
		unsigned int mask;
		unsigned int field_value = 0;
		int ret;

		/*