Commit c8a12c06 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt64 

Merge "ARM: mediatek: dts 64 bit updates for v4.8" from Matthias Brugger:

- Add nodes for the DISP function ports
- Add dt-bindings for mt6755
- Add basic support for mt6755 SoC

* tag 'v4.7-next-dts' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mediatek: add mt6755 support
  Document: DT: Add bindings for mediatek MT6755 SoC Platform
  arm64: dts: mt8173: Add display subsystem related nodes
parents 135a2f38 aea1c315

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ compatible: Must contain one of 
   "mediatek,mt6580"

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6755"

   "mediatek,mt6795"

   "mediatek,mt7623"

   "mediatek,mt8127"
@@ -31,6 +32,9 @@ Supported boards: 
- Evaluation board for MT6592:

    Required root node properties:

      - compatible = "mediatek,mt6592-evb", "mediatek,mt6592";

- Evaluation phone for MT6755(Helio P10):

    Required root node properties:

      - compatible = "mediatek,mt6755-evb", "mediatek,mt6755";

- Evaluation board for MT6795(Helio X10):

    Required root node properties:

      - compatible = "mediatek,mt6795-evb", "mediatek,mt6795";

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6795-sysirq"

	"mediatek,mt6755-sysirq"

	"mediatek,mt6592-sysirq"

	"mediatek,mt6589-sysirq"

	"mediatek,mt6582-sysirq"

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
  * "mediatek,mt6580-uart" for MT6580 compatible UARTS

  * "mediatek,mt6582-uart" for MT6582 compatible UARTS

  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6755-uart" for MT6755 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt7623-uart" for MT7623 compatible UARTS

  * "mediatek,mt8127-uart" for MT8127 compatible UARTS

arch/arm64/boot/dts/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6755-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt6795-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb

arch/arm64/boot/dts/mediatek/mt6755-evb.dts

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

 * Copyright (c) 2016 MediaTek Inc.

 * Author: Mars.C <mars.cheng@mediatek.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program 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.

 */



/dts-v1/;

#include "mt6755.dtsi"



/ {

	model = "MediaTek MT6755 EVB";

	compatible = "mediatek,mt6755-evb", "mediatek,mt6755";



	aliases {

		serial0 = &uart0;

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x1e800000>;

	};



	chosen {

		stdout-path = "serial0:921600n8";

	};

};



&uart0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE