Merge tag 'kbuild-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / exynos5800-peach-pi.dts

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index f9ff7f07ae0c4c171a96fb75c6cc13725e06da74..953dc8677dc888d21f4207d27de2d8268d812198 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -16,7 +16,6 @@
 #include <dt-bindings/regulator/maxim,max77802.h>
 #include "exynos5800.dtsi"
 #include "exynos5420-cpus.dtsi"
-#include "exynos-mfc-reserved-memory.dtsi"
 
 / {
        model = "Google Peach Pi Rev 10+";
@@ -604,7 +603,7 @@
        max98091: codec@10 {
                compatible = "maxim,max98091";
                reg = <0x10>;
-               interrupts = <2 0>;
+               interrupts = <2 IRQ_TYPE_NONE>;
                interrupt-parent = <&gpx0>;
                pinctrl-names = "default";
                pinctrl-0 = <&max98091_irq>;
@@ -914,7 +913,7 @@
        cros_ec: cros-ec@0 {
                compatible = "google,cros-ec-spi";
                interrupt-parent = <&gpx1>;
-               interrupts = <5 0>;
+               interrupts = <5 IRQ_TYPE_NONE>;
                pinctrl-names = "default";
                pinctrl-0 = <&ec_spi_cs &ec_irq>;
                reg = <0>;