Commit 4c6ef3b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull staging and IIO driver updates from Greg KH:
 "Here is the big staging and IIO driver pull request for 5.7-rc1.

  We again end up deleting more code than we added here, thanks to
  finally getting rid of the old and obsolete wireless USB stuff, and
  the exfat code (which is coming in again through the vfs tree in a
  much cleaner version).

  But some code does come back, with the octeon drivers being found to
  actually be used in the wild, so those deletions are now reverted.

  Other than those major things, just loads and loads of tiny checkpatch
  cleanups all over the place, along with new IIO drivers and fixes.

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

[ Stephen Rothwell points out some reported issues due to merge conflicts ]

* tag 'staging-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (415 commits)
  staging: vt6656: Use DIV_ROUND_UP macro instead of specific code
  staging: remove hp100 driver
  staging: wilc1000: Use crc7 in lib/ rather than a private copy
  Staging: rtl8192u: ieee80211: Use netdev_alert().
  Staging: rtl8192u: ieee80211: Use netdev_info() with network devices.
  Staging: rtl8192u: ieee80211: Use netdev_warn() for network devices.
  Staging: rtl8192u: ieee80211: Use netdev_dbg() for debug messages.
  staging: wlan-ng: fix use-after-free Read in hfa384x_usbin_callback
  staging: rtl8723bs: hal: Remove NULL check before kfree
  staging: rtl8723bs: hal: Correct typos in comments
  staging: rtl8723bs: os_dep: Correct typos in comments
  staging: rtl8723bs: core: Correct typos in comments
  staging: rtl8723bs: hal: Remove unnecessary cast on void pointer
  staging: rtl8188eu: cleanup long line in odm.c
  staging: rtl8723bs: hal: Compress return logic
  staging: rtl8723bs: rtw_cmd: Compress lines for immediate return
  staging: rtl8723bs: rtw_efuse: Compress lines for immediate return
  staging: wilc1000: remove label from examples in DT binding documentation
  staging: rtl8723bs: Remove blank line before '}' brace
  Staging: rtl8188eu: hal: Add space around operators
  ...
parents 59838093 e681bb28
Loading
Loading
Loading
Loading
+0 −8
Original line number Diff line number Diff line
@@ -194,11 +194,3 @@ Description:

		destroy_link	write '1' to this attribute to destroy an
				active link

What: 		/sys/kernel/config/rdma_cm/<hca>/ports/<port-num>/default_roce_tos
Date: 		March 8, 2019
KernelVersion:  5.2
Description: 	RDMA-CM QPs from HCA <hca> at port <port-num>
		will be created with this TOS as default.
		This can be overridden by using the rdma_set_option API.
		The possible RoCE TOS values are 0-255.
+25 −0
Original line number Diff line number Diff line
What:		/sys/bus/counter/devices/counterX/signalY/cable_fault
KernelVersion:	5.7
Contact:	linux-iio@vger.kernel.org
Description:
		Read-only attribute that indicates whether a differential
		encoder cable fault (not connected or loose wires) is detected
		for the respective channel of Signal Y. Valid attribute values
		are boolean. Detection must first be enabled via the
		corresponding cable_fault_enable attribute.

What:		/sys/bus/counter/devices/counterX/signalY/cable_fault_enable
KernelVersion:	5.7
Contact:	linux-iio@vger.kernel.org
Description:
		Whether detection of differential encoder cable faults for the
		respective channel of Signal Y is enabled. Valid attribute
		values are boolean.

What:		/sys/bus/counter/devices/counterX/signalY/filter_clock_prescaler
KernelVersion:	5.7
Contact:	linux-iio@vger.kernel.org
Description:
		Filter clock factor for input Signal Y. This prescaler value
		affects the inputs of both quadrature pair signals.

What:		/sys/bus/counter/devices/counterX/signalY/index_polarity
KernelVersion:	5.2
Contact:	linux-iio@vger.kernel.org
+18 −6
Original line number Diff line number Diff line
@@ -2,17 +2,22 @@ What: /sys/bus/iio/devices/iio:deviceX/ac_excitation_en
KernelVersion:
Contact:	linux-iio@vger.kernel.org
Description:
		Reading gives the state of AC excitation.
		Writing '1' enables AC excitation.
		This attribute, if available, is used to enable the AC
		excitation mode found on some converters. In ac excitation mode,
		the polarity of the excitation voltage is reversed on
		alternate cycles, to eliminate DC errors.

