diff options
| author | John Crispin <john@openwrt.org> | 2014-11-14 16:53:40 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-11-14 16:53:40 +0000 |
| commit | 7cc72e4b93f41e7071fb23b7ef00f4dd58ebed51 (patch) | |
| tree | 8b67a169ee66c6e023caf1ace6f23076e3b3c4cd | |
| parent | be23eaa8c3bb0bca2f197cf969f181b94f413f4e (diff) | |
| download | upstream-7cc72e4b93f41e7071fb23b7ef00f4dd58ebed51.tar.gz upstream-7cc72e4b93f41e7071fb23b7ef00f4dd58ebed51.tar.bz2 upstream-7cc72e4b93f41e7071fb23b7ef00f4dd58ebed51.zip | |
ralink: dont define pm_poweroff
this makes gpio-poweroff work
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 43254
| -rw-r--r-- | target/linux/ramips/mt7621/config-3.14 | 3 | ||||
| -rw-r--r-- | target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/target/linux/ramips/mt7621/config-3.14 b/target/linux/ramips/mt7621/config-3.14 index c938309018..bc1527d0c7 100644 --- a/target/linux/ramips/mt7621/config-3.14 +++ b/target/linux/ramips/mt7621/config-3.14 @@ -150,6 +150,9 @@ CONFIG_PHYLIB=y CONFIG_PINCTRL=y CONFIG_PINCTRL_RT2880=y # CONFIG_PINCTRL_SINGLE is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_SUPPLY=y # CONFIG_PREEMPT_RCU is not set CONFIG_RALINK=y CONFIG_RALINK_USBPHY=y diff --git a/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch b/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch new file mode 100644 index 0000000000..ce2bc1c53b --- /dev/null +++ b/target/linux/ramips/patches-3.14/999-no-pm_poweroff.patch @@ -0,0 +1,12 @@ +Index: linux-3.14.18/arch/mips/ralink/reset.c +=================================================================== +--- linux-3.14.18.orig/arch/mips/ralink/reset.c 2014-09-06 01:34:59.000000000 +0200 ++++ linux-3.14.18/arch/mips/ralink/reset.c 2014-11-14 14:28:44.548764125 +0100 +@@ -98,7 +98,6 @@ + { + _machine_restart = ralink_restart; + _machine_halt = ralink_halt; +- pm_power_off = ralink_halt; + + return 0; + } |