Skip to content

Commit 183cadc

Browse files
author
Jason Cooper
committed
Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/drivers
fixes for v3.8-rc6 - add missing gpio interrupt lines to dove dt - fix bad logic for printing MPP error message on orion boards - build proper serial port driver after changing mvebu DT compatible property - This is a change to mvebu_defconfig that I wouldn't usually push out as a fix. However, the commit b24212f arm: mvebu: Use dw-apb-uart instead of ns16650 as UART driver changed the serial driver for the board in the dts file. without the patch I've included in this pull, users won't see any log messages.
2 parents 949db15 + de27686 commit 183cadc

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

arch/arm/boot/dts/dove.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
reg = <0xd0400 0x20>;
9494
ngpios = <32>;
9595
interrupt-controller;
96+
#interrupt-cells = <2>;
9697
interrupts = <12>, <13>, <14>, <60>;
9798
};
9899

@@ -103,6 +104,7 @@
103104
reg = <0xd0420 0x20>;
104105
ngpios = <32>;
105106
interrupt-controller;
107+
#interrupt-cells = <2>;
106108
interrupts = <61>;
107109
};
108110

arch/arm/configs/mvebu_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ CONFIG_MVNETA=y
3333
CONFIG_MARVELL_PHY=y
3434
CONFIG_SERIAL_8250=y
3535
CONFIG_SERIAL_8250_CONSOLE=y
36+
CONFIG_I2C=y
37+
CONFIG_I2C_MV64XXX=y
3638
CONFIG_SERIAL_8250_DW=y
3739
CONFIG_GPIOLIB=y
3840
CONFIG_GPIO_SYSFS=y

arch/arm/plat-orion/mpp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask,
4949
"number (%u)\n", num);
5050
continue;
5151
}
52-
if (variant_mask & !(*mpp_list & variant_mask)) {
52+
if (variant_mask && !(*mpp_list & variant_mask)) {
5353
printk(KERN_WARNING
5454
"orion_mpp_conf: requested MPP%u config "
5555
"unavailable on this hardware\n", num);

0 commit comments

Comments
 (0)