Commit a5494aed 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 next/dt

Pull "Amlogic 64-bit platforms: DT updates for v4.15" from Kevin Hilman:

- new SoC support: A113D
- new boards: Tronsmart Vega S96, Khadas vim2
- reserved memory fixups
- gpio-names cleanups
- MMC cleanups, enable high-speed modes
- misc cleanups

* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson-axg: add initial A113D SoC DT support
  dt-bindings: arm: amlogic: Add Meson AXG binding
  ARM64: dts: meson-gx: remove unnecessary uart compatible
  ARM64: dts: meson-gx: remove unnecessary clocks properties
  ARM64: dts: meson-gxl: Add alternate ARM Trusted Firmware reserved memory zone
  ARM64: dts: meson-gxm: enable HS400 on the vim2
  ARM64: dts: meson-gxbb-nexbox-a95x: Enable USB Nodes
  dt-bindings: arm: amlogic: Add Tronsmart Vega S96 binding
  ARM64: dts: meson-gxm: Add Vega S96 board
  ARM64: dts: meson-gxm: Add support for Khadas VIM2
  ARM64: dts: meson-gxl: Take eMMC data strobe out of eMMC pins
  ARM64: dts: meson-gxl: adjust libretech-cc gpio-line-names
  ARM64: dts: meson-gxl: adjust kvim gpio-line-names
  ARM64: dts: meson-gxbb: adjust odroid-c2 gpio-line-names
  ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names
  ARM64: dts: meson-gx: adjust gpio-ranges for TEST_N
  ARM64: dts: meson-gx: remove gpio offset
  ARM: dts: meson8: remove gpio offset
  ARM64: dts: meson-gxl-libretech-cc: enable internal phy leds
  ARM64: dts: meson-gxl-libretech-cc: enable saradc
parents b295477e 9d59b708

Documentation/devicetree/bindings/arm/amlogic.txt

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,s912", "amlogic,meson-gxm";



Boards with the Amlogic Meson AXG A113D SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,a113d", "amlogic,meson-axg";



Board compatible values (alphabetically, grouped by SoC):



  - "geniatech,atv1200" (Meson6)
@@ -71,8 +75,12 @@ Board compatible values (alphabetically, grouped by SoC): 


  - "amlogic,q200" (Meson gxm s912)

  - "amlogic,q201" (Meson gxm s912)

  - "khadas,vim2" (Meson gxm s912)

  - "kingnovel,r-box-pro" (Meson gxm S912)

  - "nexbox,a1" (Meson gxm s912)

  - "tronsmart,vega-s96" (Meson gxm s912)



  - "amlogic,s400" (Meson axg a113d)



Amlogic Meson Firmware registers Interface

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

arch/arm/boot/dts/meson8.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ 
			reg-names = "mux", "pull", "gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl_aobus 0 120 16>;

			gpio-ranges = <&pinctrl_aobus 0 0 16>;

		};



		uart_ao_a_pins: uart_ao_a {

arch/arm/boot/dts/meson8b.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
			reg-names = "mux", "pull", "gpio";

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl_aobus 0 130 16>;

			gpio-ranges = <&pinctrl_aobus 0 0 16>;

		};



		uart_ao_a_pins: uart_ao_a {

arch/arm64/boot/dts/amlogic/Makefile

+3 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.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
@@ -15,10 +16,12 @@ 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-gxm-khadas-vim2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017 Amlogic, Inc. All rights reserved.

 *

 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)

 */



/dts-v1/;



#include "meson-axg.dtsi"



/ {

	compatible = "amlogic,s400", "amlogic,a113d", "amlogic,meson-axg";

	model = "Amlogic Meson AXG S400 Development Board";



	aliases {

		serial0 = &uart_AO;

	};

};



&uart_AO {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE