Commit 7ba31c3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging and IIO updates from Greg KH:
 "Here is the big staging/iio driver patches for 5.6-rc1

  Included in here are:

   - lots of new IIO drivers and updates for that subsystem

   - the usual huge quantity of minor cleanups for staging drivers

   - removal of the following staging drivers:
       - isdn/avm
       - isdn/gigaset
       - isdn/hysdn
       - octeon-usb
       - octeon ethernet

  Overall we deleted far more lines than we added, removing over 40k of
  old and obsolete driver code.

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

* tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (353 commits)
  staging: most: usb: check for NULL device
  staging: next: configfs: fix release link
  staging: most: core: fix logging messages
  staging: most: core: remove container struct
  staging: most: remove struct device core driver
  staging: most: core: drop device reference
  staging: most: remove device from interface structure
  staging: comedi: drivers: fix spelling mistake "to" -> "too"
  staging: exfat: remove fs_func struct.
  staging: wilc1000: avoid mutex unlock without lock in wilc_wlan_handle_txq()
  staging: wilc1000: return zero on success and non-zero on function failure
  staging: axis-fifo: replace spinlock with mutex
  staging: wilc1000: remove unused code prior to throughput enhancement in SPI
  staging: wilc1000: added 'wilc_' prefix for 'struct assoc_resp' name
  staging: wilc1000: move firmware API struct's to separate header file
  staging: wilc1000: remove use of infinite loop conditions
  staging: kpc2000: rename variables with kpc namespace
  staging: vt6656: Remove memory buffer from vnt_download_firmware.
  staging: vt6656: Just check NEWRSR_DECRYPTOK for RX_FLAG_DECRYPTED.
  staging: vt6656: Use vnt_rx_tail struct for tail variables.
  ...
parents ca9b5b62 fc157998

Documentation/ABI/testing/sysfs-bus-iio

+13 −0
Original line number Diff line number Diff line
@@ -1726,3 +1726,16 @@ Contact: linux-iio@vger.kernel.org 
Description:

		List of valid periods (in seconds) for which the light intensity

		must be above the threshold level before interrupt is asserted.



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

KernelVersion:	5.5

Contact:	linux-iio@vger.kernel.org

Description:

		Center frequency in Hz for a notch filter. Used i.e. for line

		noise suppression.



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

KernelVersion:	5.5

Contact:	linux-iio@vger.kernel.org

Description:

		One of the following thermocouple types: B, E, J, K, N, R, S, T.

Documentation/ABI/testing/sysfs-bus-iio-dma-buffer

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/buffer/length_align_bytes

KernelVersion:	5.4

Contact:	linux-iio@vger.kernel.org

Description:

		DMA buffers tend to have a alignment requirement for the

		buffers. If this alignment requirement is not met samples might

		be dropped from the buffer.



		This property reports the alignment requirements in bytes.

		This means that the buffer size in bytes needs to be a integer

		multiple of the number reported by this file.



		The alignment requirements in number of sample sets will depend

		on the enabled channels and the bytes per channel. This means

		that the alignment requirement in samples sets might change

		depending on which and how many channels are enabled. Whereas

		the alignment requirement reported in bytes by this property

		will remain static and does not depend on which channels are

		enabled.

Documentation/devicetree/bindings/iio/accel/adi,adis16240.yaml

0 → 100644
+49 −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/adi,adis16240.yaml#

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



title: ADIS16240 Programmable Impact Sensor and Recorder driver



maintainers:

  - Alexandru Ardelean <alexandru.ardelean@analog.com>



description: |

  ADIS16240 Programmable Impact Sensor and Recorder driver that supports

  SPI interface.

    https://www.analog.com/en/products/adis16240.html



properties:

  compatible:

    enum:

      - adi,adis16240



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

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

    spi0 {

        #address-cells = <1>;

        #size-cells = <0>;



        /* Example for a SPI device node */

        accelerometer@0 {

            compatible = "adi,adis16240";

            reg = <0>;

            spi-max-frequency = <2500000>;

            interrupt-parent = <&gpio0>;

            interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;

        };

    };

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

+5 −2
Original line number Diff line number Diff line 
* Bosch BMA180 / BMA250 triaxial acceleration sensor

* Bosch BMA180 / BMA25x triaxial acceleration sensor



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 "bosch,bma180" or "bosch,bma250"

  - compatible : should be one of:

    "bosch,bma180"

    "bosch,bma250"

    "bosch,bma254"

  - reg : the I2C address of the sensor



Optional properties:

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

0 → 100644
+54 −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,bma400.yaml#

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



title: Bosch BMA400 triaxial acceleration sensor



maintainers:

  - Dan Robertson <dan@dlrobertson.com>



description: |

  Acceleration and temperature iio sensors with an i2c interface



  Specifications about the sensor can be found at:

    https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMA400-DS000.pdf



properties:

  compatible:

    enum:

      - bosch,bma400



  reg:

    maxItems: 1



  vdd-supply:

    description: phandle to the regulator that provides power to the accelerometer



  vddio-supply:

    description: phandle to the regulator that provides power to the sensor's IO



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

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

    i2c {

      #address-cells = <1>;

      #size-cells = <0>;

      accelerometer@14 {

        compatible = "bosch,bma400";

        reg = <0x14>;

        vdd-supply = <&vdd>;

        vddio-supply = <&vddio>;

        interrupt-parent = <&gpio0>;

        interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;

      };

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE