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

Merge tag 'devicetree-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull devicetree updates from Rob Herring:
 "DT core:

   - Cleanup of the reserved memory code to keep CMA specifics in CMA
     code

   - Add and convert several users to new of_machine_get_match() helper

   - Validate nul termination in string properties

   - Update dtc to upstream v1.7.2-69-g53373d135579

   - Limit matching reserved memory devices to /reserved-memory nodes

   - Fix some UAF in unittests

   - Remove Baikal SoC bus driver

   - Fix false DT_SPLIT_BINDING_PATCH checkpatch warning

   - Allow fw_devlink device-tree on x86

   - Fix kerneldoc return description for of_property_count_elems_of_size()

  DT bindings:

   - Add fsl,imx25-aips, fsl,imx25-tcq, qcom,eliza-pdc,
     qcom,eliza-spmi-pmic-arb, qcom,hawi-imem, qcom,milos-imem,
     qcom,hawi-pdc, and lg,sw49410 bindings

   - Convert arm,vexpress-scc to DT schema

   - Deprecate Qualcomm generic CPU compatibles. Add Apple M3 CPU cores.

   - Move some dual-link display panels to the dual-link schema

   - Drop mux controller node name constraints

   - Remove Baikal SoC bus bindings

   - Fix a false warning in the thermal trip node binding"

* tag 'devicetree-for-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (39 commits)
  dt-bindings: display: panel: panel-simple: Add lg,sw49410 compatible
  dt-bindings: display: ti, am65x-dss: Fix AM62L DSS reg and clock constraints
  dt-bindings: display: simple: Move Innolux G156HCE-L01 panel to dual-link
  dt-bindings: display: simple: Move AUO 21.5" FHD to dual-link
  dt-bindings: thermal: Fix false warning with 'phandle' in trips nodes
  of: unittest: fix use-after-free in testdrv_probe()
  of: unittest: fix use-after-free in of_unittest_changeset()
  dt-bindings: qcom,pdc: document the Hawi Power Domain Controller
  dt-bindings: ARM: arm,vexpress-scc: convert to DT schema
  drivers/of: fdt: validate flat DT string properties before string use
  drivers/of: fdt: validate stdout-path properties before parsing them
  dt-bindings: sram: Document qcom,hawi-imem compatible
  dt-bindings: sram: Allow multiple-word prefixes to sram subnode
  dt-bindings: sram: Document qcom,milos-imem
  scripts/dtc: Update to upstream version v1.7.2-69-g53373d135579
  of: property: Allow fw_devlink device-tree on x86
  dt-bindings: arm: cpus: Add Apple M3 CPU core compatibles
  dt-bindings: display: lt8912b: Drop redundant endpoint properties
  dt-bindings: opp-v2: Fix example 3 CPU reg value
  dt-bindings: connector: add pd-disable dependency
  ...
parents 430cc9f4 a74c2e55

Documentation/devicetree/bindings/arm/arm,vexpress-scc.yaml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/arm,vexpress-scc.yaml#

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



title: ARM Versatile Express Serial Configuration Controller



maintainers:

  - Liviu Dudau <liviu.dudau@arm.com>

  - Sudeep Holla <sudeep.holla@arm.com>



description: |

  Test chips for ARM Versatile Express platform implement SCC (Serial

  Configuration Controller) interface, used to set initial conditions

  for the test chip.



  In some cases its registers are also mapped in normal address space

  and can be used to obtain runtime information about the chip internals

  (like silicon temperature sensors) and as interface to other subsystems

  like platform configuration control and power management.



properties:

  compatible:

    items:

      - enum:

          - arm,vexpress-scc,v2p-ca15_a7

      - const: arm,vexpress-scc



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



required:

  - compatible



additionalProperties: false



examples:

  - |

    bus {

        #address-cells = <2>;

        #size-cells = <2>;



        scc@7fff0000 {

            compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";

            reg = <0 0x7fff0000 0 0x1000>;

            interrupts = <0 95 4>;

        };

    };

...

Documentation/devicetree/bindings/arm/cpus.yaml

+156 −150
Original line number Diff line number Diff line
@@ -79,17 +79,20 @@ properties: 
      All other bits in the reg cells must be set to 0.



  compatible:

    enum:

    oneOf:

      - enum:

          - apm,potenza

          - apm,strega

          - apple,avalanche

          - apple,blizzard

          - apple,cyclone

          - apple,everest

          - apple,firestorm

          - apple,hurricane-zephyr

          - apple,icestorm

          - apple,mistral

          - apple,monsoon

          - apple,sawtooth

          - apple,twister

          - apple,typhoon

          - arm,arm710t
