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

Commit af429d9e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.2-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64 

- arm64: dts: mediatek: add mt6795 support
- Document: DT: Add bindings for mediatek MT6795 SoC Platform
- arm64: dts: mediatek: Add MT8173 MMC dts
- arm64: dts: mt8173: Add afe device node
- arm64: dts: mt8173-evb: Add PMIC support
- dts: mt8173-evb: Add da9211 to i2c1
- ARM: dts: mt8173: support arm64 cpuidle-dt
- ARM64: MediaTek MT8173: Add SCPSYS device node
- arm64: dts: mt8173: Add I2C device node
- arm64: dts: mt8173: Add watchdog device node
- arm64: dts: mt8173: Add PMIC wrapper device node
- arm64: dts: mt8173: Use real clock for UARTs
- arm64: dts: mt8173: Add clock controller device nodes

* tag 'v4.2-next-arm64' of https://github.com/mbgg/linux-mediatek

:
  arm64: dts: mediatek: add mt6795 support
  Document: DT: Add bindings for mediatek MT6795 SoC Platform
  arm64: dts: mediatek: Add MT8173 MMC dts
  arm64: dts: mt8173: Add afe device node
  arm64: dts: mt8173-evb: Add PMIC support
  dts: mt8173-evb: Add da9211 to i2c1
  ARM: dts: mt8173: support arm64 cpuidle-dt
  ARM64: MediaTek MT8173: Add SCPSYS device node
  arm64: dts: mt8173: Add I2C device node
  arm64: dts: mt8173: Add watchdog device node
  arm64: dts: mt8173: Add PMIC wrapper device node
  arm64: dts: mt8173: Use real clock for UARTs
  arm64: dts: mt8173: Add clock controller device nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6a377491 e2694524

Documentation/devicetree/bindings/arm/mediatek.txt

+7 −2
Original line number Diff line number Diff line 
MediaTek mt65xx & mt81xx Platforms Device Tree Bindings

MediaTek mt65xx, mt67xx & mt81xx Platforms Device Tree Bindings



Boards with a MediaTek mt65xx/mt81xx SoC shall have the following property:

Boards with a MediaTek mt65xx/mt67xx/mt81xx SoC shall have the

following property:



Required root node property:



compatible: Must contain one of

   "mediatek,mt6589"

   "mediatek,mt6592"

   "mediatek,mt6795"

   "mediatek,mt8127"

   "mediatek,mt8135"

   "mediatek,mt8173"
@@ -20,6 +22,9 @@ Supported boards: 
- Evaluation board for MT6592:

    Required root node properties:

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

- Evaluation board for MT6795(Helio X10):

    Required root node properties:

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

- MTK mt8127 tablet moose EVB:

    Required root node properties:

      - compatible = "mediatek,mt8127-moose", "mediatek,mt8127";

Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt

+2 −1
Original line number Diff line number Diff line 
Mediatek 65xx/81xx sysirq

+Mediatek 65xx/67xx/81xx sysirq



Mediatek SOCs sysirq support controllable irq inverter for each GIC SPI

interrupt.
@@ -8,6 +8,7 @@ Required properties: 
	"mediatek,mt8173-sysirq"

	"mediatek,mt8135-sysirq"

	"mediatek,mt8127-sysirq"

	"mediatek,mt6795-sysirq"

	"mediatek,mt6592-sysirq"

	"mediatek,mt6589-sysirq"

	"mediatek,mt6582-sysirq"

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

+3 −2
Original line number Diff line number Diff line
@@ -5,10 +5,11 @@ Required properties: 
  * "mediatek,mt8135-uart" for MT8135 compatible UARTS

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

  * "mediatek,mt8173-uart" for MT8173 compatible UARTS

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

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

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

  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582, 

	MT6577)

  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6795, MT6589,

	MT6582, MT6577)



- reg: The base address of the UART register bank.

arch/arm64/boot/dts/mediatek/Makefile

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

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



always		:= $(dtb-y)

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

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

 * Copyright (c) 2015 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 "mt6795.dtsi"



/ {

	model = "MediaTek MT6795 Evaluation Board";

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



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x1e800000>;

	};



	chosen {

		stdout-path = "serial0:921600n8";

	};

};



&uart0 {

	status = "okay";

};