Commit 3feecb1b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char / misc driver fixes from Greg KH:
 "Here are some small char/misc driver fixes for 6.5-rc6 that resolve
  some reported issues. Included in here are:

   - bunch of iio driver fixes for reported problems

   - interconnect driver fixes

   - counter driver build fix

   - cardreader driver fixes

   - binder driver fixes

   - other tiny driver fixes

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

* tag 'char-misc-6.5-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (21 commits)
  misc: tps6594-esm: Disable ESM for rev 1 PMIC
  misc: rtsx: judge ASPM Mode to set PETXCFG Reg
  binder: fix memory leak in binder_init()
  iio: cros_ec: Fix the allocation size for cros_ec_command
  tools/counter: Makefile: Replace rmdir by rm to avoid make,clean failure
  iio: imu: lsm6dsx: Fix mount matrix retrieval
  iio: adc: meson: fix core clock enable/disable moment
  iio: core: Prevent invalid memory access when there is no parent
  iio: frequency: admv1013: propagate errors from regulator_get_voltage()
  counter: Fix menuconfig "Counter support" submenu entries disappearance
  dt-bindings: iio: adi,ad74115: remove ref from -nanoamp
  iio: adc: ina2xx: avoid NULL pointer dereference on OF device match
  iio: light: bu27008: Fix intensity data type
  iio: light: bu27008: Fix scale format
  iio: light: bu27034: Fix scale format
  iio: adc: ad7192: Fix ac excitation feature
  interconnect: qcom: sa8775p: add enable_mask for bcm nodes
  interconnect: qcom: sm8550: add enable_mask for bcm nodes
  interconnect: qcom: sm8450: add enable_mask for bcm nodes
  interconnect: qcom: Add support for mask-based BCMs
  ...
parents 469a2f50 51a26bb0

Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml

+0 −3
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ properties: 
    description: Whether to enable burnout current for EXT1.



  adi,ext1-burnout-current-nanoamp:

    $ref: /schemas/types.yaml#/definitions/uint32

    description:

      Burnout current in nanoamps to be applied to EXT1.

    enum: [0, 50, 500, 1000, 10000]
@@ -233,7 +232,6 @@ properties: 
    description: Whether to enable burnout current for EXT2.



  adi,ext2-burnout-current-nanoamp:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: Burnout current in nanoamps to be applied to EXT2.

    enum: [0, 50, 500, 1000, 10000]

    default: 0
@@ -249,7 +247,6 @@ properties: 
    description: Whether to enable burnout current for VIOUT.



  adi,viout-burnout-current-nanoamp:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: Burnout current in nanoamps to be applied to VIOUT.

    enum: [0, 1000, 10000]

    default: 0

drivers/android/binder.c

+1 −0
Original line number Diff line number Diff line
@@ -6617,6 +6617,7 @@ static int __init binder_init(void) 


err_alloc_device_names_failed:

	debugfs_remove_recursive(binder_debugfs_dir_entry_root);

	binder_alloc_shrinker_exit();



	return ret;

}

drivers/android/binder_alloc.c

+6 −0
Original line number Diff line number Diff line
@@ -1087,6 +1087,12 @@ int binder_alloc_shrinker_init(void) 
	return ret;

}



void binder_alloc_shrinker_exit(void)

{

	unregister_shrinker(&binder_shrinker);

	list_lru_destroy(&binder_alloc_lru);

}



/**

 * check_buffer() - verify that buffer/offset is safe to access

 * @alloc: binder_alloc for this proc

drivers/android/binder_alloc.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, 
						  int pid);

extern void binder_alloc_init(struct binder_alloc *alloc);

extern int binder_alloc_shrinker_init(void);

extern void binder_alloc_shrinker_exit(void);

extern void binder_alloc_vma_close(struct binder_alloc *alloc);

extern struct binder_buffer *

binder_alloc_prepare_to_free(struct binder_alloc *alloc,

drivers/counter/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,6 @@ 
# Counter devices

#



menuconfig COUNTER

	tristate "Counter support"

	help

	  This enables counter device support through the Generic Counter

	  interface. You only need to enable this, if you also want to enable

	  one or more of the counter device drivers below.



config I8254

	tristate

	select COUNTER
@@ -25,6 +18,13 @@ config I8254 


	  If built as a module its name will be i8254.



menuconfig COUNTER

	tristate "Counter support"

	help

	  This enables counter device support through the Generic Counter

	  interface. You only need to enable this, if you also want to enable

	  one or more of the counter device drivers below.



if COUNTER



config 104_QUAD_8