Commit 79e3faa7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

arm64: dts: amlogic updates for v5.12
- new board: Hardkernel ODROID-HC4 (SoC: SM1)
- new board: Beelink GS-King-X (SoC: S922X)
- shorten shorten audio card names for alsa compatibility
- misc cleanups & fixes

* tag 'amlogic-dt64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add initial device-tree for ODROID-HC4
  dt-bindings: arm: amlogic: add ODROID-HC4 bindings
  arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi
  arm64: dts: meson: sort Amlogic dtb Makefile
  dt-bindings: arm: amlogic: sort SM1 bindings
  arm64: dts: meson: fix broken wifi node for Khadas VIM3L
  arm64: dts: meson: add i2c3/rtc nodes and rtc aliases to ODROID-N2 dtsi
  ARM: dts: meson: add the AO ARC remote processor
  dt-bindings: Amlogic: add the documentation for the SECBUS2 registers
  dt-bindings: sram: Add compatible strings for the Meson AO ARC SRAM
  arm64: dts: meson: shorten audio card names for alsa compatibility
  arm64: dts: meson: add initial Beelink GS-King-X device-tree
  dt-bindings: arm: amlogic: add support for the Beelink GS-King-X
  arm64: dts: meson: Fix schema warnings for pwm-leds
  arm64: dts: meson: vim3: whitespace fixups
  arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
  Revert "arm64: dts: amlogic: add missing ethernet reset ID"
  arm64: dts: amlogic: meson-g12: Set FL-adj property value

Link: https://lore.kernel.org/soc/7heehq7ag3.fsf@baylibre.com/


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 02bb4cb4 33b14f66

Documentation/devicetree/bindings/arm/amlogic.yaml

+4 −2
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ properties: 
      - description: Boards with the Amlogic Meson G12B S922X SoC

        items:

          - enum:

              - azw,gsking-x

              - azw,gtking

              - azw,gtking-pro

              - hardkernel,odroid-n2
@@ -163,9 +164,10 @@ properties: 
      - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC

        items:

          - enum:

              - seirobotics,sei610

              - khadas,vim3l

              - hardkernel,odroid-c4

              - hardkernel,odroid-hc4

              - khadas,vim3l

              - seirobotics,sei610

          - const: amlogic,sm1



      - description: Boards with the Amlogic Meson A1 A113L SoC

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

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

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



title: Amlogic Meson8/Meson8b/Meson8m2 SECBUS2 register interface



maintainers:

  - Martin Blumenstingl <martin.blumenstingl@googlemail.com>



description: |

  The Meson8/Meson8b/Meson8m2 SoCs have a register bank called SECBUS2 which

  contains registers for various IP blocks such as pin-controller bits for

  the BSD_EN and TEST_N GPIOs as well as some AO ARC core control bits.

  The registers can be accessed directly when not running in "secure mode".

  When "secure mode" is enabled then these registers have to be accessed

  through secure monitor calls.



properties:

  compatible:

    items:

      - enum:

          - amlogic,meson8-secbus2

          - amlogic,meson8b-secbus2

      - const: syscon



  reg:

    maxItems: 1



required:

  - compatible

  - reg



additionalProperties: false



examples:

  - |

    secbus2: system-controller@4000 {

      compatible = "amlogic,meson8-secbus2", "syscon";

      reg = <0x4000 0x2000>;

    };

Documentation/devicetree/bindings/sram/sram.yaml

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ patternProperties: 
            - allwinner,sun4i-a10-sram-d

            - allwinner,sun9i-a80-smp-sram

            - allwinner,sun50i-a64-sram-c

            - amlogic,meson8-ao-arc-sram

            - amlogic,meson8b-ao-arc-sram

            - amlogic,meson8-smp-sram

            - amlogic,meson8b-smp-sram

            - amlogic,meson-gxbb-scp-shmem

arch/arm/boot/dts/meson.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -200,6 +200,13 @@ aobus: aobus@c8100000 { 
			#size-cells = <1>;

			ranges = <0x0 0xc8100000 0x100000>;



			ao_arc_rproc: remoteproc@1c {

				compatible= "amlogic,meson-mx-ao-arc";

				reg = <0x1c 0x8>, <0x38 0x8>;

				reg-names = "remap", "cpu";

				status = "disabled";

			};



			ir_receiver: ir-receiver@480 {

				compatible= "amlogic,meson6-ir";

				reg = <0x480 0x20>;

arch/arm/boot/dts/meson8.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -369,6 +369,14 @@ mux { 
	};

};



&ao_arc_rproc {

	compatible= "amlogic,meson8-ao-arc", "amlogic,meson-mx-ao-arc";

	amlogic,secbus2 = <&secbus2>;

	sram = <&ao_arc_sram>;

	resets = <&reset RESET_MEDIA_CPU>;

	clocks = <&clkc CLKID_AO_MEDIA_CPU>;

};



&cbus {

	reset: reset-controller@4404 {

		compatible = "amlogic,meson8b-reset";
@@ -496,6 +504,12 @@ mux { 
};



&ahb_sram {

	ao_arc_sram: ao-arc-sram@0 {

		compatible = "amlogic,meson8-ao-arc-sram";

		reg = <0x0 0x8000>;

		pool;

	};



	smp-sram@1ff80 {

		compatible = "amlogic,meson8-smp-sram";

		reg = <0x1ff80 0x8>;
@@ -631,6 +645,13 @@ &sdhc { 
	clock-names = "clkin0", "clkin1", "clkin2", "clkin3", "pclk";

};



&secbus {

	secbus2: system-controller@4000 {

		compatible = "amlogic,meson8-secbus2", "syscon";

		reg = <0x4000 0x2000>;

	};

};



&sdio {

	compatible = "amlogic,meson8-sdio", "amlogic,meson-mx-sdio";

	clocks = <&clkc CLKID_SDIO>, <&clkc CLKID_CLK81>;