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

Pull char/misc and other driver updates from Greg KH:
 "Here is the big set of char/misc and other small driver subsystem
  updates for 5.18-rc1.

  Included in here are merges from driver subsystems which contain:

   - iio driver updates and new drivers

   - fsi driver updates

   - fpga driver updates

   - habanalabs driver updates and support for new hardware

   - soundwire driver updates and new drivers

   - phy driver updates and new drivers

   - coresight driver updates

   - icc driver updates

  Individual changes include:

   - mei driver updates

   - interconnect driver updates

   - new PECI driver subsystem added

   - vmci driver updates

   - lots of tiny misc/char driver updates

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

* tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (556 commits)
  firmware: google: Properly state IOMEM dependency
  kgdbts: fix return value of __setup handler
  firmware: sysfb: fix platform-device leak in error path
  firmware: stratix10-svc: add missing callback parameter on RSU
  arm64: dts: qcom: add non-secure domain property to fastrpc nodes
  misc: fastrpc: Add dma handle implementation
  misc: fastrpc: Add fdlist implementation
  misc: fastrpc: Add helper function to get list and page
  misc: fastrpc: Add support to secure memory map
  dt-bindings: misc: add fastrpc domain vmid property
  misc: fastrpc: check before loading process to the DSP
  misc: fastrpc: add secure domain support
  dt-bindings: misc: add property to support non-secure DSP
  misc: fastrpc: Add support to get DSP capabilities
  misc: fastrpc: add support for FASTRPC_IOCTL_MEM_MAP/UNMAP
  misc: fastrpc: separate fastrpc device from channel context
  dt-bindings: nvmem: brcm,nvram: add basic NVMEM cells
  dt-bindings: nvmem: make "reg" property optional
  nvmem: brcm_nvram: parse NVRAM content into NVMEM cells
  nvmem: dt-bindings: Fix the error of dt-bindings check
  ...

diff --cc .mailmap
Simple merge

diff --cc Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
index 0000000000000000000000000000000000000000,a60386bd19b2f04d3c1f2f65dab91bcdbaa8f915..e23e5590eaa3d0e60caa59a75063e86ec678b650
mode 000000,100644..100644
--- /dev/null
--- 2/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
@@@ -1,0 -1,108 +1,109 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
+ %YAML 1.2
+ ---
+ $id: http://devicetree.org/schemas/phy/qcom,usb-hs-phy.yaml#
+ $schema: http://devicetree.org/meta-schemas/core.yaml#
+ 
+ title: Qualcomm's USB HS PHY binding description
+ 
+ maintainers:
+   - Bjorn Andersson <bjorn.andersson@linaro.org>
+ 
+ if:
+   properties:
+     compatible:
+       contains:
+         const: qcom,usb-hs-phy-apq8064
+   then:
+     properties:
+       resets:
+         maxItems: 1
+ 
+       reset-names:
+         const: por
+ 
+   else:
+     properties:
+       resets:
+         minItems: 2
+         maxItems: 2
+ 
+       reset-names:
+         items:
+           - const: phy
+           - const: por
+ 
+ properties:
+   compatible:
+     items:
+       - enum:
+           - qcom,usb-hs-phy-apq8064
++          - qcom,usb-hs-phy-msm8226
+           - qcom,usb-hs-phy-msm8916
+           - qcom,usb-hs-phy-msm8974
+       - const: qcom,usb-hs-phy
+ 
+   clocks:
+     minItems: 2
+     maxItems: 2
+ 
+   clock-names:
+     maxItems: 2
+     contains:
+       items:
+         - const: ref
+         - const: sleep
+ 
+   resets: true
+ 
+   reset-names: true
+ 
+   v1p8-supply: true
+ 
+   v3p3-supply: true
+ 
+   extcon: true
+ 
+   "#phy-cells":
+     const: 0
+ 
+   qcom,init-seq:
+     $ref: /schemas/types.yaml#/definitions/uint8-matrix
+     description: >
+       Sequence of ULPI address and value pairs to
+       program into the ULPI_EXT_VENDOR_SPECIFIC area.
+       This is related to Device Mode Eye Diagram test.
+     maxItems: 32 # no hard limit
+     items:
+       items:
+         - description: >
+             the address is offset from the ULPI_EXT_VENDOR_SPECIFIC address
+         - description: value
+ 
+ required:
+   - clocks
+   - clock-names
+   - resets
+   - reset-names
+   - "#phy-cells"
+ 
+ additionalProperties: false
+ 
+ examples:
+   - |
+     otg: usb-controller {
+       ulpi {
+         phy {
+           compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy";
+           #phy-cells = <0>;
+           clocks = <&clk 0>, <&clk 258>;
+           clock-names = "ref", "sleep";
+           resets = <&gcc 10>, <&otg 0>;
+           reset-names = "phy", "por";
+           v3p3-supply = <&pm8941_l24>;
+           v1p8-supply = <&pm8941_l6>;
+           extcon = <&smbb>;
+           qcom,init-seq = /bits/ 8 <0x1 0x63>;
+         };
+       };
+     };

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
Simple merge

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge

diff --cc Documentation/hwmon/index.rst
index a8838cb0d17ee591a6853f19c0061d9473cf1ad1,f387f661e1d7eabc0f430d606211895a4ddc9e6a..863b76289159708fa2321fd928bfd5d838e02e19
--- 1/Documentation/hwmon/index.rst
--- 2/Documentation/hwmon/index.rst
+++ b/Documentation/hwmon/index.rst
@@@ -161,8 -160,9 +161,10 @@@ Hardware Monitoring Kernel Driver
     pc87427
     pcf8591
     pim4328
 +   pli1209bc
     pm6764tr
