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

Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging / IIO driver updates from Greg KH:
 "Here is the big staging and IIO driver pull request for 5.11-rc1

  Lots of different things in here:

   - loads of driver updates

   - so many coding style cleanups

   - new IIO drivers

   - Android ION code is finally removed from the tree

   - wimax drivers are moved to staging on their way out of the kernel

  Nothing really exciting, just the constant grind of kernel development :)

  All have been in linux-next for a while with no reported issues"

* tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits)
  staging: olpc_dcon: Do not call platform_device_unregister() in dcon_probe()
  staging: most: Fix spelling mistake "tranceiver" -> "transceiver"
  staging: qlge: remove duplicate word in comment
  staging: comedi: mf6x4: Fix AI end-of-conversion detection
  staging: greybus: Add TODO item about modernizing the pwm code
  pinctrl: ralink: add a pinctrl driver for the rt2880 family
  dt-bindings: pinctrl: rt2880: add binding document
  staging: rtl8723bs: remove ELEMENT_ID enum
  staging: rtl8723bs: remove unused macros
  staging: rtl8723bs: replace EID_EXTCapability
  staging: rtl8723bs: replace EID_BSSIntolerantChlReport
  staging: rtl8723bs: replace EID_BSSCoexistence
  staging: rtl8723bs: replace _MME_IE_
  staging: rtl8723bs: replace _WAPI_IE_
  staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_
  staging: rtl8723bs: replace _ERPINFO_IE_
  staging: rtl8723bs: replace _CHLGETXT_IE_
  staging: rtl8723bs: replace _COUNTRY_IE_
  staging: rtl8723bs: replace _IBSS_PARA_IE_
  staging: rtl8723bs: replace _TIM_IE_
  ...
parents 2911ed9f 4996b461

Documentation/ABI/testing/sysfs-bus-iio

+10 −0
Original line number Diff line number Diff line
@@ -1743,6 +1743,16 @@ Description: 


		Raw counter device counters direction for channel Y.



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

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

KernelVersion:	5.8

Contact:	linux-iio@vger.kernel.org

Description:

		Optional symbolic label to a device channel.

		If a label is defined for this channel add that to the channel

		specific attributes. This is useful for userspace to be able to

		better identify an individual channel.



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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360

0 → 100644
+78 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_voltage0_raw

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 USBID ADC which connected to connector ID pin.

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 VBUS ADC with lower accuracy(+-75mA)

		higher measure range(1~22mV)

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 VBUS ADC with higher accuracy(+-30mA)

		lower measure range(1~9.76V)

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 VSYS ADC

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 VBAT ADC

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 IBUS ADC

		Calculating with scale and offset returns voltage in uA



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 IBAT ADC

		Calculating with scale and offset returns voltage in uA



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 CHG_VDDP ADC

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 IC junction temperature

		Calculating with scale and offset returns temperature in degree



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 VREF_TS ADC

		Calculating with scale and offset returns voltage in uV



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

KernelVersion:	5.8.0

Contact:	gene_chen@richtek.com

Description:

		Indicated MT6360 TS ADC

		Calculating with scale and offset returns voltage in uV

Documentation/devicetree/bindings/iio/accel/bma180.txt

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
* Bosch BMA023 / BMA150/ BMA180 / BMA25x / SMB380 triaxial acceleration sensor



https://media.digikey.com/pdf/Data%20Sheets/Bosch/BMA150.pdf

http://omapworld.com/BMA180_111_1002839.pdf

http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/bst-bma250-ds002-05.pdf



Required properties:



  - compatible : should be one of:

    "bosch,bma023"

    "bosch,bma150"

    "bosch,bma180"

    "bosch,bma250"

    "bosch,bma254"

    "bosch,smb380"

  - reg : the I2C address of the sensor

  - vdd-supply : regulator phandle connected to the VDD pin

  - vddio-supply : regulator phandle connected to the VDDIO pin



Optional properties:



  - interrupts : interrupt mapping for GPIO IRQ, it should by configured with

		flags IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING

		For the bma250 the first interrupt listed must be the one

		connected to the INT1 pin, the second (optional) interrupt

		listed must be the one connected to the INT2 pin.



Example:



bma180@40 {

	compatible = "bosch,bma180";

	reg = <0x40>;

	interrupt-parent = <&gpio6>;

	interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

};

Documentation/devicetree/bindings/iio/accel/bosch,bma180.yaml

0 → 100644
+62 −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/accel/bosch,bma180.yaml#

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



title: Bosch BMA023 / BMA150/ BMA180 / BMA25x / SMB380 triaxial accelerometers



maintainers:

  - Jonathan Cameron <jic23@kernel.org>



description: |

  https://media.digikey.com/pdf/Data%20Sheets/Bosch/BMA150.pdf

  http://omapworld.com/BMA180_111_1002839.pdf

  http://ae-bst.resource.bosch.com/media/products/dokumente/bma250/bst-bma250-ds002-05.pdf



properties:

  compatible:

    enum:

      - bosch,bma023

      - bosch,bma150

      - bosch,bma180

      - bosch,bma250

      - bosch,bma254

      - bosch,smb380



  reg:

    maxItems: 1



  vdd-supply: true



  vddio-supply: true



  interrupts:

    minItems: 1

    maxItems: 2

    description: |

      Type should be either IRQ_TYPE_LEVEL_HIGH or IRQ_TYPE_EDGE_RISING.

      For the bma250 the first interrupt listed must be the one

      connected to the INT1 pin, the second (optional) interrupt

      listed must be the one connected to the INT2 pin.



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        accel@40 {

            compatible = "bosch,bma180";

            reg = <0x40>;

            interrupt-parent = <&gpio6>;

            interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

        };

    };

...

Documentation/devicetree/bindings/iio/accel/bosch,bma255.yaml

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

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accel/bosch,bma255.yaml#

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



title: Bosch BMA255 and Similar Accelerometers



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



description:

  3 axis accelerometers with varying range and I2C or SPI

  4-wire interface.



properties:

  compatible:

    enum:

      - bosch,bmc150

      - bosch,bmi055

      - bosch,bma255

      - bosch,bma250e

      - bosch,bma222

      - bosch,bma222e

      - bosch,bma280



  reg:

    maxItems: 1



  vdd-supply: true

  vddio-supply: true



  interrupts:

    maxItems: 1



  mount-matrix:

    description: an optional 3x3 mounting rotation matrix.



  spi-max-frequency:

    maximum: 10000000



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

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

    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        accelerometer@8 {

            compatible = "bosch,bma222";

            reg = <0x08>;

            vddio-supply = <&vddio>;

            vdd-supply = <&vdd>;

            interrupts = <57 IRQ_TYPE_EDGE_FALLING>;

        };

    };

  - |

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

    spi {

        #address-cells = <1>;

        #size-cells = <0>;

        accel@0 {

            compatible = "bosch,bma222";

            reg = <0>;

            spi-max-frequency = <10000000>;

        };

    };

...

CRA Git | Maintained and supported by SUSTech CRA and CCSE