Commit ba26342a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-6.12b' of... 

Merge tag 'iio-for-6.12b' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next

Jonathan writes:

IIO: 2nd set of new device support features and cleanup for 6.12

Late pull request as I was planing to include another series that
is waiting for a fix to end up in char-misc-next.  That can wait
for next cycle.

Includes one immutable branch merge from MFD to get a necessary header
change.

Usual mix of a few new drivers, additional device support for existing
drivers, new features and a bunch of cleanup across tree.

New device support
==================

asahi-kasei,ak8975
- A few minor fixes as precursors to support for the AK09118 magnetometer
  that is very similar to the already supported AK09112
awinic,aw96103
- New driver for this capacitive proximity sensor.
x-powers,axp202
- Add support for the axp717 (including merge of MFD immutable branch).
sophgo,saradc
- New driver for this SOC ADC.

Features
========

adi,ad4695
- Add calibration support.
bosch,bmi323
- Ensure device is in lowest power state on suspend.

Cleanup and minor fixes
=======================
treewide
- Start to standardize formatting of id tables (ADC drivers done so far).
adi,ad5449
- Drop platform data support as long unused in upstream kernel.
bosch,bmc150
- Use fwnode_irq_get_by_name() in place of of_ variant.
- Use ACPI_HANDLE() to get the handle directly rather than via
  ACPI_COMPANION()
google,cros_ec_mkbp_proximity
- Include mod_devicetable.h instead of broader of.h
mirochip,mcp320x
- Drop vendorless compatible entries as not needed for backwards
  compatibility and should not be used in new boards.
st,lsm6dsx
- Use iio_read_acpi_mount_matrix() helper instead of open coding the
  same.
- Drop some unnecessary dev_fwnode() calls to check if a fwnode is
  available.  All the calls made handle this anyway.
xilinx,ams
- Use device_for_each_child_node_scoped() to avoid manual release of
  fwnode handle.

tools,generic-buffer
- Handle failure to allocate trigger name.
- Cleanup .*.cmd files if present.

* tag 'iio-for-6.12b' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (28 commits)
  iio: adc: axp20x_adc: add support for AXP717 ADC
  dt-bindings: iio: adc: Add AXP717 compatible
  iio: adc: axp20x_adc: Add adc_en1 and adc_en2 to axp_data
  tools: iio: rm .*.cmd when make clean
  iio: adc: standardize on formatting for id match tables
  iio: proximity: aw96103: Add support for aw96103/aw96105 proximity sensor
  dt-bindings: iio: aw96103: Add bindings for aw96103/aw96105 sensor
  iio: adc: sophgo-saradc: Add driver for Sophgo CV1800B SARADC
  dt-bindings: iio: adc: sophgo,cv1800b-saradc: Add Sophgo CV1800B SARADC
  tools/iio: Add memory allocation failure check for trigger_name
  iio: imu: st_lsm6dsx: Remove useless dev_fwnode() calls
  iio: imu: st_lsm6dsx: Use iio_read_acpi_mount_matrix() helper
  iio: adc: mcp320x: Drop vendorless compatible strings
  iio: dac: ad5449: drop support for platform data
  iio: adc: xilinx-ams: use device_* to iterate over device child nodes
  iio: ABI: document ad4695 new attributes
  doc: iio: ad4695: update for calibration support
  iio: adc: ad4695: implement calibration support
  iio: adc: ad4695: add 2nd regmap for 16-bit registers
  iio: bmi323: peripheral in lowest power state on suspend
  ...
parents b3912135 5ba0cb92

Documentation/ABI/testing/sysfs-bus-iio

+3 −0
Original line number Diff line number Diff line
@@ -541,6 +541,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_proximity_calibbias 
What:		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_resistance_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/out_currentY_calibbias

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_calibbias

KernelVersion:	2.6.35
@@ -556,6 +557,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_calibbias_available 
What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_calibbias_available

What:		/sys/bus/iio/devices/iio:deviceX/in_temp_calibbias_available

What:		/sys/bus/iio/devices/iio:deviceX/in_proximity_calibbias_available

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibbias_available

What:		/sys/bus/iio/devices/iio:deviceX/out_voltageY_calibbias_available

KernelVersion:  5.8

