Merge tag 'arm-drivers-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

ff6862c2 · Linus Torvalds <[email protected]> · 2022-10-06 11:04:57 -07:00

Pull ARM driver updates from Arnd Bergmann:
 "The drivers branch for 6.1 is a bit larger than for most releases.

  Most of the changes come from SoC maintainers for the drivers/soc
  subsystem:

   - A new driver for error handling on the NVIDIA Tegra 'control
     backbone' bus.

   - A new driver for Qualcomm LLCC/DDR bandwidth measurement

   - New Rockchip rv1126 and rk3588 power domain drivers

   - DT binding updates for memory controllers, older Rockchip SoCs,
     various Mediatek devices, Qualcomm SCM firmware

   - Minor updates to Hisilicon LPC bus, the Allwinner SRAM driver, the
     Apple rtkit firmware driver, Tegra firmware

   - Minor updates for SoC drivers (Samsung, Mediatek, Renesas, Tegra,
     Qualcomm, Broadcom, NXP, ...)

  There are also some separate subsystem with downstream maintainers
  that merge updates this way:

   - Various updates and new drivers in the memory controller subsystem
     for Mediatek and Broadcom SoCs

   - Small set of changes in preparation to add support for FF-A v1.1
     specification later, in the Arm FF-A firmware subsystem

   - debugfs support in the PSCI firmware subsystem"

* tag 'arm-drivers-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (149 commits)
  ARM: remove check for CONFIG_DEBUG_LL_SER3
  firmware/psci: Add debugfs support to ease debugging
  firmware/psci: Print a warning if PSCI doesn't accept PC mode
  dt-bindings: memory: snps,dw-umctl2-ddrc: Extend schema with IRQs/resets/clocks props
  dt-bindings: memory: snps,dw-umctl2-ddrc: Replace opencoded numbers with macros
  dt-bindings: memory: snps,dw-umctl2-ddrc: Use more descriptive device name
  dt-bindings: memory: synopsys,ddrc-ecc: Detach Zynq DDRC controller support
  soc: sunxi: sram: Add support for the D1 system control
  soc: sunxi: sram: Export the LDO control register
  soc: sunxi: sram: Save a pointer to the OF match data
  soc: sunxi: sram: Return void from the release function
  soc: apple: rtkit: Add apple_rtkit_poll
  soc: imx: add i.MX93 media blk ctrl driver
  soc: imx: add i.MX93 SRC power domain driver
  soc: imx: imx8m-blk-ctrl: Use genpd_xlate_onecell
  soc: imx: imx8mp-blk-ctrl: handle PCIe PHY resets
  soc: imx: imx8m-blk-ctrl: add i.MX8MP VPU blk ctrl
  soc: imx: add i.MX8MP HDMI blk ctrl HDCP/HRV_MWR
  soc: imx: add icc paths for i.MX8MP hsio/hdmi blk ctrl
  soc: imx: add icc paths for i.MX8MP media blk ctrl
  ...

Commit: ff6862c23d2e83d12d1759bf4337d41248fb4dc8
Parents: 40285e64 · 44137949

Merge commit. Changes below are compared with the first parent: 40285e64.

Changes

