Commit e786741f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.3-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 Staging and IIO driver update for 5.3-rc1.

  Lots of new IIO drivers are in here, along with loads of tiny staging
  driver cleanups and fixes. Overall we almost break even with the same
  lines added as removed.

  Full details are in the shortlog, they are too large to list here.

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

* tag 'staging-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (608 commits)
  staging: kpc2000: simplify comparison to NULL in fileops.c
  staging: kpc2000: simplify comparison to NULL in dma.c
  staging: kpc2000: simplify comparison to NULL in kpc2000_spi.c
  staging: rtl8723bs: hal: remove redundant assignment to packetType
  staging: rtl8723bs: Change return type of hal_btcoex_IsBtDisabled()
  staging: rtl8723bs: Remove rtw_btcoex_DisplayBtCoexInfo()
  staging: rtl8723bs: Remove function rtw_btcoex_GetDBG()
  staging: rtl8723bs: Remove function rtw_btcoex_SetDBG()
  staging: rtl8723bs: Remove rtw_btcoex_IsBTCoexCtrlAMPDUSize()
  staging: rtl8723bs: Remove rtw_btcoex_BtInfoNotify()
  staging: rtl8723bs: Remove rtw_btcoex_ScanNotify()
  staging: rtl8723bs: Remove rtw_btcoex_SetSingleAntPath()
  staging: rtl8723bs: Remove rtw_btcoex_SetPGAntNum()
  staging: rtl8192e: remove redundant initialization of rtstatus
  staging: rtl8723bs: Remove rtw_btcoex_GetRaMask()
  staging: rtl8723bs: Remove rtw_btcoex_SetChipType()
  staging: rtl8723bs: Remove rtw_btcoex_ConnectNotify()
  staging: rtl8723bs: Remove rtw_btcoex_SetBTCoexist()
  staging: rtl8723bs: Remove rtw_btcoex_IsBtDisabled()
  staging: rtl8723bs: Remove rtw_btcoex_IsBtControlLps()
  ...
parents 97ff4ca4 5d153248

Documentation/ABI/testing/sysfs-bus-iio

+5 −2
Original line number Diff line number Diff line
@@ -61,8 +61,11 @@ What: /sys/bus/iio/devices/triggerX/sampling_frequency_available 
KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		When the internal sampling clock can only take a small

		discrete set of values, this file lists those available.

		When the internal sampling clock can only take a specific set of

		frequencies, we can specify the available values with:

		- a small discrete set of values like "0 2 4 6 8"

		- a range with minimum, step and maximum frequencies like

		  "[min step max]"



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

KernelVersion:	2.6.38

Documentation/ABI/testing/sysfs-bus-iio-cros-ec

+5 −5
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ Description: 
		values are 'base' and 'lid'.



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

Date:		Septembre 2017

Date:		September 2017

KernelVersion:	4.14

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute is exposed by the CrOS EC legacy accelerometer

		driver and represents the sensor ID as exposed by the EC. This

		ID is used by the Android sensor service hardware abstraction

		layer (sensor HAL) through the Android container on ChromeOS.
 
		This attribute is exposed by the CrOS EC sensors driver and

		represents the sensor ID as exposed by the EC. This ID is used

		by the Android sensor service hardware abstraction layer (sensor

		HAL) through the Android container on ChromeOS.

Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4371

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

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Stores the PLL frequency in Hz for channel Y.

		Reading returns the actual frequency in Hz.

		The ADF4371 has an integrated VCO with fundamendal output

		frequency ranging from 4000000000 Hz 8000000000 Hz.



		out_altvoltage0_frequency:

			A divide by 1, 2, 4, 8, 16, 32 or circuit generates

			frequencies from 62500000 Hz to 8000000000 Hz.

		out_altvoltage1_frequency:

			This channel duplicates the channel 0 frequency

		out_altvoltage2_frequency:

			A frequency doubler generates frequencies from

			8000000000 Hz to 16000000000 Hz.

		out_altvoltage3_frequency:

			A frequency quadrupler generates frequencies from

			16000000000 Hz to 32000000000 Hz.



		Note: writes to one of the channels will affect the frequency of

		all the other channels, since it involves changing the VCO

		fundamental output frequency.



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

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		Reading returns the datasheet name for channel Y:



		out_altvoltage0_name: RF8x

		out_altvoltage1_name: RFAUX8x

		out_altvoltage2_name: RF16x

		out_altvoltage3_name: RF32x



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

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute allows the user to power down the PLL and it's

		RFOut buffers.

		Writing 1 causes the specified channel to power down.

		Clearing returns to normal operation.

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

0 → 100644
+72 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accelerometers/adi,adxl345.yaml#

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



title: Analog Devices ADXL345/ADXL375 3-Axis Digital Accelerometers



maintainers:

  - Michael Hennerich <michael.hennerich@analog.com>



description: |

  Analog Devices ADXL345/ADXL375 3-Axis Digital Accelerometers that supports

  both I2C & SPI interfaces.

    http://www.analog.com/en/products/mems/accelerometers/adxl345.html

    http://www.analog.com/en/products/sensors-mems/accelerometers/adxl375.html



properties:

  compatible:

    enum:

      - adi,adxl345

      - adi,adxl375



  reg:

    maxItems: 1



  spi-cpha: true



  spi-cpol: true



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



examples:

  - |

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

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

    i2c0 {

        #address-cells = <1>;

        #size-cells = <0>;



        /* Example for a I2C device node */

        accelerometer@2a {

            compatible = "adi,adxl345";

            reg = <0x53>;

            interrupt-parent = <&gpio0>;

            interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;

        };

    };

  - |

    #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,adxl345";

            reg = <0>;

            spi-max-frequency = <5000000>;

            spi-cpol;

            spi-cpha;

            interrupt-parent = <&gpio0>;

            interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;

        };

    };

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

0 → 100644
+63 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/accelerometers/adi,adxl372.yaml#

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



title: Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer



maintainers:

  - Stefan Popa <stefan.popa@analog.com>



description: |

  Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer that supports

  both I2C & SPI interfaces

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



properties:

  compatible:

    enum:

      - adi,adxl372



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts



examples:

  - |

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

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

        i2c0 {

                #address-cells = <1>;

                #size-cells = <0>;



                /* Example for a I2C device node */

                accelerometer@53 {

                        compatible = "adi,adxl372";

                        reg = <0x53>;

                        interrupt-parent = <&gpio>;

                        interrupts = <25 IRQ_TYPE_EDGE_FALLING>;

                };

        };

  - |

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

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

        spi0 {

                #address-cells = <1>;

                #size-cells = <0>;



                accelerometer@0 {

                        compatible = "adi,adxl372";

                        reg = <0>;

                        spi-max-frequency = <1000000>;

                        interrupt-parent = <&gpio>;

                        interrupts = <25 IRQ_TYPE_EDGE_FALLING>;

                };

        };

CRA Git | Maintained and supported by SUSTech CRA and CCSE