From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Oct 2022 15:56:37 +0000 (-0700)
Subject: Merge tag 'char-misc-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v6.1-rc5~262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a09476668e3016ea4a7b0a7ebd02f44e0546c12c;p=platform%2Fkernel%2Flinux-starfive.git

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

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
  ...
---

a09476668e3016ea4a7b0a7ebd02f44e0546c12c
diff --cc MAINTAINERS
index f37a036,c547559..2bfeb74
--- a/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 <vigneshr@ti.com>
+ R:	Julien Panis <jpanis@baylibre.com>
+ L:	linux-iio@vger.kernel.org
+ L:	linux-omap@vger.kernel.org
+ 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 <david@lechnology.com>
  L:	linux-iio@vger.kernel.org
diff --cc drivers/iio/adc/ltc2497.c
index d58a432,4206f17..556f10d
--- a/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);