Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f02bd65a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-2.1' of... 

Merge tag 'amlogic-dt64-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: Amlogic updates for v5.4 (round 2)
- new board: Khadas VIM3L (SM1/S905D3 SoC)
- support power domains on G12[AB] and SM1 SoCs
- DT binding fixups based on YAML schema
- add a bunch of remote control keymap
- enable DVFS on SM1/SEI610 board

* tag 'amlogic-dt64-2.1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (44 commits)
  arm64: dts: meson-sm1-sei610: add stdout-path property back
  arm64: dts: meson-sm1-sei610: enable DVFS
  arm64: dts: khadas-vim3: add support for the SM1 based VIM3L
  dt-bindings: arm: amlogic: add Amlogic SM1 based Khadas VIM3L bindings
  arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi
  arm64: dts: meson: g12a: add reset to tdm formatters
  arm64: dts: meson: g12a: audio clock controller provides resets
  arm64: dts: meson-sm1-sei610: enable DVFS
  arm64: dts: meson-gxm-khadas-vim2: use rc-khadas keymap
  arm64: dts: meson-gxl-s905w-tx3-mini: add rc-tx3mini keymap
  arm64: dts: meson-gxl-s905x-khadas-vim: use rc-khadas keymap
  arm64: dts: meson-gxbb-wetek-play2: add rc-wetek-play2 keymap
  arm64: dts: meson-gxbb-wetek-hub: add rc-wetek-hub keymap
  arm64: dts: meson-g12a-x96-max: add rc-x96max keymap
  arm64: dts: meson-g12b-odroid-n2: add rc-odroid keymap
  arm64: dts: meson-sm1-sei610: add USB support
  arm64: dts: meson-sm1-sei610: add HDMI display support
  arm64: dts: meson-g12: add Everything-Else power domain controller
  arm64: dts: meson: fix boards regulators states format
  arm64: dts: meson-gxbb-p201: fix snps, reset-delays-us format
  ...

Link: https://patchwork.kernel.org/patch/11122331/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3829f99 b09d116b

Documentation/devicetree/bindings/arm/amlogic.yaml

+2 −1
Original line number Diff line number Diff line
@@ -150,9 +150,10 @@ properties: 
          - const: amlogic,s922x

          - const: amlogic,g12b



      - description: Boards with the Amlogic Meson SM1 S905X3 SoC

      - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC

        items:

          - enum:

              - seirobotics,sei610

              - khadas,vim3l

          - const: amlogic,sm1

...

Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ Required Properties: 
				       components.

- resets	: phandle of the internal reset line

- #clock-cells	: should be 1.

- #reset-cells  : should be 1 on the g12a (and following) soc family



Each clock is assigned an identifier and client nodes can use this identifier

to specify the clock which they consume. All available clocks are defined as

Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required Properties: 
		"amlogic,axg-clkc" for AXG SoC.

		"amlogic,g12a-clkc" for G12A SoC.

		"amlogic,g12b-clkc" for G12B SoC.

		"amlogic,sm1-clkc" for SM1 SoC.

- clocks : list of clock phandle, one for each entry clock-names.

- clock-names : should contain the following:

  * "xtal": the platform xtal

Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml

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

# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/power/amlogic,meson-ee-pwrc.yaml#"

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



title: Amlogic Meson Everything-Else Power Domains



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>



description: |+

  The Everything-Else Power Domains node should be the child of a syscon

  node with the required property:



  - compatible: Should be the following:

                "amlogic,meson-gx-hhi-sysctrl", "simple-mfd", "syscon"



  Refer to the the bindings described in

  Documentation/devicetree/bindings/mfd/syscon.txt



properties:

  compatible:

    enum:

      - amlogic,meson-g12a-pwrc

      - amlogic,meson-sm1-pwrc



  clocks:

    minItems: 2



  clock-names:

    items:

      - const: vpu

      - const: vapb



  resets:

    minItems: 11



  reset-names:

    items:

      - const: viu

      - const: venc

      - const: vcbus

      - const: bt656

      - const: rdma

      - const: venci

      - const: vencp

      - const: vdac

      - const: vdi6

      - const: vencl

      - const: vid_lock



  "#power-domain-cells":

    const: 1



  amlogic,ao-sysctrl:

    description: phandle to the AO sysctrl node

    allOf:

      - $ref: /schemas/types.yaml#/definitions/phandle



required:

  - compatible

  - clocks

  - clock-names

  - resets

  - reset-names

  - "#power-domain-cells"

  - amlogic,ao-sysctrl



examples:

  - |

    pwrc: power-controller {

          compatible = "amlogic,meson-sm1-pwrc";

          #power-domain-cells = <1>;

          amlogic,ao-sysctrl = <&rti>;

          resets = <&reset_viu>,

                   <&reset_venc>,

                   <&reset_vcbus>,

                   <&reset_bt656>,

                   <&reset_rdma>,

                   <&reset_venci>,

                   <&reset_vencp>,

                   <&reset_vdac>,

                   <&reset_vdi6>,

                   <&reset_vencl>,

                   <&reset_vid_lock>;

          reset-names = "viu", "venc", "vcbus", "bt656",

                        "rdma", "venci", "vencp", "vdac",

                        "vdi6", "vencl", "vid_lock";

          clocks = <&clk_vpu>, <&clk_vapb>;

          clock-names = "vpu", "vapb";

    };

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

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Required properties: 
			"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: