diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:40:14 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 16:40:14 +0300 |
| commit | 18ea0db3081fff8279c037cd0eeb8f9003cf49e1 (patch) | |
| tree | 7f912570490bde8e4eb6f023dc5dba05d619a83e /arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | |
| parent | e45cba78c6a0df67383df36086f65950c5239e76 (diff) | |
| parent | b94d22d94ad226eeea3b6ec4579fb4bf8a199e5c (diff) | |
| download | linux-18ea0db3081fff8279c037cd0eeb8f9003cf49e1.tar.xz | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
Pull "Amlogic 64-bit DT updates for v4.15, round 2" from Kevin Hilman:
- add support for new GPIO IRQ driver
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
ARM64: dts: meson-gx: add external PHY interrupt on some platforms
ARM64: dts: meson-gx: add gpio interrupt controller
ARM64: meson: enable MESON_IRQ_GPIO in Kconfig
ARM64: dts: meson-gxbb-odroidc2: fix usb1 power supply
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxl.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi index 703cde9546a1..8ed981f59e5a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -225,6 +225,12 @@ compatible = "amlogic,meson-gxl-aoclkc", "amlogic,meson-gx-aoclkc"; }; +&gpio_intc { + compatible = "amlogic,meson-gpio-intc", + "amlogic,meson-gxl-gpio-intc"; + status = "okay"; +}; + &hdmi_tx { compatible = "amlogic,meson-gxl-dw-hdmi", "amlogic,meson-gx-dw-hdmi"; resets = <&reset RESET_HDMITX_CAPB3>, |