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

Commit 36d0f138 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "arm: mediatek: dts64 updates for v4.14" from Matthias Brugger:

- add SoC mt7622 and its reference board
- cleanup of dts bindings
- mt6797: add watchdog and delete unused clock
- add support for SoC mt2701 and it's eval board

* tag 'v4.13-next-dts64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: Add Mediatek SoC MT2712 and evaluation board dts and Makefile
  dt-bindings: arm: Add bindings for Mediatek MT2712 SoC Platform
  arm64: dts: mediatek: Delete unused dummy clock for MT6797
  arm64: dts: mediatek: add watchdog to MT6797
  ARM: mediatek: dts: Add MT6797 binding
  ARM: mediatek: dts: Cleanup bindings documentation
  arm64: dts: mt7622: add dts file for MT7622 reference board variant 1
  arm64: dts: mt7622: add basic nodes to the mt7622.dtsi file
parents 395cd0e6 bdf2cbb2

Documentation/devicetree/bindings/arm/mediatek.txt

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required root node property: 


compatible: Must contain one of

   "mediatek,mt2701"

   "mediatek,mt2712"

   "mediatek,mt6580"

   "mediatek,mt6589"

   "mediatek,mt6592"
@@ -25,6 +26,9 @@ Supported boards: 
- Evaluation board for MT2701:

    Required root node properties:

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

- Evaluation board for MT2712:

    Required root node properties:

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

- Evaluation board for MT6580:

    Required root node properties:

      - compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Required properties: 
	"mediatek,mt6582-sysirq", "mediatek,mt6577-sysirq": for MT6582

	"mediatek,mt6580-sysirq", "mediatek,mt6577-sysirq": for MT6580

	"mediatek,mt6577-sysirq": for MT6577

	"mediatek,mt2712-sysirq", "mediatek,mt6577-sysirq": for MT2712

	"mediatek,mt2701-sysirq", "mediatek,mt6577-sysirq": for MT2701

- interrupt-controller : Identifies the node as an interrupt controller

- #interrupt-cells : Use the same format as specified by GIC in arm,gic.txt.

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

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
Required properties:

- compatible should contain:

  * "mediatek,mt2701-uart" for MT2701 compatible UARTS

  * "mediatek,mt2712-uart" for MT2712 compatible UARTS

  * "mediatek,mt6580-uart" for MT6580 compatible UARTS

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

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

Documentation/devicetree/bindings/watchdog/mtk-wdt.txt

+3 −3
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ Mediatek SoCs Watchdog timer 
Required properties:



- compatible should contain:

	* "mediatek,mt2701-wdt" for MT2701 compatible watchdog timers

	* "mediatek,mt6589-wdt" for all compatible watchdog timers (MT2701,

		MT6589)

	"mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701

	"mediatek,mt6589-wdt": for MT6589

	"mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797



- reg : Specifies base physical address and size of the registers.

arch/arm64/boot/dts/mediatek/Makefile

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

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

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

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb

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



always		:= $(dtb-y)