Contact:        linux-iio@vger.kernel.org
@@ -603,6 +605,7 @@ Description: 
What:		/sys/bus/iio/devices/iio:deviceX/in_illuminanceY_calibscale_available

What:		/sys/bus/iio/devices/iio:deviceX/in_intensityY_calibscale_available

What:		/sys/bus/iio/devices/iio:deviceX/in_proximityY_calibscale_available

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY_calibscale_available

KernelVersion:	4.8

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/devicetree/bindings/iio/adc/sophgo,cv1800b-saradc.yaml

0 → 100644
+83 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/adc/sophgo,cv1800b-saradc.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title:

  Sophgo CV1800B SoC 3 channels Successive Approximation Analog to

  Digital Converters



maintainers:

  - Thomas Bonnefille <thomas.bonnefille@bootlin.com>



description:

  Datasheet at https://github.com/sophgo/sophgo-doc/releases



properties:

  compatible:

    const: sophgo,cv1800b-saradc



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



patternProperties:

  "^channel@[0-2]$":

    $ref: adc.yaml



    properties:

      reg:

        items:

          - minimum: 0

            maximum: 2



    required:

      - reg



    additionalProperties: false



required:

  - compatible

  - reg

  - clocks

  - '#address-cells'

  - '#size-cells'



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/sophgo,cv1800.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    adc@30f0000 {

        compatible = "sophgo,cv1800b-saradc";

        reg = <0x030f0000 0x1000>;

        clocks = <&clk CLK_SARADC>;

        interrupts = <100 IRQ_TYPE_LEVEL_HIGH>;

        #address-cells = <1>;

        #size-cells = <0>;



        channel@0 {

            reg = <0>;

        };



        channel@1 {

            reg = <1>;

        };



        channel@2 {

            reg = <2>;

        };

    };

Documentation/devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml

+12 −0
Original line number Diff line number Diff line
@@ -37,6 +37,17 @@ description: | 
   3 | batt_dischrg_i

   4 | ts_v



  AXP717

  ------

   0 | batt_v

   1 | ts_v

   2 | vbus_v

   3 | vsys_v

   4 | pmic_temp

   5 | batt_chrg_i

   6 | vmid_v

   7 | bkup_batt_v



  AXP813

  ------

   0 | pmic_temp
@@ -52,6 +63,7 @@ properties: 
    oneOf:

      - const: x-powers,axp209-adc

      - const: x-powers,axp221-adc

      - const: x-powers,axp717-adc

      - const: x-powers,axp813-adc



      - items:

Documentation/devicetree/bindings/iio/magnetometer/asahi-kasei,ak8975.yaml

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ properties: 
          - asahi-kasei,ak09911

          - asahi-kasei,ak09912

          - asahi-kasei,ak09916

      - items:

          # ak09918 is register compatible with ak09912.

          - const: asahi-kasei,ak09918

          - const: asahi-kasei,ak09912

      - enum:

          - ak8975

          - ak8963

Documentation/devicetree/bindings/iio/proximity/awinic,aw96103.yaml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/proximity/awinic,aw96103.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Awinic's AW96103 capacitive proximity sensor and similar



maintainers:

  - Wang Shuaijie <wangshuaijie@awinic.com>



description: |

  Awinic's AW96103/AW96105 proximity sensor.

  The specific absorption rate (SAR) is a metric that measures

  the degree of absorption of electromagnetic radiation emitted by

  wireless devices, such as mobile phones and tablets, by human tissue.

  In mobile phone applications, the proximity sensor is primarily

  used to detect the proximity of the human body to the phone. When the

  phone approaches the human body, it will actively reduce the transmit

  power of the antenna to keep the SAR within a safe range. Therefore,

  we also refer to the proximity sensor as a SAR sensor.



properties:

  compatible:

    enum:

      - awinic,aw96103

      - awinic,aw96105



  reg:

    maxItems: 1



  interrupts:

    description:

      Generated by the device to announce that a close/far

      proximity event has happened.

    maxItems: 1



  vcc-supply: true



required:

  - compatible

  - reg

  - interrupts

  - vcc-supply



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/irq.h>

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        proximity@12 {

            compatible = "awinic,aw96103";

            reg = <0x12>;

            interrupt-parent = <&gpio>;

            interrupts = <23 IRQ_TYPE_EDGE_FALLING>;

            vcc-supply = <&pp1800_prox>;

        };

    };