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

Merge tag 'char-misc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char / misc driver updates from Greg KH:
 "Here is the big set of char / misc and other driver subsystem updates
  for 5.14-rc1. Included in here are:

   - habanalabs driver updates

   - fsl-mc driver updates

   - comedi driver updates

   - fpga driver updates

   - extcon driver updates

   - interconnect driver updates

   - mei driver updates

   - nvmem driver updates

   - phy driver updates

   - pnp driver updates

   - soundwire driver updates

   - lots of other tiny driver updates for char and misc drivers

  This is looking more and more like the "various driver subsystems
  mushed together" tree...

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

* tag 'char-misc-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (292 commits)
  mcb: Use DEFINE_RES_MEM() helper macro and fix the end address
  PNP: moved EXPORT_SYMBOL so that it immediately followed its function/variable
  bus: mhi: pci-generic: Add missing 'pci_disable_pcie_error_reporting()' calls
  bus: mhi: Wait for M2 state during system resume
  bus: mhi: core: Fix power down latency
  intel_th: Wait until port is in reset before programming it
  intel_th: msu: Make contiguous buffers uncached
  intel_th: Remove an unused exit point from intel_th_remove()
  stm class: Spelling fix
  nitro_enclaves: Set Bus Master for the NE PCI device
  misc: ibmasm: Modify matricies to matrices
  misc: vmw_vmci: return the correct errno code
  siox: Simplify error handling via dev_err_probe()
  fpga: machxo2-spi: Address warning about unused variable
  lkdtm/heap: Add init_on_alloc tests
  selftests/lkdtm: Enable various testable CONFIGs
  lkdtm: Add CONFIG hints in errors where possible
  lkdtm: Enable DOUBLE_FAULT on all architectures
  lkdtm/heap: Add vmalloc linear overflow test
  lkdtm/bugs: XFAIL UNALIGNED_LOAD_STORE_WRITE
  ...
parents 3f8b8e7d 6f746d48

Documentation/ABI/stable/sysfs-driver-w1_ds2438

0 → 100644
+13 −0
Original line number Diff line number Diff line 
What:		/sys/bus/w1/devices/.../page1

Date:		April 2021

Contact:	Luiz Sampaio <sampaio.ime@gmail.com>

Description:	read the contents of the page1 of the DS2438

		see Documentation/w1/slaves/w1_ds2438.rst for detailed information

Users:		any user space application which wants to communicate with DS2438



What:		/sys/bus/w1/devices/.../offset

Date:		April 2021

Contact:	Luiz Sampaio <sampaio.ime@gmail.com>

Description:	write the contents to the offset register of the DS2438

		see Documentation/w1/slaves/w1_ds2438.rst for detailed information

Users:		any user space application which wants to communicate with DS2438

Documentation/ABI/testing/debugfs-driver-habanalabs

+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,14 @@ Contact: ogabbay@kernel.org 
Description:    Sets the PCI power state. Valid values are "1" for D0 and "2"

                for D3Hot



What:           /sys/kernel/debug/habanalabs/hl<n>/skip_reset_on_timeout

Date:           Jun 2021

KernelVersion:  5.13

Contact:        ynudelman@habana.ai

Description:    Sets the skip reset on timeout option for the device. Value of

                "0" means device will be reset in case some CS has timed out,

                otherwise it will not be reset.



What:           /sys/kernel/debug/habanalabs/hl<n>/stop_on_err

Date:           Mar 2020

KernelVersion:  5.6

Documentation/ABI/testing/sysfs-class-spi-eeprom

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/class/spi_master/spi<bus>/spi<bus>.<dev>/fram

Date:		June 2021

KernelVersion:	5.14

Contact:	Jiri Prchal <jiri.prchal@aksignal.cz>

Description:

	Contains the FRAM binary data. Same as EEPROM, just another file

	name to indicate that it employs ferroelectric process.

	It performs write operations at bus speed - no write delays.



What:		/sys/class/spi_master/spi<bus>/spi<bus>.<dev>/sernum

Date:		May 2021

KernelVersion:	5.14

Contact:	Jiri Prchal <jiri.prchal@aksignal.cz>

Description:

	Contains the serial number of the Cypress FRAM (FM25VN) if it is

	present.  It will be displayed as a 8 byte hex string, as read

	from the device.



	This is a read-only attribute.

Documentation/devicetree/bindings/eeprom/at25.yaml

+25 −6
Original line number Diff line number Diff line
@@ -4,14 +4,16 @@ 
$id: "http://devicetree.org/schemas/eeprom/at25.yaml#"

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



title: SPI EEPROMs compatible with Atmel's AT25

title: SPI EEPROMs or FRAMs compatible with Atmel's AT25



maintainers:

  - Christian Eggers <ceggers@arri.de>



properties:

  $nodename:

    pattern: "^eeprom@[0-9a-f]{1,2}$"

    anyOf:

      - pattern: "^eeprom@[0-9a-f]{1,2}$"

      - pattern: "^fram@[0-9a-f]{1,2}$"



  # There are multiple known vendors who manufacture EEPROM chips compatible

  # with Atmel's AT25. The compatible string requires two items where the
@@ -31,6 +33,7 @@ properties: 
              - microchip,25lc040

              - st,m95m02

              - st,m95256

              - cypress,fm25



          - const: atmel,at25
@@ -47,7 +50,7 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/uint32

    enum: [1, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768, 65536, 131072]

    description:

      Size of the eeprom page.

      Size of the eeprom page. FRAMs don't have pages.



  size:

    $ref: /schemas/types.yaml#/definitions/uint32
@@ -100,6 +103,16 @@ required: 
  - compatible

  - reg

  - spi-max-frequency



allOf:

  - if:

      properties:

        compatible:

          not:

            contains:

              const: cypress,fm25

    then:

      required:

        - pagesize

        - size

        - address-width
@@ -125,4 +138,10 @@ examples: 
            size = <32768>;

            address-width = <16>;

        };



        fram@1 {

            compatible = "cypress,fm25", "atmel,at25";

            reg = <1>;

            spi-max-frequency = <40000000>;

        };

    };

Documentation/devicetree/bindings/extcon/extcon-sm5502.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 


* SM5502 MUIC (Micro-USB Interface Controller) device



The Silicon Mitus SM5502 is a MUIC (Micro-USB Interface Controller) device

which can detect the state of external accessory when external accessory is

attached or detached and button is pressed or released. It is interfaced to

the host controller using an I2C interface.



Required properties:

- compatible: Should be "siliconmitus,sm5502-muic"

- reg: Specifies the I2C slave address of the MUIC block. It should be 0x25

- interrupts: Interrupt specifiers for detection interrupt sources.



Example:



	sm5502@25 {

		compatible = "siliconmitus,sm5502-muic";

		interrupt-parent = <&gpx1>;

		interrupts = <5 0>;

		reg = <0x25>;

	};