Commit 9800917c authored Jul 31, 2015 by Imre Kaloz Committed by Gregory CLEMENT Mar 30, 2016

ARM: mvebu: fix GPIO config on the Linksys boards



Some of the GPIO configs were wrong in the submitted DTS files,
this patch fixes all affected boards.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

Cc: <stable@vger.kernel.org> # v4.1 +
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

parent 9fe32197

arch/arm/boot/dts/armada-385-linksys.dtsi

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -245,7 +245,7 @@ button@1 {
	button@2 {		button@2 {
	label = "Factory Reset Button";		label = "Factory Reset Button";
	linux,code = <KEY_RESTART>;		linux,code = <KEY_RESTART>;
	gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;		gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
	};		};
	};		};

	@@ -260,7 +260,7 @@ power {
	};		};

	sata {		sata {
	gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;		gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
	default-state = "off";		default-state = "off";
	};		};
	};		};
	@@ -313,7 +313,7 @@ port@5 {

	&pinctrl {		&pinctrl {
	keys_pin: keys-pin {		keys_pin: keys-pin {
	marvell,pins = "mpp24", "mpp47";		marvell,pins = "mpp24", "mpp29";
	marvell,function = "gpio";		marvell,function = "gpio";
	};		};

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -304,13 +304,13 @@ gpio_keys {
	button@1 {		button@1 {
	label = "WPS";		label = "WPS";
	linux,code = <KEY_WPS_BUTTON>;		linux,code = <KEY_WPS_BUTTON>;
	gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;		gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
	};		};

	button@2 {		button@2 {
	label = "Factory Reset Button";		label = "Factory Reset Button";
	linux,code = <KEY_RESTART>;		linux,code = <KEY_RESTART>;
	gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;		gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
	};		};
	};		};