3 files changed, 5 insertions, 1 deletions

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 42eac1ff3cc8..740630f9cd65 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -93,6 +93,7 @@
                         reg = <0xd0400 0x20>;
                         ngpios = <32>;
                         interrupt-controller;
+                        #interrupt-cells = <2>;
                         interrupts = <12>, <13>, <14>, <60>;
                 };
 
@@ -103,6 +104,7 @@
                         reg = <0xd0420 0x20>;
                         ngpios = <32>;
                         interrupt-controller;
+                        #interrupt-cells = <2>;
                         interrupts = <61>;
                 };
 
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index b5bc96cb65a7..cbd91bce1ca9 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -33,6 +33,8 @@ CONFIG_MVNETA=y
 CONFIG_MARVELL_PHY=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_I2C=y
+CONFIG_I2C_MV64XXX=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c
index e686fe76a96b..7310bcfb299f 100644
--- a/arch/arm/plat-orion/mpp.c
+++ b/arch/arm/plat-orion/mpp.c
@@ -49,7 +49,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
                                         "number (%u)\n", num);
                         continue;
                 }
-                if (variant_mask & !(*mpp_list & variant_mask)) {
+                if (variant_mask && !(*mpp_list & variant_mask)) {
                         printk(KERN_WARNING
                                "orion_mpp_conf: requested MPP%u config "
                                "unavailable on this hardware\n", num);