From: Linus Torvalds Date: Thu, 27 Apr 2023 16:23:57 +0000 (-0700) Subject: Merge tag 'devicetree-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v6.4-rc1~128 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d42b1c47570eb2ed818dc3fe94b2678124af109d;p=linux-block.git Merge tag 'devicetree-for-6.4-1' of git://git./linux/kernel/git/robh/linux Pull devicetree updates from Rob Herring: "Bindings: - Convert Qcom IOMMU, Amlogic timer, Freescale sec-v4.0, Toshiba TC358764 display bridge, Parade PS8622 display bridge, and Xilinx FPGA bindings to DT schema format - Add qdu1000 and sa8775p SoC support to Qcom PDC interrupt controller - Add MediaTek MT8365 UART and SYSIRQ bindings - Add Arm Cortex-A78C and X1C core compatibles - Add vendor prefix for Novatek - Remove bindings for stih415, sti416, stid127 platforms - Drop uneeded quotes in schema files. This is preparation for yamllint checking quoting for us. - Add missing (unevaluated|additional)Properties constraints on child node schemas - Clean-up schema comments formatting - Fix I2C and SPI node bus names in schema examples - Clean-up some display compatibles schema syntax - Fix incorrect references to lvds.yaml - Gather all cache controller bindings in a common directory DT core: - Convert unittest to new void .remove platform device hook - kerneldoc fixes for DT address of_pci_range_to_resource/ of_address_to_resource functions" * tag 'devicetree-for-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (46 commits) dt-bindings: rng: Drop unneeded quotes dt-bindings: arm/soc: mediatek: Drop unneeded quotes dt-bindings: soc: qcom: Drop unneeded quotes dt-bindings: i2c: samsung: Fix 'deprecated' value dt-bindings: display: Fix lvds.yaml references dt-bindings: display: simplify compatibles syntax dt-bindings: display: mediatek: simplify compatibles syntax dt-bindings: drm/bridge: ti-sn65dsi86: Fix the video-interfaces.yaml references dt-bindings: timer: Drop unneeded quotes dt-bindings: interrupt-controller: qcom,pdc: document qcom,qdu1000-pdc dt-bindings: interrupt-controller: qcom-pdc: add compatible for sa8775p dt-bindings: reset: remove stih415/stih416 reset dt-bindings: net: dwmac: sti: remove stih415/sti416/stid127 dt-bindings: irqchip: sti: remove stih415/stih416 and stid127 dt-bindings: iommu: Convert QCOM IOMMU to YAML dt-bindings: irqchip: ti,sci-inta: Add optional power-domains property dt-bindings: Add missing (unevaluated|additional)Properties on child node schemas of: address: Reshuffle to remove forward declarations of: address: Fix documented return value of of_pci_range_to_resource() of: address: Document return value of of_address_to_resource() ... --- d42b1c47570eb2ed818dc3fe94b2678124af109d diff --cc Documentation/devicetree/bindings/cache/qcom,llcc.yaml index 000000000000,14eb5175dac4..d8b91944180a mode 000000,100644..100644 --- a/Documentation/devicetree/bindings/cache/qcom,llcc.yaml +++ b/Documentation/devicetree/bindings/cache/qcom,llcc.yaml @@@ -1,0 -1,65 +1,168 @@@ + # SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause) + %YAML 1.2 + --- + $id: http://devicetree.org/schemas/cache/qcom,llcc.yaml# + $schema: http://devicetree.org/meta-schemas/core.yaml# + + title: Last Level Cache Controller + + maintainers: - - Rishabh Bhatnagar - - Sai Prakash Ranjan ++ - Bjorn Andersson + + description: | + LLCC (Last Level Cache Controller) provides last level of cache memory in SoC, + that can be shared by multiple clients. Clients here are different cores in the + SoC, the idea is to minimize the local caches at the clients and migrate to + common pool of memory. Cache memory is divided into partitions called slices + which are assigned to clients. Clients can query the slice details, activate + and deactivate them. + + properties: + compatible: + enum: + - qcom,sc7180-llcc + - qcom,sc7280-llcc + - qcom,sc8180x-llcc + - qcom,sc8280xp-llcc + - qcom,sdm845-llcc + - qcom,sm6350-llcc ++ - qcom,sm7150-llcc + - qcom,sm8150-llcc + - qcom,sm8250-llcc + - qcom,sm8350-llcc + - qcom,sm8450-llcc + - qcom,sm8550-llcc + + reg: - items: - - description: LLCC base register region - - description: LLCC broadcast base register region ++ minItems: 2 ++ maxItems: 9 + + reg-names: - items: - - const: llcc_base - - const: llcc_broadcast_base ++ minItems: 2 ++ maxItems: 9 + + interrupts: + maxItems: 1 + + required: + - compatible + - reg + - reg-names + ++allOf: ++ - if: ++ properties: ++ compatible: ++ contains: ++ enum: ++ - qcom,sc7180-llcc ++ - qcom,sm6350-llcc ++ then: ++ properties: ++ reg: ++ items: ++ - description: LLCC0 base register region ++ - description: LLCC broadcast base register region ++ reg-names: ++ items: ++ - const: llcc0_base ++ - const: llcc_broadcast_base ++ ++ - if: ++ properties: ++ compatible: ++ contains: ++ enum: ++ - qcom,sc7280-llcc ++ then: ++ properties: ++ reg: ++ items: ++ - description: LLCC0 base register region ++ - description: LLCC1 base register region ++ - description: LLCC broadcast base register region ++ reg-names: ++ items: ++ - const: llcc0_base ++ - const: llcc1_base ++ - const: llcc_broadcast_base ++ ++ - if: ++ properties: ++ compatible: ++ contains: ++ enum: ++ - qcom,sc8180x-llcc ++ - qcom,sc8280xp-llcc ++ then: ++ properties: ++ reg: ++ items: ++ - description: LLCC0 base register region ++ - description: LLCC1 base register region ++ - description: LLCC2 base register region ++ - description: LLCC3 base register region ++ - description: LLCC4 base register region ++ - description: LLCC5 base register region ++ - description: LLCC6 base register region ++ - description: LLCC7 base register region ++ - description: LLCC broadcast base register region ++ reg-names: ++ items: ++ - const: llcc0_base ++ - const: llcc1_base ++ - const: llcc2_base ++ - const: llcc3_base ++ - const: llcc4_base ++ - const: llcc5_base ++ - const: llcc6_base ++ - const: llcc7_base ++ - const: llcc_broadcast_base ++ ++ - if: ++ properties: ++ compatible: ++ contains: ++ enum: ++ - qcom,sdm845-llcc ++ - qcom,sm8150-llcc ++ - qcom,sm8250-llcc ++ - qcom,sm8350-llcc ++ - qcom,sm8450-llcc ++ then: ++ properties: ++ reg: ++ items: ++ - description: LLCC0 base register region ++ - description: LLCC1 base register region ++ - description: LLCC2 base register region ++ - description: LLCC3 base register region ++ - description: LLCC broadcast base register region ++ reg-names: ++ items: ++ - const: llcc0_base ++ - const: llcc1_base ++ - const: llcc2_base ++ - const: llcc3_base ++ - const: llcc_broadcast_base ++ + additionalProperties: false + + examples: + - | + #include + - system-cache-controller@1100000 { - compatible = "qcom,sdm845-llcc"; - reg = <0x1100000 0x200000>, <0x1300000 0x50000> ; - reg-names = "llcc_base", "llcc_broadcast_base"; - interrupts = ; ++ soc { ++ #address-cells = <2>; ++ #size-cells = <2>; ++ ++ system-cache-controller@1100000 { ++ compatible = "qcom,sdm845-llcc"; ++ reg = <0 0x01100000 0 0x50000>, <0 0x01180000 0 0x50000>, ++ <0 0x01200000 0 0x50000>, <0 0x01280000 0 0x50000>, ++ <0 0x01300000 0 0x50000>; ++ reg-names = "llcc0_base", "llcc1_base", "llcc2_base", ++ "llcc3_base", "llcc_broadcast_base"; ++ interrupts = ; ++ }; + }; diff --cc Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml index bda86e6857f5,dc22bd522523..8c2a737237f2 --- a/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml +++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,ccorr.yaml @@@ -21,13 -21,11 +21,12 @@@ description: properties: compatible: oneOf: - - items: - - const: mediatek,mt8183-disp-ccorr - - items: - - const: mediatek,mt8192-disp-ccorr + - enum: + - mediatek,mt8183-disp-ccorr + - mediatek,mt8192-disp-ccorr - items: - enum: + - mediatek,mt8186-disp-ccorr - mediatek,mt8188-disp-ccorr - mediatek,mt8195-disp-ccorr - const: mediatek,mt8192-disp-ccorr