Unverified Commit 748d3c3c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-drivers-for-v6.4' of... 

Merge tag 'amlogic-drivers-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers

Amlogic Drivers changes for v6.4:
- convert clk-measure.txt to dt-schema
- meson-pwrc: Use dev_err_probe()
- meson_sm: populate platform devices from sm device tree data
- dt-bindings: Drop unneeded quotes

* tag 'amlogic-drivers-for-v6.4' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  dt-bindings: soc: amlogic: Drop unneeded quotes
  firmware: meson_sm: populate platform devices from sm device tree data
  soc: amlogic: meson-pwrc: Use dev_err_probe()
  dt-bindings: soc: amlogic: convert clk-measure.txt to dt-schema

Link: https://lore.kernel.org/r/aebef87f-e0a3-17dd-12b7-7231ca6b0923@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0d3becec 1b61fdfd

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#"

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

$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#

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



title: Amlogic Meson Firmware registers Interface

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-mx-secbus2.yaml

+2 −2
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/amlogic/amlogic,meson-mx-secbus2.yaml#"

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

$id: http://devicetree.org/schemas/arm/amlogic/amlogic,meson-mx-secbus2.yaml#

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



title: Amlogic Meson8/Meson8b/Meson8m2 SECBUS2 register interface

Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/soc/amlogic/amlogic,canvas.yaml#"

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

$id: http://devicetree.org/schemas/soc/amlogic/amlogic,canvas.yaml#

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



title: Amlogic Canvas Video Lookup Table

Documentation/devicetree/bindings/soc/amlogic/amlogic,meson-gx-clk-measure.yaml

0 → 100644
+40 −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/soc/amlogic/amlogic,meson-gx-clk-measure.yaml#

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



title: Amlogic Internal Clock Measurer



description:

  The Amlogic SoCs contains an IP to measure the internal clocks.

  The precision is multiple of MHz, useful to debug the clock states.



maintainers:

  - Neil Armstrong <neil.armstrong@linaro.org>



properties:

  compatible:

    enum:

      - amlogic,meson-gx-clk-measure

      - amlogic,meson8-clk-measure

      - amlogic,meson8b-clk-measure

      - amlogic,meson-axg-clk-measure

      - amlogic,meson-g12a-clk-measure

      - amlogic,meson-sm1-clk-measure



  reg:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    clock-measure@8758 {

        compatible = "amlogic,meson-gx-clk-measure";

        reg = <0x8758 0x10>;

    };

Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
Amlogic Internal Clock Measurer

===============================



The Amlogic SoCs contains an IP to measure the internal clocks.

The precision is multiple of MHz, useful to debug the clock states.



Required properties:

- compatible: Shall contain one of the following :

			"amlogic,meson-gx-clk-measure" for GX SoCs

			"amlogic,meson8-clk-measure" for Meson8 SoCs

			"amlogic,meson8b-clk-measure" for Meson8b SoCs

			"amlogic,meson-axg-clk-measure" for AXG SoCs

			"amlogic,meson-g12a-clk-measure" for G12a SoCs

			"amlogic,meson-sm1-clk-measure" for SM1 SoCs

- reg: base address and size of the Clock Measurer register space.



Example:

	clock-measure@8758 {

		compatible = "amlogic,meson-gx-clk-measure";

		reg = <0x0 0x8758 0x0 0x10>;

	};