diff options
| author | Olof Johansson <olof@lixom.net> | 2019-04-28 12:59:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-04-28 12:59:22 -0700 |
| commit | ad88400145a23e063615226f5c69e74945fe17ea (patch) | |
| tree | 93170139c08b98957ced0aeaa472e5fedc4d936f /Documentation/devicetree/bindings/soc | |
| parent | c8e3993dd5b90d4e1c5a0edf853fa91add12b302 (diff) | |
| parent | a4599f6ec8e844f53dac15f719084d3b5ffe68c3 (diff) | |
Merge tag 'v5.1-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt
mt8173:
- use assinged-clocks and assigned-clock-parents
- fix compatible for SoC to a72
- add pmu nodes
mt8183:
- add sysirq binding
- add pinctrl dt header file
mt7629:
- update bindings description fo sysirq, uart and scpsys
mt8516:
- add binding description for watchdog, timer, uart and sysirq
* tag 'v5.1-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
arm64: dts: mt8173: add pmu nodes for mt8173
arm64: dts: mt8173: correct cpu type of cpu2 and cpu3 to cortex-a72
dt-bindings: irq: mtk,sysirq: add support for MT8516
dt-bindings: serial: mtk-uart: add support for MT8516
dt-bindings: timer: mtk-timer: add support for MT8516
dt-bindings: wdog: mtk-wdt: add support for MT851
dt-bindings: soc: fix a typo for MT7623A
dt-bindings: mediatek: update bindings for MT7629 SoC
arm64: dts: mt8183: add pinctrl file
dt-bindings: mtk-sysirq: Add compatible for Mediatek MT8183
arm64: dts: Using standard CCF interface to set vcodec clk
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/soc')
| -rw-r--r-- | Documentation/devicetree/bindings/soc/mediatek/scpsys.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt index d6fe16f094af..876693a7ada5 100644 --- a/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt +++ b/Documentation/devicetree/bindings/soc/mediatek/scpsys.txt @@ -23,6 +23,7 @@ Required properties: - "mediatek,mt7622-scpsys" - "mediatek,mt7623-scpsys", "mediatek,mt2701-scpsys": For MT7623 SoC - "mediatek,mt7623a-scpsys": For MT7623A SoC + - "mediatek,mt7629-scpsys", "mediatek,mt7622-scpsys": For MT7629 SoC - "mediatek,mt8173-scpsys" - #power-domain-cells: Must be 1 - reg: Address range of the SCPSYS unit @@ -33,8 +34,8 @@ Required properties: Required clocks for MT2701 or MT7623: "mm", "mfg", "ethif" Required clocks for MT2712: "mm", "mfg", "venc", "jpgdec", "audio", "vdec" Required clocks for MT6797: "mm", "mfg", "vdec" - Required clocks for MT7622: "hif_sel" - Required clocks for MT7622A: "ethif" + Required clocks for MT7622 or MT7629: "hif_sel" + Required clocks for MT7623A: "ethif" Required clocks for MT8173: "mm", "mfg", "venc", "venc_lt" Optional properties: |