diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 13:44:27 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-05-10 13:44:27 (GMT) |
| commit | 7430bc1942f1f340a149abfbe007900ece743903 (patch) | |
| tree | 3d9859caa54d1a7636a4b8a1c339c411b995a522 /arch/arm/boot | |
| parent | e8f72bf9d45cfaaf550a85f177c7407ceae72645 (diff) | |
| parent | 610175b7972afc78f0e4a622a17a32b1fccad4bf (diff) | |
| download | linux-7430bc1942f1f340a149abfbe007900ece743903.tar.xz | |
Merge tag 'v4.6-next-dts' of https://github.com/mbgg/linux-mediatek into next/dt
Merge "ARM: mediatek: dts updates for v4.7" from Matthias Brugger:
- add pinctrl node for mt2701
- add mt2701 pmic wrapper binding
- add auxadc binding document
* tag 'v4.6-next-dts' of https://github.com/mbgg/linux-mediatek:
dt-bindings: MediaTek: Add binding document for the AUXADC
dt-bindings: ARM: Mediatek: add MT2701/7623 string to the PMIC wrapper doc
arm: dts: Add pinctrl/GPIO/EINT node for mt2701
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/mt2701.dtsi | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi index 8343768..18596a2 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -15,6 +15,7 @@ #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include "skeleton64.dtsi" +#include "mt2701-pinfunc.h" / { compatible = "mediatek,mt2701"; @@ -85,6 +86,24 @@ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; }; + pio: pinctrl@10005000 { + compatible = "mediatek,mt2701-pinctrl"; + reg = <0 0x1000b000 0 0x1000>; + mediatek,pctl-regmap = <&syscfg_pctl_a>; + pins-are-numbered; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>; + }; + + syscfg_pctl_a: syscfg@10005000 { + compatible = "mediatek,mt2701-pctl-a-syscfg", "syscon"; + reg = <0 0x10005000 0 0x1000>; + }; + watchdog: watchdog@10007000 { compatible = "mediatek,mt2701-wdt", "mediatek,mt6589-wdt"; |