diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-28 18:16:13 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-28 18:16:13 +0200 |
| commit | af429d9ebf70916269bd5ad3e2bd2485fb0f39e6 (patch) | |
| tree | 83b4b61dd28b289813dac617aaaf7baa2bdb49b5 /Documentation | |
| parent | arm64: fix Kconfig include path (diff) | |
| parent | arm64: dts: mediatek: add mt6795 support (diff) | |
| download | linux-af429d9ebf70916269bd5ad3e2bd2485fb0f39e6.tar.xz linux-af429d9ebf70916269bd5ad3e2bd2485fb0f39e6.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
3 files changed, 12 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt index dd7550a29db6..ce26ff7aa9b0 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.txt +++ b/Documentation/devicetree/bindings/arm/mediatek.txt @@ -1,12 +1,14 @@ -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"; diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt index 4f5a5352ccd8..8136b6d44871 100644 --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt @@ -1,4 +1,4 @@ -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" diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt index 8d63f1da07aa..5991511fa7ee 100644 --- a/Documentation/devicetree/bindings/serial/mtk-uart.txt +++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt @@ -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. |