Commit 5d99aa09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging and IIO driver updates from Greg KH:
 "Here is the "big" set of staging and IIO driver patches for 5.12-rc1.

  Nothing really huge in here, the number of staging tree patches has
  gone down for a bit, maybe there's only so much churn to happen in
  here at the moment.

  The IIO changes are:

   - new drivers

   - new DT bindings

   - new iio driver features

  with full details in the shortlog.

  The staging driver patches are just a lot of tiny coding style
  cleanups, along with some semi-larger hikey driver cleanups as those
  are _almost_ good enough to get out of the staging tree, but will
  probably have to wait until 5.13 to have happen.

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

* tag 'staging-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (189 commits)
  staging: hikey9xx: Fix alignment of function parameters
  staging: greybus: Fixed a misspelling in hid.c
  staging: wimax/i2400m: fix some byte order issues found by sparse
  staging: wimax: i2400m: fix some incorrect type warnings
  staging: greybus: minor code style fix
  staging:wlan-ng: use memdup_user instead of kmalloc/copy_from_user
  staging:r8188eu: use IEEE80211_FCTL_* kernel definitions
  staging: rtl8192e: remove multiple blank lines
  staging: greybus: Fixed alignment issue in hid.c
  staging: wfx: remove unused included header files
  staging: nvec: minor coding style fix
  staging: wimax: Fix some coding style problem
  staging: fbtft: add tearing signal detect
  staging: vt6656: Fixed issue with alignment in rf.c
  staging: qlge: Remove duplicate word in comment
  staging: rtl8723bs: remove obsolete commented out code
  staging: rtl8723bs: fix function comments to follow kernel-doc
  staging: wfx: avoid defining array of flexible struct
  staging: rtl8723bs: Replace one-element array with flexible-array member in struct ndis_80211_var_ie
  staging: Replace lkml.org links with lore
  ...
parents 780607b9 4eb839ae

Documentation/ABI/testing/sysfs-bus-iio

+11 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ Description: 
		Units after application of scale and offset are m/s^2.



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

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

KernelVersion:	4.17

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1812,3 +1813,13 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Unscaled light intensity according to CIE 1931/DIN 5033 color space.

		Units after application of scale are nano nanowatts per square meter.



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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Optional symbolic label for channel Y.

		For Intel hid hinge sensor, the label values are:

		hinge, keyboard, screen. It means the three channels

		each correspond respectively to hinge angle, keyboard angle,

		and screen angle.

Documentation/ABI/testing/sysfs-bus-iio-dac-ad5766

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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Dither enable. Write 1 to enable dither or 0 to disable it.



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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Inverts the dither applied to the selected DAC channel. Dither is not

		inverted by default. Write "1" to invert dither.



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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Returns possible scalings available for the current channel.



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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Scales the dither before it is applied to the selected channel.



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

KernelVersion:	5.12

Contact:	linux-iio@vger.kernel.org

Description:

		Selects dither source applied to the selected channel. Write "0" to

		select N0 source, write "1" to select N1 source.

Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.yaml

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ properties: 
  reg:

    maxItems: 1



  vdd-supply: true

  vddio-supply: true



  mount-matrix:

    description: an optional 3x3 mounting rotation matrix.

Documentation/devicetree/bindings/iio/adc/xilinx-xadc.txt

+39 −10
Original line number Diff line number Diff line 
Xilinx XADC device driver



This binding document describes the bindings for both of them since the

bindings are very similar. The Xilinx XADC is a ADC that can be found in the

series 7 FPGAs from Xilinx. The XADC has a DRP interface for communication.

Currently two different frontends for the DRP interface exist. One that is only

available on the ZYNQ family as a hardmacro in the SoC portion of the ZYNQ. The

other one is available on all series 7 platforms and is a softmacro with a AXI

interface. This binding document describes the bindings for both of them since

the bindings are very similar.

This binding document describes the bindings for the Xilinx 7 Series XADC as well

as the UltraScale/UltraScale+ System Monitor.



The Xilinx XADC is an ADC that can be found in the Series 7 FPGAs from Xilinx.

The XADC has a DRP interface for communication. Currently two different

frontends for the DRP interface exist. One that is only available on the ZYNQ

family as a hardmacro in the SoC portion of the ZYNQ. The other one is available

on all series 7 platforms and is a softmacro with a AXI interface. This binding

document describes the bindings for both of them since the bindings are very

similar.



The Xilinx System Monitor is an ADC that is found in the UltraScale and

UltraScale+ FPGAs from Xilinx. The System Monitor provides a DRP interface for

communication. Xilinx provides a standard IP core that can be used to access the

System Monitor through an AXI interface in the FPGA fabric. This IP core is

called the Xilinx System Management Wizard. This document describes the bindings

for this IP.



Required properties:

	- compatible: Should be one of
@@ -15,11 +24,14 @@ Required properties: 
		  configuration interface to interface to the XADC hardmacro.

		* "xlnx,axi-xadc-1.00.a": When using the axi-xadc pcore to

		  interface to the XADC hardmacro.

		* "xlnx,system-management-wiz-1.3": When using the

		  Xilinx System Management Wizard fabric IP core to access the

		  UltraScale and UltraScale+ System Monitor.

	- reg: Address and length of the register set for the device

	- interrupts: Interrupt for the XADC control interface.

	- clocks: When using the ZYNQ this must be the ZYNQ PCAP clock,

	  when using the AXI-XADC pcore this must be the clock that provides the

	  clock to the AXI bus interface of the core.

	  when using the axi-xadc or the axi-system-management-wizard this must be

	  the clock that provides the clock to the AXI bus interface of the core.



Optional properties:

	- xlnx,external-mux:
@@ -110,3 +122,20 @@ Examples: 
			};

		};

	};



	adc@80000000 {

		compatible = "xlnx,system-management-wiz-1.3";

		reg = <0x80000000 0x1000>;

		interrupts = <0 81 4>;

		interrupt-parent = <&gic>;

		clocks = <&fpga1_clk>;



		xlnx,channels {

			#address-cells = <1>;

			#size-cells = <0>;

			channel@0 {

				reg = <0>;

				xlnx,bipolar;

			};

		};

	};

Documentation/devicetree/bindings/iio/dac/adi,ad5766.yaml

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

# Copyright 2020 Analog Devices Inc.

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/dac/adi,ad5766.yaml#

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



title: Analog Devices AD5766 DAC device driver



maintainers:

  - Cristian Pop <cristian.pop@analog.com>



description: |

  Bindings for the Analog Devices AD5766 current DAC device. Datasheet can be

  found here:

    https://www.analog.com/media/en/technical-documentation/data-sheets/ad5766-5767.pdf



properties:

  compatible:

    enum:

      - adi,ad5766

      - adi,ad5767



  output-range-microvolts:

    description: Select converter output range.



  reg:

    maxItems: 1



  spi-max-frequency:

    maximum: 1000000



  spi-cpol: true



  reset-gpios:

    description: GPIO spec for the RESET pin. As the line is active low, it

      should be marked GPIO_ACTIVE_LOW.

    maxItems: 1



required:

  - compatible

  - output-range-microvolts

  - reg

  - spi-max-frequency

  - spi-cpol



additionalProperties: false



examples:

  - |

    spi {

          #address-cells = <1>;

          #size-cells = <0>;



          ad5766@0 {

              compatible = "adi,ad5766";

              output-range-microvolts = <(-5000) 5000>;

              reg = <0>;

              spi-cpol;

              spi-max-frequency = <1000000>;

              reset-gpios = <&gpio 22 0>;

            };

      };