diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-03-23 11:45:40 +0100 |
| commit | 451b1c687105655a4f2c9c477b05535041e25060 (patch) | |
| tree | 3db315590172cd6244107a97a6603add934d7e32 /recipes/linux/linux-omap/fix-dpll-m4.diff | |
| parent | 6767ca50430e37cdad0a8992b73c3f82ead134bf (diff) | |
| parent | e2b99b79f516a7466dc050902cee62f39869bf9d (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux/linux-omap/fix-dpll-m4.diff')
| -rw-r--r-- | recipes/linux/linux-omap/fix-dpll-m4.diff | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap/fix-dpll-m4.diff b/recipes/linux/linux-omap/fix-dpll-m4.diff new file mode 100644 index 0000000000..1fa3bfe7fe --- /dev/null +++ b/recipes/linux/linux-omap/fix-dpll-m4.diff @@ -0,0 +1,37 @@ +From linux-omap-owner@vger.kernel.org Mon Dec 08 14:41:05 2008 + +This fixes commit e42218d45afbc3e654e289e021e6b80c657b16c2. The commit +was based on old kernel tree, and with bad luck applied ok but to wrong +position, modifying dpll4_m6_ck instead of dpll4_m4_ck. + +Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> +--- + arch/arm/mach-omap2/clock34xx.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h +index 1c2b49f..5357507 100644 +--- a/arch/arm/mach-omap2/clock34xx.h ++++ b/arch/arm/mach-omap2/clock34xx.h +@@ -825,6 +825,8 @@ static struct clk dpll4_m4_ck = { + PARENT_CONTROLS_CLOCK, + .clkdm = { .name = "dpll4_clkdm" }, + .recalc = &omap2_clksel_recalc, ++ .set_rate = &omap2_clksel_set_rate, ++ .round_rate = &omap2_clksel_round_rate, + }; + + /* The PWRDN bit is apparently only available on 3430ES2 and above */ +@@ -879,8 +881,6 @@ static struct clk dpll4_m6_ck = { + PARENT_CONTROLS_CLOCK, + .clkdm = { .name = "dpll4_clkdm" }, + .recalc = &omap2_clksel_recalc, +- .set_rate = &omap2_clksel_set_rate, +- .round_rate = &omap2_clksel_round_rate, + }; + + /* The PWRDN bit is apparently only available on 3430ES2 and above */ +-- +1.6.0.3 + + |