aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:07 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-27 15:01:07 +0000
commitcead4b47abdebcb8506451b4a3e30028982161a1 (patch)
treeb7cf1f3e2130b5411b88351322add5aa0e6b91a9 /target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
parent7a4db11fbb68e99b1e07028d5c65b562e988b395 (diff)
downloadupstream-cead4b47abdebcb8506451b4a3e30028982161a1.tar.gz
upstream-cead4b47abdebcb8506451b4a3e30028982161a1.tar.bz2
upstream-cead4b47abdebcb8506451b4a3e30028982161a1.zip
omap24xx: remove 3.1 support
SVN-Revision: 31890
Diffstat (limited to 'target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch')
-rw-r--r--target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch28
1 files changed, 0 insertions, 28 deletions
diff --git a/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch b/target/linux/omap24xx/patches-3.1/312-no-hwmod-reset.patch
deleted file mode 100644
index cd9a43b612..0000000000
--- a/target/linux/omap24xx/patches-3.1/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
-@@ -145,6 +145,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"
-@@ -1704,6 +1706,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