Merge tag 'char-misc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull char/misc and other driver updates from Greg KH:
 "Here is the large set of char/misc and other small driver subsystem
  changes for 6.1-rc1. Loads of different things in here:

   - IIO driver updates, additions, and changes. Probably the largest
     part of the diffstat

   - habanalabs driver update with support for new hardware and
     features, the second largest part of the diff.

   - fpga subsystem driver updates and additions

   - mhi subsystem updates

   - Coresight driver updates

   - gnss subsystem updates

   - extcon driver updates

   - icc subsystem updates

   - fsi subsystem updates

   - nvmem subsystem and driver updates

   - misc driver updates

   - speakup driver additions for new features

   - lots of tiny driver updates and cleanups

  All of these have been in the linux-next tree for a while with no
  reported issues"

* tag 'char-misc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (411 commits)
  w1: Split memcpy() of struct cn_msg flexible array
  spmi: pmic-arb: increase SPMI transaction timeout delay
  spmi: pmic-arb: block access for invalid PMIC arbiter v5 SPMI writes
  spmi: pmic-arb: correct duplicate APID to PPID mapping logic
  spmi: pmic-arb: add support to dispatch interrupt based on IRQ status
  spmi: pmic-arb: check apid against limits before calling irq handler
  spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq
  spmi: pmic-arb: handle spurious interrupt
  spmi: pmic-arb: add a print in cleanup_irq
  drivers: spmi: Directly use ida_alloc()/free()
  MAINTAINERS: add TI ECAP driver info
  counter: ti-ecap-capture: capture driver support for ECAP
  Documentation: ABI: sysfs-bus-counter: add frequency & num_overflows items
  dt-bindings: counter: add ti,am62-ecap-capture.yaml
  counter: Introduce the COUNTER_COMP_ARRAY component type
  counter: Consolidate Counter extension sysfs attribute creation
  counter: Introduce the Count capture component
  counter: 104-quad-8: Add Signal polarity component
  counter: Introduce the Signal polarity component
  counter: interrupt-cnt: Implement watch_validate callback
  ...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc MAINTAINERS
index f37a0360c76c9624462baffe58eb7c4238e3523e,c547559eddf93d445825d00974b6a579c2fe6b2b..2bfeb7462bc3e074af08b6078605808759a61570
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -20459,9 -20344,17 +20478,18 @@@ W: https://linuxtv.or
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  F:    drivers/media/platform/ti/davinci/
 +F:    drivers/staging/media/deprecated/vpfe_capture/
  F:    include/media/davinci/
  
+ TI ENHANCED CAPTURE (eCAP) DRIVER
+ M:    Vignesh Raghavendra <[email protected]>
+ R:    Julien Panis <[email protected]>
+ L:    [email protected]
+ L:    [email protected]
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/counter/ti,am62-ecap-capture.yaml
+ F:    drivers/counter/ti-ecap-capture.c
+ 
  TI ENHANCED QUADRATURE ENCODER PULSE (eQEP) DRIVER
  R:    David Lechner <[email protected]>
  L:    [email protected]

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/configs/qcom_defconfig
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc drivers/bus/mhi/host/pci_generic.c
Simple merge

diff --cc drivers/counter/104-quad-8.c
Simple merge

diff --cc drivers/fpga/intel-m10-bmc-sec-update.c
Simple merge

diff --cc drivers/iio/accel/kxcjk-1013.c
Simple merge

diff --cc drivers/iio/adc/ltc2497.c
index d58a432bafe1d7502c585407983e152a3f5a4d92,4206f17e284c6bf66822881328b8d10133a20df9..556f10dfb5023f7da9f2d75247f820ba1774e6c7
--- 1/drivers/iio/adc/ltc2497.c
--- 2/drivers/iio/adc/ltc2497.c
+++ b/drivers/iio/adc/ltc2497.c
@@@ -79,10 -133,24 +133,22 @@@ static void ltc2497_remove(struct i2c_c
        struct iio_dev *indio_dev = i2c_get_clientdata(client);
  
        ltc2497core_remove(indio_dev);
 -
 -      return 0;
  }
  
+ static const struct ltc2497_chip_info ltc2497_info[] = {
+       [TYPE_LTC2497] = {
+               .resolution = 16,
+               .name = NULL,
+       },
+       [TYPE_LTC2499] = {
+               .resolution = 24,
+               .name = "ltc2499",
+       },
+ };
+ 
  static const struct i2c_device_id ltc2497_id[] = {
-       { "ltc2497", 0 },
+       { "ltc2497", (kernel_ulong_t)&ltc2497_info[TYPE_LTC2497] },
+       { "ltc2499", (kernel_ulong_t)&ltc2497_info[TYPE_LTC2499] },
        { }
  };
  MODULE_DEVICE_TABLE(i2c, ltc2497_id);

diff --cc drivers/iio/dac/ad5593r.c
Simple merge

diff --cc drivers/iio/magnetometer/hmc5843_i2c.c
Simple merge

diff --cc drivers/iio/magnetometer/yamaha-yas530.c
Simple merge

diff --cc drivers/iio/temperature/mlx90614.c
Simple merge

diff --cc drivers/iio/temperature/mlx90632.c
Simple merge

diff --cc drivers/misc/eeprom/eeprom.c
Simple merge

diff --cc drivers/misc/eeprom/idt_89hpesx.c
Simple merge

diff --cc drivers/misc/ics932s401.c
Simple merge

diff --cc drivers/misc/mei/bus-fixup.c
Simple merge

diff --cc drivers/misc/mei/gsc-me.c
Simple merge

diff --cc drivers/misc/mei/hw-txe.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/soc/mediatek/Kconfig
Simple merge

diff --cc drivers/thermal/qcom/qcom-spmi-adc-tm5.c
Simple merge

diff --cc include/linux/mtd/mtd.h
Simple merge

diff --cc include/linux/string_helpers.h
Simple merge