summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-07-28 18:16:36 +0200
committerOlof Johansson <olof@lixom.net>2015-07-28 18:16:36 +0200
commit55e3cfc5f9a7303d78026bcf4bdfb1788b669ea0 (patch)
treec3bcb65d76483c515b30deb6bcd538b1f0e410d0 /Documentation
parentARM: dts: UniPhier: add UART and USB pinmux nodes (diff)
parentARM: dts: mediatek: add mt6580 basic support (diff)
downloadlinux-55e3cfc5f9a7303d78026bcf4bdfb1788b669ea0.tar.xz
linux-55e3cfc5f9a7303d78026bcf4bdfb1788b669ea0.zip
Merge tag 'v4.2-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt
- ARM: dts: mediatek: add mt6580 basic support - Document: DT: Add bindings for mediatek MT6580 SoC Platform - ARM: dts: mediatek mt8135: Use real UART clocks - ARM: dts: mt8135-evbp1: Add PMIC support - ARM: dts: mt8135: Add pmic wrapper nodes - ARM: dts: mediatek: Enable clock support for Mediatek MT8135. * tag 'v4.2-next-dts' of https://github.com/mbgg/linux-mediatek: ARM: dts: mediatek: add mt6580 basic support Document: DT: Add bindings for mediatek MT6580 SoC Platform ARM: dts: mediatek mt8135: Use real UART clocks ARM: dts: mt8135-evbp1: Add PMIC support ARM: dts: mt8135: Add pmic wrapper nodes ARM: dts: mediatek: Enable clock support for Mediatek MT8135. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/mediatek.txt4
-rw-r--r--Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt1
-rw-r--r--Documentation/devicetree/bindings/serial/mtk-uart.txt3
-rw-r--r--Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt6
4 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index dd7550a29db6..2daa424a13a4 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -5,6 +5,7 @@ Boards with a MediaTek mt65xx/mt81xx SoC shall have the following property:
Required root node property:
compatible: Must contain one of
+ "mediatek,mt6580"
"mediatek,mt6589"
"mediatek,mt6592"
"mediatek,mt8127"
@@ -14,6 +15,9 @@ compatible: Must contain one of
Supported boards:
+- Evaluation board for MT6580:
+ Required root node properties:
+ - compatible = "mediatek,mt6580-evbp1", "mediatek,mt6580";
- bq Aquaris5 smart phone:
Required root node properties:
- compatible = "mundoreader,bq-aquaris5", "mediatek,mt6589";
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
index 4f5a5352ccd8..3c9c3a7f3d25 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
@@ -11,6 +11,7 @@ Required properties:
"mediatek,mt6592-sysirq"
"mediatek,mt6589-sysirq"
"mediatek,mt6582-sysirq"
+ "mediatek,mt6580-sysirq"
"mediatek,mt6577-sysirq"
- interrupt-controller : Identifies the node as an interrupt controller
- #interrupt-cells : Use the same format as specified by GIC in
diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt
index 8d63f1da07aa..a875997f2062 100644
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@ -7,8 +7,9 @@ Required properties:
* "mediatek,mt8173-uart" for MT8173 compatible UARTS
* "mediatek,mt6589-uart" for MT6589 compatible UARTS
* "mediatek,mt6582-uart" for MT6582 compatible UARTS
+ * "mediatek,mt6580-uart" for MT6580 compatible UARTS
* "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582,
- MT6577)
+ MT6580, MT6577)
- reg: The base address of the UART register bank.
diff --git a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
index 7c4408ff4b83..53a3029b7589 100644
--- a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
+++ b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt
@@ -2,7 +2,11 @@ Mediatek MT6577, MT6572 and MT6589 Timers
---------------------------------------
Required properties:
-- compatible: Should be "mediatek,mt6577-timer"
+- compatible should contain:
+ * "mediatek,mt6589-timer" for MT6589 compatible timers
+ * "mediatek,mt6580-timer" for MT6580 compatible timers
+ * "mediatek,mt6577-timer" for all compatible timers (MT6589, MT6580,
+ MT6577)
- reg: Should contain location and length for timers register.
- clocks: Clocks driving the timer hardware. This list should include two
clocks. The order is system clock and as second clock the RTC clock.