Commit db318248 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-6.1-rc7' 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 driver fixes for 6.1-rc7, they include:

   - build warning fix for the vdso when using new versions of grep

   - iio driver fixes for reported issues

   - small nvmem driver fixes

   - fpga Kconfig fix

   - interconnect dt binding fix

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  lib/vdso: use "grep -E" instead of "egrep"
  nvmem: lan9662-otp: Change return type of lan9662_otp_wait_flag_clear()
  nvmem: rmem: Fix return value check in rmem_read()
  fpga: m10bmc-sec: Fix kconfig dependencies
  dt-bindings: iio: adc: Remove the property "aspeed,trim-data-valid"
  iio: adc: aspeed: Remove the trim valid dts property.
  iio: core: Fix entry not deleted when iio_register_sw_trigger_type() fails
  iio: accel: bma400: Fix memory leak in bma400_get_steps_reg()
  iio: light: rpr0521: add missing Kconfig dependencies
  iio: health: afe4404: Fix oob read in afe4404_[read|write]_raw
  iio: health: afe4403: Fix oob read in afe4403_read_raw
  iio: light: apds9960: fix wrong register for gesture gain
  dt-bindings: interconnect: qcom,msm8998-bwmon: Correct SC7280 CPU compatible
parents 715d2d96 8ac3b5cd

Documentation/devicetree/bindings/iio/adc/aspeed,ast2600-adc.yaml

+0 −7
Original line number Diff line number Diff line
@@ -62,13 +62,6 @@ properties: 
    description:

      Inform the driver that last channel will be used to sensor battery.



  aspeed,trim-data-valid:

    type: boolean

    description: |

      The ADC reference voltage can be calibrated to obtain the trimming

      data which will be stored in otp. This property informs the driver that

      the data store in the otp is valid.



required:

  - compatible

  - reg

Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ properties: 
    oneOf:

      - items:

          - enum:

              - qcom,sc7280-bwmon

              - qcom,sc7280-cpu-bwmon

              - qcom,sdm845-bwmon

          - const: qcom,msm8998-bwmon

      - const: qcom,msm8998-bwmon       # BWMON v4

drivers/fpga/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -246,7 +246,9 @@ config FPGA_MGR_VERSAL_FPGA 


config FPGA_M10_BMC_SEC_UPDATE

	tristate "Intel MAX10 BMC Secure Update driver"

	depends on MFD_INTEL_M10_BMC && FW_UPLOAD

	depends on MFD_INTEL_M10_BMC

	select FW_LOADER

	select FW_UPLOAD

	help

	  Secure update support for the Intel MAX10 board management

	  controller.

drivers/iio/accel/bma400_core.c

+3 −1
Original line number Diff line number Diff line
@@ -805,8 +805,10 @@ static int bma400_get_steps_reg(struct bma400_data *data, int *val) 


	ret = regmap_bulk_read(data->regmap, BMA400_STEP_CNT0_REG,

			       steps_raw, BMA400_STEP_RAW_LEN);

	if (ret)

	if (ret) {

		kfree(steps_raw);

		return ret;

	}

	*val = get_unaligned_le24(steps_raw);

	kfree(steps_raw);

	return IIO_VAL_INT;

drivers/iio/adc/aspeed_adc.c

+5 −6
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ static int aspeed_adc_set_trim_data(struct iio_dev *indio_dev) 
				((scu_otp) &

				 (data->model_data->trim_locate->field)) >>

				__ffs(data->model_data->trim_locate->field);

			if (!trimming_val)

				trimming_val = 0x8;

		}

		dev_dbg(data->dev,

			"trimming val = %d, offset = %08x, fields = %08x\n",
@@ -563,12 +565,9 @@ static int aspeed_adc_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	if (of_find_property(data->dev->of_node, "aspeed,trim-data-valid",

			     NULL)) {

	ret = aspeed_adc_set_trim_data(indio_dev);

	if (ret)

		return ret;

	}



	if (of_find_property(data->dev->of_node, "aspeed,battery-sensing",

			     NULL)) {