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

Commit 76a254f7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu_fixes_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux into fixes 

From Jason Cooper <jason@lakedaemon.net>:

mvebu fixes for v3.9 (round 2)

 - mvebu
    - interrupt fix
    - DT pinctrl definition for sdio

 - kirkwood
    - chip-delay for GoFlex Net (fix reading nand)
    - set mvsdio unused pins to invalid value for legacy boards (0 is valid)

 - orion5x
    - fix typo in gpio parameters
    - use correct irq in dtsi

* tag 'mvebu_fixes_for_v3.9_round2' of git://git.infradead.org/users/jcooper/linux

:
  arm: mvebu: Fix pinctrl for Armada 370 Mirabox SDIO port.
  arm: orion5x: correct IRQ used in dtsi for mv_cesa
  arm: orion5x: fix orion5x.dtsi gpio parameters
  ARM: Kirkwood: fix unused mvsdio gpio pins
  arm: mvebu: Use local interrupt only for the timer 0
  ARM: kirkwood: Fix chip-delay for GoFlex Net

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d5b1598c 879d68a4

arch/arm/boot/dts/armada-370-mirabox.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@ 
		};

		};





		mvsdio@d00d4000 {

		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins2>;

			pinctrl-0 = <&sdio_pins3>;

			pinctrl-names = "default";

			pinctrl-names = "default";

			status = "okay";

			status = "okay";

			/*

			/*

arch/arm/boot/dts/armada-370.dtsi

+6 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,12 @@ 
					     "mpp50", "mpp51", "mpp52";

					     "mpp50", "mpp51", "mpp52";

			      marvell,function = "sd0";

			      marvell,function = "sd0";

			};

			};



			sdio_pins3: sdio-pins3 {

			      marvell,pins = "mpp48", "mpp49", "mpp50",

					     "mpp51", "mpp52", "mpp53";

			      marvell,function = "sd0";

			};

	        };

	        };





		gpio0: gpio@d0018100 {

		gpio0: gpio@d0018100 {

arch/arm/boot/dts/kirkwood-goflexnet.dts

+1 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ 
		};

		};





		nand@3000000 {

		nand@3000000 {

			chip-delay = <40>;

			status = "okay";

			status = "okay";





			partition@0 {

			partition@0 {

arch/arm/boot/dts/orion5x.dtsi

+7 −2
Original line number Original line Diff line number Diff line
@@ -13,6 +13,9 @@ 
	compatible = "marvell,orion5x";

	compatible = "marvell,orion5x";

	interrupt-parent = <&intc>;

	interrupt-parent = <&intc>;





	aliases {

		gpio0 = &gpio0;

	};

	intc: interrupt-controller {

	intc: interrupt-controller {

		compatible = "marvell,orion-intc", "marvell,intc";

		compatible = "marvell,orion-intc", "marvell,intc";

		interrupt-controller;

		interrupt-controller;
@@ -32,7 +35,9 @@ 
			#gpio-cells = <2>;

			#gpio-cells = <2>;

			gpio-controller;

			gpio-controller;

			reg = <0x10100 0x40>;

			reg = <0x10100 0x40>;

			ngpio = <32>;

			ngpios = <32>;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <6>, <7>, <8>, <9>;

			interrupts = <6>, <7>, <8>, <9>;

		};

		};
@@ -91,7 +96,7 @@ 
			reg = <0x90000 0x10000>,

			reg = <0x90000 0x10000>,

			      <0xf2200000 0x800>;

			      <0xf2200000 0x800>;

			reg-names = "regs", "sram";

			reg-names = "regs", "sram";

			interrupts = <22>;

			interrupts = <28>;

			status = "okay";

			status = "okay";

		};

		};

	};

	};

arch/arm/mach-kirkwood/guruplug-setup.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,8 @@ static struct mv_sata_platform_data guruplug_sata_data = { 




static struct mvsdio_platform_data guruplug_mvsdio_data = {

static struct mvsdio_platform_data guruplug_mvsdio_data = {

	/* unfortunately the CD signal has not been connected */

	/* unfortunately the CD signal has not been connected */

	.gpio_card_detect = -1,

	.gpio_write_protect = -1,

};

};





static struct gpio_led guruplug_led_pins[] = {

static struct gpio_led guruplug_led_pins[] = {