What:		/sys/bus/iio/devices/iio:deviceX/bridge_switch_en
KernelVersion:
Contact:	linux-iio@vger.kernel.org
Description:
		This bridge switch is used to disconnect it when there is a
		need to minimize the system current consumption.
		Reading gives the state of the bridge switch.
		Writing '1' enables the bridge switch.
		This attribute, if available, is used to close or open the
		bridge power down switch found on some converters.
		In bridge applications, such as strain gauges and load cells,
		the bridge itself consumes the majority of the current in the
		system. To minimize the current consumption of the system,
		the bridge can be disconnected (when it is not being used
		using the bridge_switch_en attribute.

What:		/sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration
KernelVersion:
@@ -21,6 +26,13 @@ Description:
		Initiates the system calibration procedure. This is done on a
		single channel at a time. Write '1' to start the calibration.

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage2-voltage2_shorted_raw
KernelVersion:
Contact:	linux-iio@vger.kernel.org
Description:
		Measure voltage from AIN2 pin connected to AIN(+)
		and AIN(-) shorted.

What:		/sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available
KernelVersion:
Contact:	linux-iio@vger.kernel.org
+3 −21
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Contact: Christian Gromm <christian.gromm@microchip.com>
Description:
		Provides information about the interface type and the physical
		location of the device. Hardware attached via USB, for instance,
		might return <usb_device 1-1.1:1.0>
		might return <1-1.1:1.0>
Users:

What:		/sys/bus/most/devices/.../interface
@@ -278,25 +278,7 @@ Description:
		Indicates whether current channel ran out of buffers.
Users:

What:		/sys/bus/most/drivers/mostcore/add_link
Date:		March 2017
KernelVersion:	4.15
Contact:	Christian Gromm <christian.gromm@microchip.com>
Description:
		This is used to link a channel to a component of the
		mostcore. A link created by writing to this file is
		referred to as pipe.
Users:

What:		/sys/bus/most/drivers/mostcore/remove_link
Date:		March 2017
KernelVersion:	4.15
Contact:	Christian Gromm <christian.gromm@microchip.com>
Description:
		This is used to unlink a channel from a component.
Users:

What:		/sys/bus/most/drivers/mostcore/components
What:		/sys/bus/most/drivers/most_core/components
Date:		March 2017
KernelVersion:	4.15
Contact:	Christian Gromm <christian.gromm@microchip.com>
@@ -304,7 +286,7 @@ Description:
		This is used to retrieve a list of registered components.
Users:

What:		/sys/bus/most/drivers/mostcore/links
What:		/sys/bus/most/drivers/most_core/links
Date:		March 2017
KernelVersion:	4.15
Contact:	Christian Gromm <christian.gromm@microchip.com>
+65 −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/adi,ad7923.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Analog Devices AD7923 and similars with 4 and 8 Channel ADCs.

maintainers:
  - Michael Hennerich <michael.hennerich@analog.com>
  - Patrick Vasseur <patrick.vasseur@c-s.fr>

description: |
  Analog Devices AD7904, AD7914, AD7923, AD7924 4 Channel ADCs, and AD7908,
   AD7918, AD7928 8 Channels ADCs.

  Specifications about the part can be found at:
    https://www.analog.com/media/en/technical-documentation/data-sheets/AD7923.pdf
    https://www.analog.com/media/en/technical-documentation/data-sheets/AD7904_7914_7924.pdf
    https://www.analog.com/media/en/technical-documentation/data-sheets/AD7908_7918_7928.pdf

properties:
  compatible:
    enum:
      - adi,ad7904
      - adi,ad7914
      - adi,ad7923
      - adi,ad7924
      - adi,ad7908
      - adi,ad7918
      - adi,ad7928

  reg:
    maxItems: 1

  refin-supply:
    description: |
      The regulator supply for ADC reference voltage.

  '#address-cells':
    const: 1

  '#size-cells':
    const: 0

required:
  - compatible
  - reg

examples:
  - |
    spi {
      #address-cells = <1>;
      #size-cells = <0>;

      ad7928: adc@0 {
        compatible = "adi,ad7928";
        reg = <0>;
        spi-max-frequency = <25000000>;
        refin-supply = <&adc_vref>;

        #address-cells = <1>;
        #size-cells = <0>;
      };
    };
Loading