@@ -200,7 +203,6 @@ properties: 
          - nvidia,tegra186-denver

          - nvidia,tegra194-carmel

          - qcom,krait

      - qcom,kryo

          - qcom,kryo240

          - qcom,kryo250

          - qcom,kryo260
@@ -217,7 +219,6 @@ properties: 
          - qcom,kryo670

          - qcom,kryo685

          - qcom,kryo780

      - qcom,oryon

          - qcom,oryon-1-1

          - qcom,oryon-1-2

          - qcom,oryon-1-3
@@ -229,6 +230,11 @@ properties: 
          - samsung,mongoose-m2

          - samsung,mongoose-m3

          - samsung,mongoose-m5

      - enum:

          - qcom,kryo

          - qcom,oryon

        # Too generic, do not use in new code

        deprecated: true



  enable-method:

    $ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/arm/freescale/fsl,imx51-m4if.yaml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ properties: 
  compatible:

    oneOf:

      - enum:

          - fsl,imx25-aips

          - fsl,imx51-m4if

          - fsl,imx51-tigerp

          - fsl,imx51-aipstz

Documentation/devicetree/bindings/arm/vexpress-scc.txt

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
ARM Versatile Express Serial Configuration Controller

-----------------------------------------------------



Test chips for ARM Versatile Express platform implement SCC (Serial

Configuration Controller) interface, used to set initial conditions

for the test chip.



In some cases its registers are also mapped in normal address space

and can be used to obtain runtime information about the chip internals

(like silicon temperature sensors) and as interface to other subsystems

like platform configuration control and power management.



Required properties:



- compatible value: "arm,vexpress-scc,<model>", "arm,vexpress-scc";

		    where <model> is the full tile model name (as used

		    in the tile's Technical Reference Manual),

		    eg. for Coretile Express A15x2 A7x3 (V2P-CA15_A7):

	compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";



Optional properties:



- reg: when the SCC is memory mapped, physical address and size of the

       registers window

- interrupts: when the SCC can generate a system-level interrupt



Example:



	scc@7fff0000 {

		compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";

		reg = <0 0x7fff0000 0 0x1000>;

		interrupts = <0 95 4>;

	};

Documentation/devicetree/bindings/bus/baikal,bt1-apb.yaml

deleted100644 → 0
+0 −90
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2020 BAIKAL ELECTRONICS, JSC

%YAML 1.2

---

$id: http://devicetree.org/schemas/bus/baikal,bt1-apb.yaml#

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



title: Baikal-T1 APB-bus



maintainers:

  - Serge Semin <fancer.lancer@gmail.com>



description: |

  Baikal-T1 CPU or DMAC MMIO requests are handled by the AMBA 3 AXI Interconnect

  which routes them to the AXI-APB bridge. This interface is a single master

  multiple slaves bus in turn serializing IO accesses and routing them to the

  addressed APB slave devices. In case of any APB protocol collisions, slave

  device not responding on timeout an IRQ is raised with an erroneous address

  reported to the APB terminator (APB Errors Handler Block).



allOf:

  - $ref: /schemas/simple-bus.yaml#



properties:

  compatible:

    contains:

      const: baikal,bt1-apb



  reg:

    items:

      - description: APB EHB MMIO registers

      - description: APB MMIO region with no any device mapped



  reg-names:

    items:

      - const: ehb

      - const: nodev



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: APB reference clock



  clock-names:

    items:

      - const: pclk



  resets:

    items:

      - description: APB domain reset line



  reset-names:

    items:

      - const: prst



unevaluatedProperties: false



required:

  - compatible

  - reg

  - reg-names

  - interrupts

  - clocks

  - clock-names



examples:

  - |

    #include <dt-bindings/interrupt-controller/mips-gic.h>



    bus@1f059000 {

      compatible = "baikal,bt1-apb", "simple-bus";

      reg = <0x1f059000 0x1000>,

            <0x1d000000 0x2040000>;

      reg-names = "ehb", "nodev";

      #address-cells = <1>;

      #size-cells = <1>;



      ranges;



      interrupts = <GIC_SHARED 16 IRQ_TYPE_LEVEL_HIGH>;



      clocks = <&ccu_sys 1>;

      clock-names = "pclk";



      resets = <&ccu_sys 1>;

      reset-names = "prst";

    };

...