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

Commit 65aabd61 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu_fixes_for_v3.8-rc3' of git://git.infradead.org/users/jcooper/linux into fixes 

From Jason Cooper:
mvebu fixes for v3.8-rc3
 - gpio fixes in mvebu, kirkwood, and dove
 - small DT fix for mvebu (correct RAM size)

* tag 'mvebu_fixes_for_v3.8-rc3' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: Fix memory size for Armada 370 DB
  ARM: Dove: add Cubox sdhci card detect gpio
  ARM: Kirkwood: fix ns2 gpios by converting to pinctrl
  arm: mvebu: use global interrupts for GPIOs on Armada XP
parents 434fec16 11d5993d

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MB */

		reg = <0x00000000 0x40000000>; /* 1 GB */

	};



	soc {

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

+6 −8
Original line number Diff line number Diff line
@@ -50,27 +50,25 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <17>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>;

			interrupts = <87>, <88>, <89>;

		};

	};

};

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

+9 −12
Original line number Diff line number Diff line
@@ -51,39 +51,36 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>, <23>;

			interrupts = <87>, <88>, <89>, <90>;

		};



		gpio2: gpio@d0018180 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018180 0x40>,

			    <0xd0018870 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018180 0x40>;

			ngpios = <3>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <24>;

			interrupts = <91>;

		};



		ethernet@d0034000 {

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

+9 −12
Original line number Diff line number Diff line
@@ -66,39 +66,36 @@ 
		};



		gpio0: gpio@d0018100 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018100 0x40>,

			    <0xd0018800 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018100 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <16>, <17>, <18>, <19>;

			interrupts = <82>, <83>, <84>, <85>;

		};



		gpio1: gpio@d0018140 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018140 0x40>,

			    <0xd0018840 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018140 0x40>;

			ngpios = <32>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <20>, <21>, <22>, <23>;

			interrupts = <87>, <88>, <89>, <90>;

		};



		gpio2: gpio@d0018180 {

			compatible = "marvell,armadaxp-gpio";

			reg = <0xd0018180 0x40>,

			    <0xd0018870 0x30>;

			compatible = "marvell,orion-gpio";

			reg = <0xd0018180 0x40>;

			ngpios = <3>;

			gpio-controller;

			#gpio-cells = <2>;

			interrupt-controller;

			#interrupts-cells = <2>;

			interrupts = <24>;

			interrupts = <91>;

		};



		ethernet@d0034000 {

arch/arm/boot/dts/dove-cubox.dts

+12 −2
Original line number Diff line number Diff line
@@ -26,10 +26,15 @@ 
};



&uart0 { status = "okay"; };

&sdio0 { status = "okay"; };

&sata0 { status = "okay"; };

&i2c0 { status = "okay"; };



&sdio0 {

	status = "okay";

	/* sdio0 card detect is connected to wrong pin on CuBox */

	cd-gpios = <&gpio0 12 1>;

};



&spi0 {

	status = "okay";
@@ -42,9 +47,14 @@ 
};



&pinctrl {

	pinctrl-0 = <&pmx_gpio_18>;

	pinctrl-0 = <&pmx_gpio_12 &pmx_gpio_18>;

	pinctrl-names = "default";



	pmx_gpio_12: pmx-gpio-12 {

		marvell,pins = "mpp12";

		marvell,function = "gpio";

	};



	pmx_gpio_18: pmx-gpio-18 {

		marvell,pins = "mpp18";

		marvell,function = "gpio";