121 files changed · +7568 −887

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-platform-brcmstb-memc	added	+15	−0	View file
Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt	modified	+2	−9	View file
Documentation/devicetree/bindings/arm/fsl.yaml	modified	+36	−22	View file
Documentation/devicetree/bindings/arm/rockchip/pmu.yaml	modified	+4	−0	View file
Documentation/devicetree/bindings/firmware/qcom,scm.txt	deleted	+0	−61	View before deletion
Documentation/devicetree/bindings/firmware/qcom,scm.yaml	added	+148	−0	View file
Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml	modified	+3	−0	View file
Documentation/devicetree/bindings/media/exynos5-gsc.txt	deleted	+0	−38	View before deletion
Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml	added	+109	−0	View file
Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml	added	+52	−0	View file
Documentation/devicetree/bindings/memory-controllers/mediatek,smi-common.yaml	modified	+13	−2	View file
Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml	modified	+3	−0	View file
Documentation/devicetree/bindings/memory-controllers/snps,dw-umctl2-ddrc.yaml	added	+118	−0	View file
Documentation/devicetree/bindings/memory-controllers/synopsys,ddrc-ecc.yaml	deleted	+0	−76	View before deletion
Documentation/devicetree/bindings/memory-controllers/xlnx,zynq-ddrc-a05.yaml	added	+38	−0	View file
Documentation/devicetree/bindings/mfd/syscon.yaml	modified	+2	−0	View file
Documentation/devicetree/bindings/power/mediatek,power-controller.yaml	modified	+19	−116	View file
Documentation/devicetree/bindings/power/qcom,rpmpd.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/power/rockchip,power-controller.yaml	modified	+4	−0	View file
Documentation/devicetree/bindings/power/rockchip-io-domain.yaml	modified	+30	−0	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx8mm-vpu-blk-ctrl.yaml	modified	+99	−11	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hdmi-blk-ctrl.yaml	modified	+9	−0	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml	modified	+10	−0	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx8mp-media-blk-ctrl.yaml	modified	+14	−0	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx93-media-blk-ctrl.yaml	added	+80	−0	View file
Documentation/devicetree/bindings/soc/imx/fsl,imx93-src.yaml	added	+96	−0	View file
Documentation/devicetree/bindings/soc/mediatek/mediatek,mutex.yaml	modified	+2	−0	View file
Documentation/devicetree/bindings/soc/mediatek/pwrap.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml	modified	+1	−0	View file
Documentation/devicetree/bindings/soc/rockchip/grf.yaml	modified	+7	−0	View file
MAINTAINERS	modified	+3	−12	View file
arch/arm/boot/compressed/head.S	modified	+0	−4	View file
drivers/bus/hisi_lpc.c	modified	+44	−52	View file
drivers/cpuidle/cpuidle-psci-domain.c	modified	+1	−3	View file
drivers/firmware/arm_ffa/bus.c	modified	+3	−1	View file
drivers/firmware/arm_ffa/driver.c	modified	+104	−28	View file
drivers/firmware/psci/psci.c	modified	+117	−1	View file
drivers/firmware/qcom_scm.h	modified	+0	−2	View file
drivers/firmware/tegra/bpmp-debugfs.c	modified	+3	−10	View file
drivers/i2c/busses/Kconfig	modified	+2	−2	View file
drivers/memory/Kconfig	modified	+9	−0	View file
drivers/memory/Makefile	modified	+1	−0	View file
drivers/memory/brcmstb_memc.c	added	+301	−0	View file
drivers/memory/dfl-emif.c	modified	+57	−5	View file
drivers/memory/mtk-smi.c	modified	+100	−9	View file
drivers/memory/of_memory.c	modified	+2	−0	View file
drivers/memory/pl353-smc.c	modified	+1	−0	View file
drivers/mtd/parsers/Kconfig	modified	+3	−3	View file
drivers/net/ethernet/broadcom/Kconfig	modified	+2	−2	View file
drivers/pci/controller/Kconfig	modified	+1	−1	View file
drivers/phy/broadcom/Kconfig	modified	+2	−2	View file
drivers/pinctrl/bcm/Kconfig	modified	+2	−2	View file
drivers/reset/Kconfig	modified	+1	−1	View file
drivers/soc/amlogic/meson-ee-pwrc.c	modified	+4	−1	View file
drivers/soc/amlogic/meson-gx-pwrc-vpu.c	modified	+4	−1	View file
drivers/soc/apple/rtkit.c	modified	+6	−0	View file
drivers/soc/bcm/bcm63xx/Kconfig	modified	+2	−2	View file
drivers/soc/bcm/brcmstb/pm/pm-arm.c	modified	+14	−2	View file
drivers/soc/imx/Kconfig	modified	+8	−0	View file
drivers/soc/imx/Makefile	modified	+2	−0	View file
drivers/soc/imx/imx8m-blk-ctrl.c	modified	+82	−14	View file
drivers/soc/imx/imx8mp-blk-ctrl.c	modified	+75	−14	View file
drivers/soc/imx/imx93-blk-ctrl.c	added	+436	−0	View file
drivers/soc/imx/imx93-pd.c	added	+164	−0	View file
drivers/soc/imx/imx93-src.c	added	+33	−0	View file
drivers/soc/mediatek/Kconfig	modified	+2	−0	View file
drivers/soc/mediatek/mt8186-mmsys.h	modified	+6	−0	View file
drivers/soc/mediatek/mtk-mmsys.c	modified	+20	−0	View file
drivers/soc/mediatek/mtk-mutex.c	modified	+44	−0	View file
drivers/soc/mediatek/mtk-pm-domains.c	modified	+3	−3	View file
drivers/soc/mediatek/mtk-pmic-wrap.c	modified	+1	−1	View file
drivers/soc/mediatek/mtk-scpsys.c	modified	+1	−1	View file
drivers/soc/mediatek/mtk-svs.c	modified	+171	−113	View file
drivers/soc/qcom/Kconfig	modified	+1	−1	View file
drivers/soc/qcom/icc-bwmon.c	modified	+381	−98	View file
drivers/soc/qcom/llcc-qcom.c	modified	+80	−12	View file
drivers/soc/qcom/qcom_stats.c	modified	+9	−0	View file
drivers/soc/qcom/qmi_encdec.c	modified	+25	−25	View file
drivers/soc/qcom/qmi_interface.c	modified	+7	−5	View file
drivers/soc/qcom/rpmpd.c	modified	+22	−0	View file
drivers/soc/qcom/smem_state.c	modified	+2	−1	View file
drivers/soc/qcom/smsm.c	modified	+13	−7	View file
drivers/soc/qcom/socinfo.c	modified	+2	−0	View file
drivers/soc/renesas/Kconfig	modified	+11	−0	View file
drivers/soc/renesas/renesas-soc.c	modified	+14	−0	View file
drivers/soc/rockchip/io-domain.c	modified	+20	−0	View file
drivers/soc/rockchip/pm_domains.c	modified	+117	−13	View file
drivers/soc/sunxi/sunxi_sram.c	modified	+31	−22	View file
drivers/soc/tegra/Kconfig	modified	+9	−1	View file
drivers/soc/tegra/Makefile	modified	+1	−0	View file
drivers/soc/tegra/cbb/Makefile	added	+9	−0	View file
drivers/soc/tegra/cbb/tegra-cbb.c	added	+190	−0	View file
drivers/soc/tegra/cbb/tegra194-cbb.c	added	+2364	−0	View file
drivers/soc/tegra/cbb/tegra234-cbb.c	added	+1113	−0	View file
drivers/soc/tegra/fuse/fuse-tegra.c	modified	+1	−0	View file
drivers/soc/tegra/fuse/tegra-apbmisc.c	modified	+32	−4	View file
drivers/soc/tegra/pmc.c	modified	+32	−13	View file
drivers/tee/optee/ffa_abi.c	modified	+22	−24	View file
drivers/tee/optee/optee_private.h	modified	+0	−1	View file
drivers/tty/serial/Kconfig	modified	+2	−2	View file
drivers/watchdog/Kconfig	modified	+1	−1	View file
include/dt-bindings/clock/imx8mm-clock.h	modified	+0	−1	View file
include/dt-bindings/firmware/imx/rsrc.h	modified	+7	−0	View file
include/dt-bindings/power/fsl,imx93-power.h	added	+15	−0	View file
include/dt-bindings/power/imx8mp-power.h	modified	+6	−0	View file
include/dt-bindings/power/qcom-rpmpd.h	modified	+12	−0	View file
include/dt-bindings/power/rk3588-power.h	added	+69	−0	View file
include/dt-bindings/power/rockchip,rv1126-power.h	added	+35	−0	View file
include/linux/arm_ffa.h	modified	+23	−13	View file
include/linux/soc/apple/rtkit.h	modified	+12	−0	View file
include/linux/soc/mediatek/mtk-mmsys.h	modified	+2	−0	View file
include/linux/soc/mediatek/mtk-mutex.h	modified	+2	−0	View file
include/linux/soc/mediatek/mtk_sip_svc.h	modified	+3	−0	View file
include/linux/soc/qcom/llcc-qcom.h	modified	+30	−0	View file
include/linux/soc/qcom/qmi.h	modified	+10	−10	View file
include/linux/soc/sunxi/sunxi_sram.h	modified	+1	−1	View file
include/soc/mediatek/smi.h	modified	+5	−0	View file
include/soc/tegra/fuse.h	modified	+6	−0	View file
include/soc/tegra/tegra-cbb.h	added	+47	−0	View file
include/uapi/linux/psci.h	modified	+14	−0	View file
samples/qmi/qmi_sample_client.c	modified	+5	−5	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-platform-brcmstb-memc

