Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183cadc9 authored by Jason Cooper's avatar Jason Cooper
Browse files

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

     b24212fb 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.
parents 949db153 de27686b

arch/arm/boot/dts/dove.dtsi

+2 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ 
			reg = <0xd0400 0x20>;

			reg = <0xd0400 0x20>;

			ngpios = <32>;

			ngpios = <32>;

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <12>, <13>, <14>, <60>;

			interrupts = <12>, <13>, <14>, <60>;

		};

		};
@@ -103,6 +104,7 @@ 
			reg = <0xd0420 0x20>;

			reg = <0xd0420 0x20>;

			ngpios = <32>;

			ngpios = <32>;

			interrupt-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <61>;

			interrupts = <61>;

		};

		};

arch/arm/configs/mvebu_defconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,8 @@ CONFIG_MVNETA=y 
CONFIG_MARVELL_PHY=y

CONFIG_MARVELL_PHY=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_I2C=y

CONFIG_I2C_MV64XXX=y

CONFIG_SERIAL_8250_DW=y

CONFIG_SERIAL_8250_DW=y

CONFIG_GPIOLIB=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

arch/arm/plat-orion/mpp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, 
					"number (%u)\n", num);

					"number (%u)\n", num);

			continue;

			continue;

		}

		}

		if (variant_mask & !(*mpp_list & variant_mask)) {

		if (variant_mask && !(*mpp_list & variant_mask)) {

			printk(KERN_WARNING

			printk(KERN_WARNING

			       "orion_mpp_conf: requested MPP%u config "

			       "orion_mpp_conf: requested MPP%u config "

			       "unavailable on this hardware\n", num);

			       "unavailable on this hardware\n", num);