diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:33:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-18 22:33:18 +0200 |
| commit | 36d0f13881942bdde8d9f0cbe119913f19445882 (patch) | |
| tree | 2d34898fb43674bc9e052dd3dab2bac318146d3b /Documentation | |
| parent | 395cd0e66e97240aa70c7c42eb33677e2bd5db7f (diff) | |
| parent | bdf2cbb2b3160122f7ff16445fdb73267fffd583 (diff) | |
| download | linux-36d0f13881942bdde8d9f0cbe119913f19445882.tar.gz linux-36d0f13881942bdde8d9f0cbe119913f19445882.tar.bz2 linux-36d0f13881942bdde8d9f0cbe119913f19445882.zip | |
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
Diffstat (limited to 'Documentation')
4 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt index da7bd138e6f2..7aa0e98768d5 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.txt +++ b/Documentation/devicetree/bindings/arm/mediatek.txt @@ -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"; diff --git a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt index 11cc87aeb276..07bf0b9a5139 100644 --- a/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt +++ b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt @@ -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. diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt index b6cf384597e1..f73abff3de43 100644 --- a/Documentation/devicetree/bindings/serial/mtk-uart.txt +++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt @@ -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 diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt index 6a00939a059a..20ada673ab0c 100644 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt @@ -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. |