Commit 0159225b 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 arm/dt

arm64: dts: Amlogic updates for v5.2

Highlights
- new board: SEI Robotics 510, based on S905X2 SoC (G12A)
- enable more periphearls for S905X2 based boards

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

:
  arm64: dts: meson-g12a: Add CMA reserved memory
  arm64: dts: meson-g12a-x96-max: Enable BT Module
  arm64: dts: meson-g12a-x96-max: add regulators
  arm64: dts: meson-g12a-sei510: add regulators
  arm64: dts: meson-g12a-x96-max: add uart_AO pinctrl
  arm64: dts: meson-g12a-sei510: add uart_AO pinctrl
  arm64: dts: meson-g12a-u200: add uart_AO pinctrl
  arm64: dts: meson: g12a: Add UART A, B & C nodes and pins
  arm64: dts: meson: g12a: add reset controller
  arm64: dts: meson: g12a: add uart_ao_a pinctrl
  arm64: dts: meson: g12a: add pinctrl support controllers
  arm64: dts: meson: g12a: Add AO Clock + Reset Controller support
  arm64: dts: meson-gxm-nexbox-a1: Enable USB
  arm64: dts: meson: g12a: add efuse
  arm64: dts: meson: g12a: add secure monitor
  arm64: dts: meson-gxl-s905d-phicomm-n1: add status LED
  arm64: dts: meson-g12a: Add AO Secure node
  arm64: dts: Add SEI Robotics SEI510 Board
  vendor-prefixes: Add prefix for Shenzhen SEI Robotics Co., Ltd

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 79a3aaa7 e2cffeb3

Documentation/devicetree/bindings/arm/amlogic.txt

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ Board compatible values (alphabetically, grouped by SoC): 


  - "amlogic,u200" (Meson g12a s905d2)

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

  - "seirobotics,sei510" (Meson g12a s905x2)



Amlogic Meson Firmware registers Interface

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

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ sandisk Sandisk Corporation 
sbs	Smart Battery System

schindler	Schindler

seagate	Seagate Technology PLC

seirobotics	Shenzhen SEI Robotics Co., Ltd

semtech	Semtech Corporation

sensirion	Sensirion AG

sff	Small Form Factor Committee

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-sei510.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

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

0 → 100644
+97 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)

/*

 * Copyright (c) 2019 BayLibre SAS. All rights reserved.

 */



/dts-v1/;



#include "meson-g12a.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/meson-g12a-gpio.h>



/ {

	compatible = "seirobotics,sei510", "amlogic,g12a";

	model = "SEI Robotics SEI510";



	aliases {

		serial0 = &uart_AO;

	};



	ao_5v: regulator-ao_5v {

		compatible = "regulator-fixed";

		regulator-name = "AO_5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&dc_in>;

		regulator-always-on;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	dc_in: regulator-dc_in {

		compatible = "regulator-fixed";

		regulator-name = "DC_IN";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-always-on;

	};



	emmc_1v8: regulator-emmc_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "EMMC_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x40000000>;

	};



	reserved-memory {

		/* TEE Reserved Memory */

		bl32_reserved: bl32@5000000 {

			reg = <0x0 0x05300000 0x0 0x2000000>;

			no-map;

		};

	};



	vddao_3v3: regulator-vddao_3v3 {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&dc_in>;

		regulator-always-on;

	};



	vddao_3v3_t: regultor-vddao_3v3_t {

		compatible = "regulator-fixed";

		regulator-name = "VDDAO_3V3_T";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vddao_3v3>;

		gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>;

		enable-active-high;

	};



	vddio_ao1v8: regulator-vddio_ao1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VDDIO_AO1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



};



&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};

arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts

+2 −0
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ 


&uart_AO {

	status = "okay";

	pinctrl-0 = <&uart_ao_a_pins>;

	pinctrl-names = "default";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE