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

Merge tag 'amlogic-dt64' of... 

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

arm64: dts: Amlogic updates for v5.1
- new board: G12a-based x96 max
- G12a: add peripheral clock controller and clock measure support
- s400: fix SD/eMMC max rate issues
- s400: audio: add sp/dif in support
- GX: support simplefb

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  arm64: dts: meson: add g12a x96 max board
  dt-bindings: arm: amlogic: add amediatech x96-max bindings
  arm64: dts: meson: g12a: add peripheral clock controller
  arm64: dts: meson: g12a: add clk measure support
  arm64: dts: meson: axg: add clk measure support
  arm64: dts: meson: fix g12a buses
  arm64: dts: meson-axg: add efuse device
  arm64: dts: meson: s400: fix emmc maximum rate
  arm64: dts: meson: s400: enable sdr104 on sdio
  arm64: dts: meson-gx: add support for simplefb
  dt-bindings: meson: add specific simplefb bindings
  arm64: dts: meson-gx: Add canvas provider node to the vpu
  arm64: dts: meson-axg: s400: add spdifin to the sound card
  arm64: dts: meson-axg: s400: add spdif-dir codec
  arm64: dts: meson-axg: add spdifin

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 260bcbb3 d3aa4ce8

Documentation/devicetree/bindings/arm/amlogic.txt

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ Board compatible values (alphabetically, grouped by SoC): 
  - "amlogic,s400" (Meson axg a113d)



  - "amlogic,u200" (Meson g12a s905d2)

  - "amediatech,x96-max" (Meson g12a s905x2)



Amlogic Meson Firmware registers Interface

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

Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Meson specific Simple Framebuffer bindings



This binding documents meson specific extensions to the simple-framebuffer

bindings. The meson simplefb u-boot code relies on the devicetree containing

pre-populated simplefb nodes.



These extensions are intended so that u-boot can select the right node based

on which pipeline is being used. As such they are solely intended for

firmware / bootloader use, and the OS should ignore them.



Required properties:

- compatible: "amlogic,simple-framebuffer", "simple-framebuffer"

- amlogic,pipeline, one of:

  "vpu-cvbs"

  "vpu-hdmi"



Example:



chosen {

	#address-cells = <2>;

	#size-cells = <2>;

	ranges;



	simplefb_hdmi: framebuffer-hdmi {

		compatible = "amlogic,simple-framebuffer",

			     "simple-framebuffer";

		amlogic,pipeline = "vpu-hdmi";

		clocks = <&clkc CLKID_HDMI_PCLK>,

			 <&clkc CLKID_CLK81>,

			 <&clkc CLKID_GCLK_VENCI_INT0>;

		power-domains = <&pwrc_vpu>;

	};

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ amarula Amarula Solutions 
amazon	Amazon.com, Inc.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

amd	Advanced Micro Devices (AMD), Inc.

amediatech	Shenzhen Amediatech Technology Co., Ltd

amlogic	Amlogic, Inc.

ampire	Ampire Co., Ltd.

ams	AMS AG

arch/arm64/boot/dts/amlogic/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

+27 −3
Original line number Diff line number Diff line
@@ -95,6 +95,13 @@ 
		sound-name-prefix = "MIC";

	};



	spdif_dir: audio-codec-4 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dir";

		status = "okay";

		sound-name-prefix = "DIR";

	};



	emmc_pwrseq: emmc-pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
@@ -249,6 +256,9 @@ 
				"TODDR_A IN 2", "TDMIN_C OUT",

				"TODDR_B IN 2", "TDMIN_C OUT",

				"TODDR_C IN 2", "TDMIN_C OUT",

				"TODDR_A IN 3", "SPDIFIN Capture",

				"TODDR_B IN 3", "SPDIFIN Capture",

				"TODDR_C IN 3", "SPDIFIN Capture",

				"TODDR_A IN 4", "PDM Capture",

				"TODDR_B IN 4", "PDM Capture",

				"TODDR_C IN 4", "PDM Capture",
@@ -326,6 +336,14 @@ 
		};



		dai-link-8 {

			sound-dai = <&spdifin>;



			codec {

				sound-dai = <&spdif_dir>;

			};

		};



		dai-link-9 {

			sound-dai = <&pdm>;



			codec {
@@ -446,7 +464,8 @@ 


	bus-width = <4>;

	cap-sd-highspeed;

	max-frequency = <100000000>;

	sd-uhs-sdr104;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;
@@ -469,9 +488,8 @@ 
	pinctrl-names = "default", "clk-gate";



	bus-width = <8>;

	cap-sd-highspeed;

	cap-mmc-highspeed;

	max-frequency = <180000000>;

	max-frequency = <200000000>;

	non-removable;

	disable-wp;

	mmc-ddr-1_8v;
@@ -483,6 +501,12 @@ 
	vqmmc-supply = <&vddio_boot>;

};



&spdifin {

	pinctrl-0 = <&spdif_in_a19_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&spdifout {

	pinctrl-0 = <&spdif_out_a20_pins>;

	pinctrl-names = "default";

CRA Git | Maintained and supported by SUSTech CRA and CCSE