Commit f6332990 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64' of... 

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

arm64: Amlogic DT updates for v4.21
Some highlights:
- new boards: Phicomm N1 (S905D), Libretech S805-AC
- fixes for pinmux pad bias, GPIO line names
- AXG: enable SCPI, add secure monitor

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

: (26 commits)
  arm64: dts: meson-gx: Add Internal Clock Measurer node
  arm64: dts: amlogic: Add all CPUs in cooling maps
  arm64: dts: meson: add libretech aml-s805x-ac board
  dt-bindings: arm: amlogic: add libretech aml-s805x-ac bindings
  dt-bindings: arm: amlogic: Add Phicomm N1
  dt-bindings: Add vendor prefix for PHICOMM Co., Ltd.
  arm64: dts: meson-gxl: add support for phicomm n1
  arm64: dts: meson: consistently disable pin bias
  arm64: dts: meson: disable pad bias for mmc pinmuxes
  arm64: dts: meson: remove extra subnode in mmc clk_gate pinmux
  arm64: dts: meson: s400: add bcm bluetooth device
  arm64: dts: meson: p230: disable advertisement EEE for GbE.
  arm64: dts: meson-axg: enable SCPI
  Documentation: bindings: Add missing Amlogic SCPI sensor bindings
  arm64: dts: meson-axg: correct sram shared mem unit-address
  arm64: dts: meson-axg: fix mailbox address
  arm64: dts: meson-gx: Add hdmi_5v regulator as hdmi tx supply
  arm64: dts: meson-axg: add secure monitor
  arm64: dts: meson-axg: s400: add cts-rts to the bluetooth uart
  arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4c433276 5e339a1d

Documentation/devicetree/bindings/arm/amlogic,scpi.txt

+7 −0
Original line number Diff line number Diff line
@@ -17,4 +17,11 @@ Required sub-node properties: 
- compatible : should be "amlogic,meson-gxbb-scp-shmem" for SRAM based shared

		memory on Amlogic GXBB SoC.



Sensor bindings for the sensors based on SCPI Message Protocol

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

SCPI provides an API to access the various sensors on the SoC.



Required properties:

- compatible : should be "amlogic,meson-gxbb-scpi-sensors".



[0] Documentation/devicetree/bindings/arm/arm,scpi.txt

Documentation/devicetree/bindings/arm/amlogic.txt

+2 −0
Original line number Diff line number Diff line
@@ -91,8 +91,10 @@ Board compatible values (alphabetically, grouped by SoC): 


  - "amlogic,p230" (Meson gxl s905d)

  - "amlogic,p231" (Meson gxl s905d)

  - "phicomm,n1" (Meson gxl s905d)



  - "amlogic,p241" (Meson gxl s805x)

  - "libretech,aml-s805x-ac" (Meson gxl s805x)



  - "amlogic,p281" (Meson gxl s905w)

  - "oranth,tx3-mini" (Meson gxl s905w)

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ panasonic Panasonic Corporation 
parade	Parade Technologies Inc.

pericom	Pericom Technology Inc.

pervasive	Pervasive Displays, Inc.

phicomm PHICOMM Co., Ltd.

phytec	PHYTEC Messtechnik GmbH

picochip	Picochip Ltd

pine64	Pine64

arch/arm64/boot/dts/amlogic/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-libretech-ac.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-hwacom-amazetv.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-khadas-vim.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-libretech-cc.dtb
@@ -18,6 +19,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-phicomm-n1.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s805x-p241.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-p281.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905w-tx3-mini.dtb

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

+20 −14
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
		serial1 = &uart_A;

	};



	linein: audio-codec@0 {

	linein: audio-codec-0 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7241";

		VDDA-supply = <&vcc_3v3>;
@@ -70,7 +70,7 @@ 
		sound-name-prefix = "Linein";

	};



	lineout: audio-codec@1 {

	lineout: audio-codec-1 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7154";

		VDD-supply = <&vcc_3v3>;
@@ -79,14 +79,14 @@ 
		sound-name-prefix = "Lineout";

	};



	spdif_dit: audio-codec@2 {

	spdif_dit: audio-codec-2 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};



	dmics: audio-codec@3 {

	dmics: audio-codec-3 {

		#sound-dai-cells = <0>;

		compatible = "dmic-codec";

		num-channels = <7>;
@@ -272,31 +272,31 @@ 
				       <393216000>;

		status = "okay";



		dai-link@0 {

		dai-link-0 {

			sound-dai = <&frddr_a>;

		};



		dai-link@1 {

		dai-link-1 {

			sound-dai = <&frddr_b>;

		};



		dai-link@2 {

		dai-link-2 {

			sound-dai = <&frddr_c>;

		};



		dai-link@3 {

		dai-link-3 {

			sound-dai = <&toddr_a>;

		};



		dai-link@4 {

		dai-link-4 {

			sound-dai = <&toddr_b>;

		};



		dai-link@5 {

		dai-link-5 {

			sound-dai = <&toddr_c>;

		};



		dai-link@6 {

		dai-link-6 {

			sound-dai = <&tdmif_c>;

			dai-format = "i2s";

			dai-tdm-slot-tx-mask-2 = <1 1>;
@@ -317,7 +317,7 @@ 


		};



		dai-link@7 {

		dai-link-7 {

			sound-dai = <&spdifout>;



			codec {
@@ -325,7 +325,7 @@ 
			};

		};



		dai-link@8 {

		dai-link-8 {

			sound-dai = <&pdm>;



			codec {
@@ -543,8 +543,14 @@ 


&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>;

	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;

	pinctrl-names = "default";

	uart-has-rtscts;



	bluetooth {

		compatible = "brcm,bcm43438-bt";

		shutdown-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_HIGH>;

	};

};



&uart_AO {

CRA Git | Maintained and supported by SUSTech CRA and CCSE