aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-05-18 20:22:32 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-05-18 20:22:32 +0000
commitbfdcb53577eff8fc744b81f0d4ee03bfba4e563d (patch)
treee47bafe43922f57ee5bba887328fcbe15b6fc6f6 /target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
parent020b9941036f4dd9fde62e9e3666b5e44704bb27 (diff)
downloadmaster-187ad058-bfdcb53577eff8fc744b81f0d4ee03bfba4e563d.tar.gz
master-187ad058-bfdcb53577eff8fc744b81f0d4ee03bfba4e563d.tar.bz2
master-187ad058-bfdcb53577eff8fc744b81f0d4ee03bfba4e563d.zip
omap24xx: add support for 3.3
Compile tested only. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31810 3c298f89-4303-0410-b956-a3cf2f4a3e73
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, 28 insertions, 0 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
new file mode 100644
index 0000000000..65c14ab3a7
--- /dev/null
+++ b/target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
@@ -0,0 +1,28 @@
+--- 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