View file

diff --git a/Documentation/ABI/testing/sysfs-platform-brcmstb-memc b/Documentation/ABI/testing/sysfs-platform-brcmstb-memc
new file mode 100644
index 0000000..2f2b750
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-platform-brcmstb-memc
@@ -0,0 +1,15 @@
+What:		/sys/bus/platform/devices/*/srpd
+Date:		July 2022
+KernelVersion:	5.21
+Contact:	Florian Fainelli <[email protected]>
+Description:
+		Self Refresh Power Down (SRPD) inactivity timeout counted in
+		internal DDR controller clock cycles. Possible values range
+		from 0 (disable inactivity timeout) to 65535 (0xffff).
+
+What:		/sys/bus/platform/devices/*/frequency
+Date:		July 2022
+KernelVersion:	5.21
+Contact:	Florian Fainelli <[email protected]>
+Description:
+		DDR PHY frequency in Hz.

Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt

View file

diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
index 104cc9b..071421d 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,brcmstb.txt
@@ -187,15 +187,8 @@ Required properties:
 Sequencer DRAM parameters and control registers. Used for Self-Refresh
 Power-Down (SRPD), among other things.
 
-Required properties:
-- compatible     : should contain one of these
-	"brcm,brcmstb-memc-ddr-rev-b.2.1"
-	"brcm,brcmstb-memc-ddr-rev-b.2.2"
-	"brcm,brcmstb-memc-ddr-rev-b.2.3"
-	"brcm,brcmstb-memc-ddr-rev-b.3.0"
-	"brcm,brcmstb-memc-ddr-rev-b.3.1"
-	"brcm,brcmstb-memc-ddr"
-- reg            : the MEMC DDR register range
+See Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml for a
+full list of supported compatible strings and properties.
 
 Example:
 

