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
commit02c2f449d7fb61ba212fec12baec65197167e7bf (patch)
tree8afd63e4117c4991f1b1285f41550777f21cfa63 /target/linux/omap24xx/patches-3.3/312-no-hwmod-reset.patch
parentc2a2d59db5ef7b8b9c35d1756585d8b3c6f35543 (diff)
downloadupstream-02c2f449d7fb61ba212fec12baec65197167e7bf.tar.gz
upstream-02c2f449d7fb61ba212fec12baec65197167e7bf.tar.bz2
upstream-02c2f449d7fb61ba212fec12baec65197167e7bf.zip
omap24xx: add support for 3.3
Compile tested only. SVN-Revision: 31810
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