Commit 8061a17e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'for-v4.6/gxbb-dt' of https://github.com/carlocaione/linux-meson into next/dt64 

This series adds initial support for the Amlogic S905 based
Tronsmart Vega S95 Pro, Meta and Telos TV boxes.

- Add new DTS to enable support for the boards
- Add documentation for compatibles and vendor prefix

* tag 'for-v4.6/gxbb-dt' of https://github.com/carlocaione/linux-meson

:
  ARM64: dts: amlogic: Add Tronsmart Vega S95 configs
  Documentation: devicetree: amlogic: Document Tronsmart Vega S95 boards
  ARM64: dts: Prepare configs for Amlogic Meson GXBaby
  Documentation: devicetree: amlogic: Document Meson GXBaby
  devicetree: bindings: Add vendor prefix for Tronsmart

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c8c90447 cc733bc9

Documentation/devicetree/bindings/arm/amlogic.txt

+7 −0
Original line number Diff line number Diff line
@@ -13,8 +13,15 @@ Boards with the Amlogic Meson8b SoC shall have the following properties: 
  Required root node property:

    compatible: "amlogic,meson8b";



Boards with the Amlogic Meson GXBaby SoC shall have the following properties:

  Required root node property:

    compatible: "amlogic,meson-gxbb";



Board compatible values:

  - "geniatech,atv1200" (Meson6)

  - "minix,neo-x8" (Meson8)

  - "tronfy,mxq" (Meson8b)

  - "hardkernel,odroid-c1" (Meson8b)

  - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)

  - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ toshiba Toshiba Corporation 
toumaz	Toumaz

tplink	TP-LINK Technologies Co., Ltd.

tronfy	Tronfy

tronsmart	Tronsmart

truly	Truly Semiconductors Limited

upisemi	uPI Semiconductor Corp.

usi	Universal Scientific Industrial Co., Ltd.

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line 
dts-dirs += al

dts-dirs += altera

dts-dirs += amd

dts-dirs += amlogic

dts-dirs += apm

dts-dirs += arm

dts-dirs += broadcom

arch/arm64/boot/dts/amlogic/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-pro.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb

arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts

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

 * Copyright (c) 2016 Andreas Färber

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/dts-v1/;



#include "meson-gxbb-vega-s95.dtsi"



/ {

	compatible = "tronsmart,vega-s95-meta", "tronsmart,vega-s95", "amlogic,meson-gxbb";

	model = "Tronsmart Vega S95 Meta";



	memory {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};

};