Documentation/devicetree/bindings/arm/fsl.yaml

View file

diff --git a/Documentation/devicetree/bindings/arm/fsl.yaml b/Documentation/devicetree/bindings/arm/fsl.yaml
index 7431579..0cea264 100644
--- a/Documentation/devicetree/bindings/arm/fsl.yaml
+++ b/Documentation/devicetree/bindings/arm/fsl.yaml
@@ -554,8 +554,7 @@ properties:
               - engicam,imx6ul-isiot      # Engicam Is.IoT MX6UL eMMC/NAND Starter kit
               - fsl,imx6ul-14x14-evk      # i.MX6 UltraLite 14x14 EVK Board
               - karo,imx6ul-tx6ul         # Ka-Ro electronics TXUL-0010 Module
-              - kontron,imx6ul-n6310-som  # Kontron N6310 SOM
-              - kontron,imx6ul-n6311-som  # Kontron N6311 SOM
+              - kontron,sl-imx6ul         # Kontron SL i.MX6UL SoM
               - prt,prti6g                # Protonic PRTI6G Board
               - technexion,imx6ul-pico-dwarf   # TechNexion i.MX6UL Pico-Dwarf
               - technexion,imx6ul-pico-hobbit  # TechNexion i.MX6UL Pico-Hobbit
@@ -591,23 +590,17 @@ properties:
           - const: phytec,imx6ul-pcl063   # PHYTEC phyCORE-i.MX 6UL
           - const: fsl,imx6ul
 
-      - description: Kontron N6310 S Board
+      - description: Kontron BL i.MX6UL (N631X S) Board
         items:
-          - const: kontron,imx6ul-n6310-s
-          - const: kontron,imx6ul-n6310-som
+          - const: kontron,bl-imx6ul       # Kontron BL i.MX6UL Carrier Board
+          - const: kontron,sl-imx6ul       # Kontron SL i.MX6UL SoM
           - const: fsl,imx6ul
 
-      - description: Kontron N6311 S Board
+      - description: Kontron BL i.MX6UL 43 (N631X S 43) Board
         items:
-          - const: kontron,imx6ul-n6311-s
-          - const: kontron,imx6ul-n6311-som
-          - const: fsl,imx6ul
-
-      - description: Kontron N6310 S 43 Board
-        items:
-          - const: kontron,imx6ul-n6310-s-43
-          - const: kontron,imx6ul-n6310-s
-          - const: kontron,imx6ul-n6310-som
+          - const: kontron,bl-imx6ul-43    # Kontron BL i.MX6UL Carrier Board with 4.3" Display
+          - const: kontron,bl-imx6ul       # Kontron BL i.MX6UL Carrier Board
+          - const: kontron,sl-imx6ul       # Kontron SL i.MX6UL SoM
           - const: fsl,imx6ul
 
       - description: TQ-Systems TQMa6UL1 SoM on MBa6ULx board
@@ -637,7 +630,7 @@ properties:
           - enum:
               - fsl,imx6ull-14x14-evk     # i.MX6 UltraLiteLite 14x14 EVK Board
               - joz,jozacp                # JOZ Access Point
-              - kontron,imx6ull-n6411-som # Kontron N6411 SOM
+              - kontron,sl-imx6ull        # Kontron SL i.MX6ULL SoM
               - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
               - toradex,colibri-imx6ull      # Colibri iMX6ULL Modules
               - toradex,colibri-imx6ull-emmc # Colibri iMX6ULL 1GB (eMMC) Module
@@ -698,10 +691,10 @@ properties:
           - const: toradex,colibri-imx6ull-wifi       # Colibri iMX6ULL Wi-Fi / BT Module
           - const: fsl,imx6ull
 
-      - description: Kontron N6411 S Board
+      - description: Kontron BL i.MX6ULL (N6411 S) Board
         items:
-          - const: kontron,imx6ull-n6411-s
-          - const: kontron,imx6ull-n6411-som
+          - const: kontron,bl-imx6ull   # Kontron BL i.MX6ULL Carrier Board
+          - const: kontron,sl-imx6ull   # Kontron SL i.MX6ULL SoM
           - const: fsl,imx6ull
 
       - description: TQ Systems TQMa6ULLx SoM on MBa6ULx board
@@ -825,13 +818,15 @@ properties:
               - emtrion,emcon-mx8mm-avari # emCON-MX8MM SoM on Avari Base
               - fsl,imx8mm-ddr4-evk       # i.MX8MM DDR4 EVK Board
               - fsl,imx8mm-evk            # i.MX8MM EVK Board
+              - gateworks,imx8mm-gw7904
               - gw,imx8mm-gw71xx-0x       # i.MX8MM Gateworks Development Kit
               - gw,imx8mm-gw72xx-0x       # i.MX8MM Gateworks Development Kit
               - gw,imx8mm-gw73xx-0x       # i.MX8MM Gateworks Development Kit
               - gw,imx8mm-gw7901          # i.MX8MM Gateworks Board
               - gw,imx8mm-gw7902          # i.MX8MM Gateworks Board
               - gw,imx8mm-gw7903          # i.MX8MM Gateworks Board
-              - kontron,imx8mm-n801x-som  # i.MX8MM Kontron SL (N801X) SOM
+              - kontron,imx8mm-sl         # i.MX8MM Kontron SL (N801X) SOM
+              - kontron,imx8mm-osm-s      # i.MX8MM Kontron OSM-S (N802X) SOM
               - menlo,mx8menlo            # i.MX8MM Menlo board with Verdin SoM
               - toradex,verdin-imx8mm     # Verdin iMX8M Mini Modules
               - toradex,verdin-imx8mm-nonwifi  # Verdin iMX8M Mini Modules without Wi-Fi / BT
@@ -850,8 +845,14 @@ properties:
 
       - description: Kontron BL i.MX8MM (N801X S) Board
         items:
-          - const: kontron,imx8mm-n801x-s
-          - const: kontron,imx8mm-n801x-som
+          - const: kontron,imx8mm-bl
+          - const: kontron,imx8mm-sl
+          - const: fsl,imx8mm
+
+      - description: Kontron BL i.MX8MM OSM-S (N802X S) Board
+        items:
+          - const: kontron,imx8mm-bl-osm-s
+          - const: kontron,imx8mm-osm-s
           - const: fsl,imx8mm
 
       - description: Toradex Boards with Verdin iMX8M Mini Modules
@@ -936,6 +937,13 @@ properties:
               - toradex,verdin-imx8mp-wifi  # Verdin iMX8M Plus Wi-Fi / BT Modules
           - const: fsl,imx8mp
 
+      - description: Avnet (MSC Branded) Boards with SM2S i.MX8M Plus Modules
+        items:
+          - const: avnet,sm2s-imx8mp-14N0600E-ep1 # SM2S-IMX8PLUS-14N0600E on SM2-MB-EP1 Carrier Board
+          - const: avnet,sm2s-imx8mp-14N0600E     # 14N0600E variant of SM2S-IMX8PLUS SoM
+          - const: avnet,sm2s-imx8mp              # SM2S-IMX8PLUS SoM
+          - const: fsl,imx8mp
+
       - description: Engicam i.Core MX8M Plus SoM based boards
         items:
           - enum:
@@ -1034,6 +1042,12 @@ properties:
               - toradex,colibri-imx8x     # Colibri iMX8X Modules
           - const: fsl,imx8qxp
 
+      - description: i.MX8DXL based Boards
+        items:
+          - enum:
+              - fsl,imx8dxl-evk           # i.MX8DXL EVK Board
+          - const: fsl,imx8dxl
+
       - description: i.MX8QXP Boards with Toradex Coilbri iMX8X Modules
         items:
           - enum:

Documentation/devicetree/bindings/arm/rockchip/pmu.yaml

View file

diff --git a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
index 5ece380..8c73bc7 100644
--- a/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip/pmu.yaml
@@ -21,10 +21,12 @@ select:
         enum:
           - rockchip,px30-pmu
           - rockchip,rk3066-pmu
+          - rockchip,rk3128-pmu
           - rockchip,rk3288-pmu
           - rockchip,rk3368-pmu
           - rockchip,rk3399-pmu
           - rockchip,rk3568-pmu
+          - rockchip,rk3588-pmu
 
   required:
     - compatible
@@ -35,10 +37,12 @@ properties:
       - enum:
           - rockchip,px30-pmu
           - rockchip,rk3066-pmu
+          - rockchip,rk3128-pmu
           - rockchip,rk3288-pmu
           - rockchip,rk3368-pmu
           - rockchip,rk3399-pmu
           - rockchip,rk3568-pmu
+          - rockchip,rk3588-pmu
       - const: syscon
       - const: simple-mfd
 

Documentation/devicetree/bindings/firmware/qcom,scm.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt
deleted file mode 100644
index b3f702c..0000000
--- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-QCOM Secure Channel Manager (SCM)
-
-Qualcomm processors include an interface to communicate to the secure firmware.
-This interface allows for clients to request different types of actions.  These
-can include CPU power up/down, HDCP requests, loading of firmware, and other
-assorted actions.
-
-Required properties:
-- compatible: must contain one of the following:
- * "qcom,scm-apq8064"
- * "qcom,scm-apq8084"
- * "qcom,scm-ipq4019"
- * "qcom,scm-ipq806x"
- * "qcom,scm-ipq8074"
- * "qcom,scm-mdm9607"
- * "qcom,scm-msm8226"
- * "qcom,scm-msm8660"
- * "qcom,scm-msm8916"
- * "qcom,scm-msm8953"
- * "qcom,scm-msm8960"
- * "qcom,scm-msm8974"
- * "qcom,scm-msm8976"
- * "qcom,scm-msm8994"
- * "qcom,scm-msm8996"
- * "qcom,scm-msm8998"
- * "qcom,scm-qcs404"
- * "qcom,scm-sc7180"
- * "qcom,scm-sc7280"
- * "qcom,scm-sm6125"
- * "qcom,scm-sdm845"
- * "qcom,scm-sdx55"
- * "qcom,scm-sdx65"
- * "qcom,scm-sm6350"
- * "qcom,scm-sm8150"
- * "qcom,scm-sm8250"
- * "qcom,scm-sm8350"
- * "qcom,scm-sm8450"
- and:
- * "qcom,scm"
-- clocks: Specifies clocks needed by the SCM interface, if any:
- * core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660" and
-   "qcom,scm-msm8960"
- * core, iface and bus clocks required for "qcom,scm-apq8084",
-   "qcom,scm-msm8916", "qcom,scm-msm8953", "qcom,scm-msm8974" and "qcom,scm-msm8976"
-- clock-names: Must contain "core" for the core clock, "iface" for the interface
-  clock and "bus" for the bus clock per the requirements of the compatible.
-- qcom,dload-mode: phandle to the TCSR hardware block and offset of the
-		   download mode control register (optional)
-- interconnects: Specifies the bandwidth requirements of the SCM interface (optional)
-
-Example for MSM8916:
-
-	firmware {
-		scm {
-			compatible = "qcom,msm8916", "qcom,scm";
-			clocks = <&gcc GCC_CRYPTO_CLK> ,
-				 <&gcc GCC_CRYPTO_AXI_CLK>,
-				 <&gcc GCC_CRYPTO_AHB_CLK>;
-			clock-names = "core", "bus", "iface";
-		};
-	};

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

View file

diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.yaml b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml
new file mode 100644
index 0000000..c5b76c9
--- /dev/null
+++ b/Documentation/devicetree/bindings/firmware/qcom,scm.yaml
@@ -0,0 +1,148 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/firmware/qcom,scm.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: QCOM Secure Channel Manager (SCM)
+
+description: |
+  Qualcomm processors include an interface to communicate to the secure firmware.
+  This interface allows for clients to request different types of actions.
+  These can include CPU power up/down, HDCP requests, loading of firmware,
+  and other assorted actions.
+
+maintainers:
+  - Bjorn Andersson <[email protected]>
+  - Robert Marko <[email protected]>
+  - Guru Das Srinagesh <[email protected]>
+
+properties:
+  compatible:
+    items:
+      - enum:
+          - qcom,scm-apq8064
+          - qcom,scm-apq8084
+          - qcom,scm-ipq4019
+          - qcom,scm-ipq6018
+          - qcom,scm-ipq806x
+          - qcom,scm-ipq8074
+          - qcom,scm-mdm9607
+          - qcom,scm-msm8226
+          - qcom,scm-msm8660
+          - qcom,scm-msm8916
+          - qcom,scm-msm8953
+          - qcom,scm-msm8960
+          - qcom,scm-msm8974
+          - qcom,scm-msm8976
+          - qcom,scm-msm8994
+          - qcom,scm-msm8996
+          - qcom,scm-msm8998
+          - qcom,scm-sc7180
+          - qcom,scm-sc7280
+          - qcom,scm-sc8280xp
+          - qcom,scm-sdm845
+          - qcom,scm-sdx55
+          - qcom,scm-sdx65
+          - qcom,scm-sm6115
+          - qcom,scm-sm6125
+          - qcom,scm-sm6350
+          - qcom,scm-sm8150
+          - qcom,scm-sm8250
+          - qcom,scm-sm8350
+          - qcom,scm-sm8450
+          - qcom,scm-qcs404
+      - const: qcom,scm
+
+  clocks:
+    minItems: 1
+    maxItems: 3
+
+  clock-names:
+    minItems: 1
+    maxItems: 3
+
+  interconnects:
+    maxItems: 1
+
+  interconnect-names:
+    maxItems: 1
+
+  '#reset-cells':
+    const: 1
+
+  qcom,dload-mode:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+    items:
+      - items:
+          - description: phandle to TCSR hardware block
+          - description: offset of the download mode control register
+    description: TCSR hardware block
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - qcom,scm-apq8064
+              - qcom,scm-msm8660
+              - qcom,scm-msm8960
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: core
+
+        clocks:
+          maxItems: 1
+
+      required:
+        - clocks
+        - clock-names
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - qcom,scm-apq8084
+              - qcom,scm-mdm9607
+              - qcom,scm-msm8916
+              - qcom,scm-msm8953
+              - qcom,scm-msm8974
+              - qcom,scm-msm8976
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: core
+            - const: bus
+            - const: iface
+
+        clocks:
+          minItems: 3
+          maxItems: 3
+
+      required:
+        - clocks
+        - clock-names
+
+required:
+  - compatible
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/qcom,gcc-msm8916.h>
+
+    firmware {
+        scm {
+            compatible = "qcom,scm-msm8916", "qcom,scm";
+            clocks = <&gcc GCC_CRYPTO_CLK>,
+                     <&gcc GCC_CRYPTO_AXI_CLK>,
+                     <&gcc GCC_CRYPTO_AHB_CLK>;
+            clock-names = "core", "bus", "iface";
+        };
+    };

Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml

View file

diff --git a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
index c2e697f..0ac5256 100644
--- a/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
+++ b/Documentation/devicetree/bindings/interconnect/qcom,msm8998-bwmon.yaml
@@ -24,9 +24,12 @@ properties:
     oneOf:
       - items:
           - enum:
+              - qcom,sc7280-bwmon
               - qcom,sdm845-bwmon
           - const: qcom,msm8998-bwmon
       - const: qcom,msm8998-bwmon       # BWMON v4
