[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2436-g333981e

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  333981e0726e7951c79a9e54bdb91bc039546e7d (commit)
      from  da556bce4a8a7f1b11cf228ba7f0858801fd1e8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 333981e0726e7951c79a9e54bdb91bc039546e7d
Author: Nicolas Colombain <nic...@ar...>
Date:   Thu Aug 4 08:34:24 2011 +0200

    [LINUX]fix imx51 pwm clock source

-----------------------------------------------------------------------

Summary of changes:
 target/linux/modules/pwm/pwm.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/target/linux/modules/pwm/pwm.c b/target/linux/modules/pwm/pwm.c
index 3f7870d..a7b87f3 100644
--- a/target/linux/modules/pwm/pwm.c
+++ b/target/linux/modules/pwm/pwm.c
@@ -60,7 +60,11 @@
 #define PWM_IRQEN	(1<<0)
 #define PWM_SWR		(1<<3)
 #define PWM_CLKSRC_MASK	(3<<16)
+#if defined(CONFIG_ARCH_MX2)
 #define PWM_CLKSRC_IPG	(2<<16)
+#else
+#define PWM_CLKSRC_IPG	(1<<16)
+#endif
 #define PWM_CLKSRC_32K	(3<<16)
 #define PWM_REPEAT_MASK	(3<<1)
 #define PWM_HCTR	(1<<20)


hooks/post-receive
-- 
armadeus