From: Linus Torvalds Date: Mon, 28 Mar 2022 19:27:35 +0000 (-0700) Subject: Merge tag 'char-misc-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=02e2af20f4f9f2aa;p=uclinux-h8%2Flinux.git Merge tag 'char-misc-5.18-rc1' of git://git./linux/kernel/git/gregkh/char-misc 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 ... --- 02e2af20f4f9f2aa0c84e9a30a35c02f0fbb7daa diff --cc Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml index 000000000000,a60386bd19b2..e23e5590eaa3 mode 000000,100644..100644 --- a/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 + + 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/hwmon/index.rst index a8838cb0d17e,f387f661e1d7..863b76289159 --- a/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 5debe27f4f23,a1dfb3fab5f8..1eb8cb996ed1 --- a/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 ++S: Maintained ++F: Documentation/devicetree/bindings/nvmem/sunplus,sp7021-ocotp.yaml ++F: drivers/nvmem/sunplus-ocotp.c ++ SUNPLUS RTC DRIVER M: Vincent Shih 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 + M: Bryan Tan + M: Rajesh Jalisatgi M: Vishnu Dasa +R: VMware PV-Drivers Reviewers L: linux-kernel@vger.kernel.org -L: pv-drivers@vmware.com (private) S: Maintained F: drivers/misc/vmw_vmci/ diff --cc drivers/iio/common/ssp_sensors/ssp_dev.c index eafaf4529df5,a3783ea3117a..e64d242145e0 --- a/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/phy/freescale/Kconfig index 0e91cd99c36b,856cbec7057d..8d945211c7b4 --- a/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