summaryrefslogtreecommitdiff
path: root/target/linux/omap4/patches/000-hwmod_dont_wait.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-31 09:44:00 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-31 09:44:00 +0000
commit06d197404bab910c2d4c184210b27a1e0f73d6a2 (patch)
tree4e3cd20d9d2aeab2f1fe0c9b0474a2b79f2a5b51 /target/linux/omap4/patches/000-hwmod_dont_wait.patch
parente21718ae44e86d99931a8a887f7bf1cca57463e8 (diff)
kernel: update linux 3.2 to 3.2.2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29967 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap4/patches/000-hwmod_dont_wait.patch')
-rw-r--r--target/linux/omap4/patches/000-hwmod_dont_wait.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/target/linux/omap4/patches/000-hwmod_dont_wait.patch b/target/linux/omap4/patches/000-hwmod_dont_wait.patch
index 87c6aedd3a..5220a733c2 100644
--- a/target/linux/omap4/patches/000-hwmod_dont_wait.patch
+++ b/target/linux/omap4/patches/000-hwmod_dont_wait.patch
@@ -43,11 +43,9 @@ Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
-diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
-index 207a2ff..ebace0f 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
-@@ -706,27 +706,65 @@ static void _enable_module(struct omap_hwmod *oh)
+@@ -706,27 +706,65 @@ static void _enable_module(struct omap_h
}
/**
@@ -120,7 +118,7 @@ index 207a2ff..ebace0f 100644
}
/**
-@@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct omap_hwmod *oh)
+@@ -1153,36 +1191,6 @@ static int _wait_target_ready(struct oma
}
/**
@@ -157,7 +155,7 @@ index 207a2ff..ebace0f 100644
* _lookup_hardreset - fill register bit info for this hwmod/reset line
* @oh: struct omap_hwmod *
* @name: name of the reset line in the context of this hwmod
-@@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh)
+@@ -1524,8 +1532,6 @@ static int _enable(struct omap_hwmod *oh
*/
static int _idle(struct omap_hwmod *oh)
{
@@ -181,7 +179,7 @@ index 207a2ff..ebace0f 100644
/*
* The module must be in idle mode before disabling any parents
* clocks. Otherwise, the parent clock might be disabled before
-@@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *oh)
+@@ -1642,11 +1646,7 @@ static int _shutdown(struct omap_hwmod *
if (oh->_state == _HWMOD_STATE_ENABLED) {
_del_initiator_dep(oh, mpu_oh);
/* XXX what about the other system initiators here? dma, dsp */