+      - const: qcom,sc7280-llcc-bwmon   # BWMON v5
+      - const: qcom,sdm845-llcc-bwmon   # BWMON v5
 
   interconnects:
     maxItems: 1

Documentation/devicetree/bindings/media/exynos5-gsc.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/media/exynos5-gsc.txt b/Documentation/devicetree/bindings/media/exynos5-gsc.txt
deleted file mode 100644
index 1872688..0000000
--- a/Documentation/devicetree/bindings/media/exynos5-gsc.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-* Samsung Exynos5 G-Scaler device
-
-G-Scaler is used for scaling and color space conversion on Exynos5 SoCs.
-
-Required properties:
-- compatible: should be one of
-	      "samsung,exynos5250-gsc"
-	      "samsung,exynos5420-gsc"
-	      "samsung,exynos5433-gsc"
-	      "samsung,exynos5-gsc" (deprecated)
-- reg: should contain G-Scaler physical address location and length.
-- interrupts: should contain G-Scaler interrupt number
-
-Optional properties:
-- samsung,sysreg: handle to syscon used to control the system registers to
-  set writeback input and destination
-
-Example:
-
-gsc_0:  gsc@13e00000 {
-	compatible = "samsung,exynos5250-gsc";
-	reg = <0x13e00000 0x1000>;
-	interrupts = <0 85 0>;
-};
-
-Aliases:
-Each G-Scaler node should have a numbered alias in the aliases node,
-in the form of gscN, N = 0...3. G-Scaler driver uses these aliases
-to retrieve the device IDs using "of_alias_get_id()" call.
-
-Example:
-
-aliases {
-	gsc0 =&gsc_0;
-	gsc1 =&gsc_1;
-	gsc2 =&gsc_2;
-	gsc3 =&gsc_3;
-};

Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml

View file

diff --git a/Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml b/Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml
new file mode 100644
index 0000000..8783978
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/samsung,exynos5250-gsc.yaml
@@ -0,0 +1,109 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/media/samsung,exynos5250-gsc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Samsung Exynos SoC G-Scaler
+
+maintainers:
+  - Inki Dae <[email protected]>
+  - Krzysztof Kozlowski <[email protected]>
+  - Seung-Woo Kim <[email protected]
+
+description:
+  G-Scaler is used for scaling and color space conversion on Samsung Exynos
+  SoCs.
+
+  Each G-Scaler node should have a numbered alias in the aliases node, in the
+  form of gscN, N = 0...3.
+
+properties:
+  compatible:
+    oneOf:
+      - items:
+          - enum:
+              - samsung,exynos5250-gsc
+              - samsung,exynos5420-gsc
+          - const: samsung,exynos5-gsc
+      - enum:
+          - samsung,exynos5433-gsc
+      - const: samsung,exynos5-gsc
+        deprecated: True
+
+  clocks:
+    minItems: 1
+    maxItems: 5
+
+  clock-names:
+    minItems: 1
+    maxItems: 5
+
+  interrupts:
+    maxItems: 1
+
+  iommus:
+    maxItems: 1
+
+  power-domains:
+    maxItems: 1
+
+  reg:
+    maxItems: 1
+
+  samsung,sysreg:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description:
+      Syscon used to control the system registers to set writeback input and destination.
+
+required:
+  - compatible
+  - clocks
+  - clock-names
+  - interrupts
+  - reg
+
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - samsung,exynos5-gsc
+              - samsung,exynos5250-gsc
+              - samsung,exynos5420-gsc
+    then:
+      properties:
+        clocks:
+          maxItems: 1
+        clock-names:
+          items:
+            - const: gscl
+    else:
+      properties:
+        clocks:
+          minItems: 5
+        clock-names:
+          items:
+            - const: pclk
+            - const: aclk
+            - const: aclk_xiu
+            - const: aclk_gsclbend
+            - const: gsd
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/exynos5250.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    video-scaler@13e00000 {
+        compatible = "samsung,exynos5250-gsc", "samsung,exynos5-gsc";
+        reg = <0x13e00000 0x1000>;
+        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+        power-domains = <&pd_gsc>;
+        clocks = <&clock CLK_GSCL0>;
+        clock-names = "gscl";
+        iommus = <&sysmmu_gsc0>;
+    };

Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml

View file

diff --git a/Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml b/Documentation/devicetree/bindings/memory-controllers/brcm,brcmstb-memc-ddr.yaml

This diff is incomplete. Download the complete patch.