diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-12-10 12:11:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-12-10 12:11:39 +0000 |
commit | 618fae4a7f899ff52e8d7961f938eab9504c095d (patch) | |
tree | 87792ea7917f8c587b906df674f27ff899108afe /target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch | |
parent | 8466384db1154a107b86bf3ca10b166a21bd81d0 (diff) | |
download | master-187ad058-618fae4a7f899ff52e8d7961f938eab9504c095d.tar.gz master-187ad058-618fae4a7f899ff52e8d7961f938eab9504c095d.tar.bz2 master-187ad058-618fae4a7f899ff52e8d7961f938eab9504c095d.zip |
mvebu: add support for 4.4-rc
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47819 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch')
-rw-r--r-- | target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch b/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch new file mode 100644 index 0000000000..7bc55dc3a7 --- /dev/null +++ b/target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch @@ -0,0 +1,58 @@ +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 + +--- + arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +++--- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/arch/arm/boot/dts/armada-385-linksys.dtsi ++++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +@@ -243,7 +243,7 @@ + button@2 { + label = "Factory Reset Button"; + linux,code = <KEY_RESTART>; +- gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; ++ gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; + }; + }; + +@@ -258,7 +258,7 @@ + }; + + sata { +- gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; + default-state = "off"; + }; + }; +@@ -311,7 +311,7 @@ + + &pinctrl { + keys_pin: keys-pin { +- marvell,pins = "mpp24", "mpp47"; ++ marvell,pins = "mpp24", "mpp29"; + marvell,function = "gpio"; + }; + +--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts ++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +@@ -302,13 +302,13 @@ + button@1 { + label = "WPS"; + linux,code = <KEY_WPS_BUTTON>; +- gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio1 0 GPIO_ACTIVE_LOW>; + }; + + button@2 { + label = "Factory Reset Button"; + linux,code = <KEY_RESTART>; +- gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; ++ gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + }; + }; + |