Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

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

diff --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
Simple merge