]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Nov 2018 16:31:19 +0000 (09:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Nov 2018 16:31:19 +0000 (09:31 -0700)
Pull i2c fixes from Wolfram Sang:
 "I2C has a core bugfix & cleanup as well as an ID addition and
  MAINTAINERS update for you"

* 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  MAINTAINERS: add maintainer for IMX LPI2C driver
  dt-bindings: i2c: i2c-imx-lpi2c: add imx8qxp compatible string
  i2c: Clear client->irq in i2c_device_remove
  i2c: Remove unnecessary call to irq_find_mapping

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 245ba32f53649a6897816da12439cd1cc4a5b737,5d581e0dd01780720e88d347284248552a61e3bf..690c2f68a401fd9e7eab286be7f733b25b551965
@@@ -376,7 -376,7 +376,7 @@@ F: drivers/platform/x86/i2c-multi-insta
  ACPI PMIC DRIVERS
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Len Brown <lenb@kernel.org>
 -R:    Andy Shevchenko <andy@infradead.org>
 +R:    Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  R:    Mika Westerberg <mika.westerberg@linux.intel.com>
  L:    linux-acpi@vger.kernel.org
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
@@@ -4207,12 -4207,6 +4207,12 @@@ M:    Pali Rohár <pali.rohar@gmail.com
  S:    Maintained
  F:    drivers/platform/x86/dell-rbtn.*
  
 +DELL REMOTE BIOS UPDATE DRIVER
 +M:    Stuart Hayes <stuart.w.hayes@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/dell_rbu.c
 +
  DELL LAPTOP SMM DRIVER
  M:    Pali Rohár <pali.rohar@gmail.com>
  S:    Maintained
@@@ -4220,11 -4214,10 +4220,11 @@@ F:   drivers/hwmon/dell-smm-hwmon.
  F:    include/uapi/linux/i8k.h
  
  DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
 -M:    Doug Warzecha <Douglas_Warzecha@dell.com>
 +M:    Stuart Hayes <stuart.w.hayes@gmail.com>
 +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 <mjg59@srcf.ucam.org>
@@@ -5878,6 -5871,14 +5878,14 @@@ L:    linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cpm.c
  
+ FREESCALE IMX LPI2C DRIVER
+ M:    Dong Aisheng <aisheng.dong@nxp.com>
+ L:    linux-i2c@vger.kernel.org
+ L:    linux-imx@nxp.com
+ S:    Maintained
+ F:    drivers/i2c/busses/i2c-imx-lpi2c.c
+ F:    Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt
  FREESCALE IMX / MXC FEC DRIVER
  M:    Fugang Duan <fugang.duan@nxp.com>
  L:    netdev@vger.kernel.org
@@@ -7354,12 -7355,6 +7362,12 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Supported
  F:    sound/soc/intel/
  
 +INTEL ATOMISP2 DUMMY / POWER-MANAGEMENT DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +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 <intel-linux-scu@intel.com>
  M:    Artur Paszkiewicz <artur.paszkiewicz@intel.com>
@@@ -7546,6 -7541,7 +7554,6 @@@ M:      Rajneesh Bhardwaj <rajneesh.bhardwaj
  M:    Vishwanath Somayaji <vishwanath.somayaji@intel.com>
  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
@@@ -7589,8 -7585,7 +7597,8 @@@ F:      drivers/infiniband/hw/i40iw
  F:    include/uapi/rdma/i40iw-abi.h
  
  INTEL TELEMETRY DRIVER
 -M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 +M:    Rajneesh Bhardwaj <rajneesh.bhardwaj@linux.intel.com>
 +M:    "David E. Box" <david.e.box@linux.intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    arch/x86/include/asm/intel_telemetry.h
@@@ -8323,14 -8318,6 +8331,14 @@@ W:    http://legousb.sourceforge.net
  S:    Maintained
  F:    drivers/usb/misc/legousbtower.c
  
 +LG LAPTOP EXTRAS
 +M:    Matan Ziv-Av <matan@svgalib.org>
 +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 <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org