Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d2cf528 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'realtek-arm64-dt-for-4.15' of... 

Merge tag 'realtek-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek into next/dt

Pull "Realtek ARM64 based SoC DT for v4.15" from Andreas Färber:

This refactors the RTD1295 DT, preparing for (but not yet adding)
RTD1293 and RTD1296. Superfluous reg property entries are dropped.
DTs for PROBOX2 AVA and MeLE V9 TV boxes are added.

* tag 'realtek-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek:
  arm64: dts: realtek: Add MeLE V9
  dt-bindings: arm: realtek: Document MeLE V9
  dt-bindings: Add vendor prefix for MeLE
  arm64: dts: realtek: Factor out common RTD129x parts
  arm64: dts: realtek: Add ProBox2 Ava
  dt-bindings: arm: realtek: Add ProBox2 AVA
  dt-bindings: Add vendor prefix for ProBox2
  arm64: dts: realtek: Clean up RTD1295 UART reg property
parents 3ab6dd04 a9ce6f85

Documentation/devicetree/bindings/arm/realtek.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required root node properties: 


Root node property compatible must contain, depending on board:



 - MeLE V9: "mele,v9"

 - ProBox2 AVA: "probox2,ava"

 - Zidoo X9S: "zidoo,x9s"

Documentation/devicetree/bindings/vendor-prefixes.txt

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ mcube mCube 
meas	Measurement Specialties

mediatek	MediaTek Inc.

megachips	MegaChips

mele	Shenzhen MeLE Digital Technology Ltd.

melexis	Melexis N.V.

melfas	MELFAS Inc.

mellanox	Mellanox Technologies
@@ -265,6 +266,7 @@ plathome Plat'Home Co., Ltd. 
plda	PLDA

poslab	Poslab Technology Co., Ltd.

powervr	PowerVR (deprecated, use img)

probox2	PROBOX2 (by W2COMP Co., Ltd.)

pulsedlight	PulsedLight, Inc

qca	Qualcomm Atheros, Inc.

qcom	Qualcomm Technologies, Inc

arch/arm64/boot/dts/realtek/Makefile

+2 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-mele-v9.dtb

dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-probox2-ava.dtb

dtb-$(CONFIG_ARCH_REALTEK) += rtd1295-zidoo-x9s.dtb



always		:= $(dtb-y)

arch/arm64/boot/dts/realtek/rtd1295-mele-v9.dts

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

 * Copyright (c) 2017 Andreas Färber

 *

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

 */



/dts-v1/;



#include "rtd1295.dtsi"



/ {

	compatible = "mele,v9", "realtek,rtd1295";

	model = "MeLE V9";



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x80000000>;

	};



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&uart0 {

	status = "okay";

};

arch/arm64/boot/dts/realtek/rtd1295-probox2-ava.dts

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

 * Copyright (c) 2017 Andreas Färber

 *

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

 */



/dts-v1/;



#include "rtd1295.dtsi"



/ {

	compatible = "probox2,ava", "realtek,rtd1295";

	model = "PROBOX2 AVA";



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x80000000>;

	};



	aliases {

		serial0 = &uart0;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&uart0 {

	status = "okay";

};