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

Commit 3c76a8a9 authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge tag 'tags/mvebu_fixes_for_v3.9_round3' into mvebu/dt 

pulling in mvebu branches which changes armada*.dts? files for LPAE changes

mvebu fixes for v3.9 round 3

 - Kirkwood
    - a couple of small fixes for the Iomega ix2-200 board (ether and led)
 - mvebu
    - allow GPIO button to work on Mirabox when running SMP
parents 513a7917 600468d0

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ config ARCH_IXP4XX 
config ARCH_DOVE

	bool "Marvell Dove"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_DOVE

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

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

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



		mvsdio@d00d4000 {

			pinctrl-0 = <&sdio_pins2>;

			pinctrl-0 = <&sdio_pins3>;

			pinctrl-names = "default";

			status = "okay";

			/*

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

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ 
			status = "okay";

			/* No CD or WP GPIOs */

		};



		usb@d0050000 {

			status = "okay";

		};



		usb@d0051000 {

			status = "okay";

		};

	};



	gpio-keys {

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

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
	mpic: interrupt-controller@d0020000 {

	      compatible = "marvell,mpic";

	      #interrupt-cells = <1>;

	      #address-cells = <1>;

	      #size-cells = <1>;

	      interrupt-controller;

	};
@@ -54,7 +53,7 @@ 
				reg = <0xd0012000 0x100>;

				reg-shift = <2>;

				interrupts = <41>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

		};

		serial@d0012100 {
@@ -62,7 +61,7 @@ 
				reg = <0xd0012100 0x100>;

				reg-shift = <2>;

				interrupts = <42>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

		};

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

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

			      marvell,function = "sd0";

			};



			sdio_pins3: sdio-pins3 {

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

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

			      marvell,function = "sd0";

			};

	        };



		gpio0: gpio@d0018100 {