diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-01-31 17:38:25 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-31 17:38:25 +0000 |
| commit | 36cf1ef87e9fd5658ce70b0c98f900de2609fb5f (patch) | |
| tree | b555c35acad189405cf6d422471df4acf7c4c900 /arch/arm | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | de27686b77f1c5c5dddf06d48fd322c52f098d51 (diff) | |
| download | op-kernel-dev-36cf1ef87e9fd5658ce70b0c98f900de2609fb5f.zip op-kernel-dev-36cf1ef87e9fd5658ce70b0c98f900de2609fb5f.tar.gz | |
Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards
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.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/dove.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/plat-orion/mpp.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 42eac1f..740630f 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 b5bc96c..cbd91bc 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 e686fe76..7310bcf 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); |