+    peci-cputemp
+    peci-dimmtemp
     pmbus
     powr1220
     pxe1610

diff --cc MAINTAINERS
index 5debe27f4f23f724106fc81b3e0a65a2b794649e,a1dfb3fab5f8a84af8f7b10c844cd2da7218bcf0..1eb8cb996ed112141358206fbfa535ed92304630
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -18722,6 -18639,6 +18826,12 @@@ L:  netdev@vger.kernel.or
  S:    Maintained
  F:    drivers/net/ethernet/dlink/sundance.c
  
++SUNPLUS OCOTP DRIVER
++M:    Vincent Shih <vincent.sunplus@gmail.com>
++S:    Maintained
++F:    Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml
++F:    drivers/nvmem/sunplus-ocotp.c
++
  SUNPLUS RTC DRIVER
  M:    Vincent Shih <vincent.sunplus@gmail.com>
  L:    linux-rtc@vger.kernel.org
@@@ -20913,10 -20785,11 +21023,11 @@@ S:        Supporte
  F:    drivers/ptp/ptp_vmw.c
  
  VMWARE VMCI DRIVER
- M:    Jorgen Hansen <jhansen@vmware.com>
+ M:    Bryan Tan <bryantan@vmware.com>
+ M:    Rajesh Jalisatgi <rjalisatgi@vmware.com>
  M:    Vishnu Dasa <vdasa@vmware.com>
 +R:    VMware PV-Drivers Reviewers <pv-drivers@vmware.com>
  L:    linux-kernel@vger.kernel.org
 -L:    pv-drivers@vmware.com (private)
  S:    Maintained
  F:    drivers/misc/vmw_vmci/
  

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/boot/dts/qcom/msm8916.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sdm845.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sm8150.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sm8250.dtsi
Simple merge

diff --cc arch/arm64/boot/dts/qcom/sm8350.dtsi
Simple merge

diff --cc drivers/ata/ahci.h
Simple merge

diff --cc drivers/ata/ahci_mvebu.c
Simple merge

diff --cc drivers/ata/libahci_platform.c
Simple merge

diff --cc drivers/char/virtio_console.c
Simple merge

diff --cc drivers/firmware/sysfb_simplefb.c
Simple merge

diff --cc drivers/firmware/xilinx/zynqmp.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/iio/accel/bma400_spi.c
Simple merge

diff --cc drivers/iio/accel/bmc150-accel-spi.c
Simple merge

diff --cc drivers/iio/accel/bmi088-accel-spi.c
Simple merge

diff --cc drivers/iio/accel/kxsd9-spi.c
Simple merge

diff --cc drivers/iio/accel/mma7455_spi.c
Simple merge

diff --cc drivers/iio/common/ssp_sensors/ssp_dev.c
index eafaf4529df54253c341488ff1cee145f0544a1b,a3783ea3117ab2e70c81af5d698a1d3efb3f6079..e64d242145e04c7918c1d4f9d7f55ec376af2188
--- 1/drivers/iio/common/ssp_sensors/ssp_dev.c
--- 2/drivers/iio/common/ssp_sensors/ssp_dev.c
+++ b/drivers/iio/common/ssp_sensors/ssp_dev.c
@@@ -608,9 -596,10 +596,8 @@@ static void ssp_remove(struct spi_devic
        mutex_destroy(&data->pending_lock);
  
        mfd_remove_devices(&spi->dev);
 -
 -      return 0;
  }
  
- #ifdef CONFIG_PM_SLEEP
  static int ssp_suspend(struct device *dev)
  {
        int ret;

diff --cc drivers/iio/dac/ad5592r.c
Simple merge

diff --cc drivers/iio/dac/ad5686-spi.c
Simple merge

diff --cc drivers/iio/frequency/adf4350.c
Simple merge

diff --cc drivers/iio/magnetometer/bmc150_magn_spi.c
Simple merge

diff --cc drivers/iio/magnetometer/hmc5843_spi.c
Simple merge

diff --cc drivers/iio/pressure/ms5611_spi.c
Simple merge

diff --cc drivers/iio/pressure/zpa2326_spi.c
Simple merge

diff --cc drivers/misc/fastrpc.c
Simple merge

diff --cc drivers/misc/habanalabs/include/common/cpucp_if.h
Simple merge

diff --cc drivers/mmc/host/rtsx_pci_sdmmc.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/pci/controller/pci-aardvark.c
Simple merge

diff --cc drivers/phy/freescale/Kconfig
index 0e91cd99c36b6804822eedc93ed56e454b1ccf87,856cbec7057d9e54bca6ea54faf7ccfa14f88799..8d945211c7b407276d1874dc790e29f76e0c79e7
--- 1/drivers/phy/freescale/Kconfig
--- 2/drivers/phy/freescale/Kconfig
+++ b/drivers/phy/freescale/Kconfig
@@@ -23,12 -26,4 +26,14 @@@ config PHY_FSL_IMX8M_PCI
          Enable this to add support for the PCIE PHY as found on
          i.MX8M family of SOCs.
  
 +config PHY_FSL_LYNX_28G
 +      tristate "Freescale Layerscape Lynx 28G SerDes PHY support"
 +      depends on OF
 +      select GENERIC_PHY
 +      help
 +        Enable this to add support for the Lynx SerDes 28G PHY as
 +        found on NXP's Layerscape platforms such as LX2160A.
 +        Used to change the protocol running on SerDes lanes at runtime.
 +        Only useful for a restricted set of Ethernet protocols.
++
+ endif

diff --cc drivers/usb/host/xhci-plat.c
Simple merge

diff --cc include/linux/firmware/xlnx-zynqmp.h
Simple merge