aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-09-16 07:56:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-09-16 07:56:33 +0000
commitf74116e59942d9773459b1de0882901b21f60bbd (patch)
tree5fdd971d923e1d6665354541e735c0edb0f66afa /target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
parente2ffe8f1b9568f94340d78ec6c314582388b0332 (diff)
downloadupstream-f74116e59942d9773459b1de0882901b21f60bbd.tar.gz
upstream-f74116e59942d9773459b1de0882901b21f60bbd.tar.bz2
upstream-f74116e59942d9773459b1de0882901b21f60bbd.zip
omap24xx: remove obsolete kernel 3.3 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 46947
Diffstat (limited to 'target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch')
-rw-r--r--target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch b/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
deleted file mode 100644
index 65c14ab3a7..0000000000
--- a/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/arch/arm/mach-omap2/omap_hwmod.c
-+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -146,6 +146,8 @@
- #include <plat/omap_hwmod.h>
- #include <plat/prcm.h>
-
-+#include <asm/mach-types.h>
-+
- #include "cm2xxx_3xxx.h"
- #include "cminst44xx.h"
- #include "prm2xxx_3xxx.h"
-@@ -1769,6 +1771,16 @@ static int _setup(struct omap_hwmod *oh,
-
- oh->_state = _HWMOD_STATE_INITIALIZED;
-
-+ if (machine_is_nokia770() ||
-+ machine_is_nokia_n800() ||
-+ machine_is_nokia_n810() ||
-+ machine_is_nokia_n810_wimax()) {
-+ /* Nokia N-series workaround: Don't reset any hwmod. Some drivers expect
-+ * the NOLO bootloader initializations to be effective. */
-+ oh->flags |= HWMOD_INIT_NO_RESET;
-+ printk_once(KERN_INFO "Nokia N-series HWMOD_INIT_NO_RESET workaround enabled\n");
-+ }
-+
- /*
- * In the case of hwmod with hardreset that should not be
- * de-assert at boot time, we have to keep the module