Title: [6462] trunk/arch/blackfin/include/asm/gptimers.h: unify TIMER_GROUP1 definition and fix indenting with BF561
- Revision
- 6462
- Author
- vapier
- Date
- 2009-05-24 13:12:23 -0500 (Sun, 24 May 2009)
Log Message
unify TIMER_GROUP1 definition and fix indenting with BF561
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/gptimers.h (6461 => 6462)
--- trunk/arch/blackfin/include/asm/gptimers.h 2009-05-24 06:53:53 UTC (rev 6461)
+++ trunk/arch/blackfin/include/asm/gptimers.h 2009-05-24 18:12:23 UTC (rev 6462)
@@ -20,7 +20,6 @@
#if defined(CONFIG_BF51x) || defined(CONFIG_BF52x) || defined(BF537_FAMILY)
# define MAX_BLACKFIN_GPTIMERS 8
# define TIMER0_GROUP_REG TIMER_ENABLE
-# define TIMER_GROUP1 0
#endif
/*
* BF54x: 11 timers (BF542: 8 timers):
@@ -34,7 +33,6 @@
# define TIMER_GROUP2 1
# endif
# define TIMER0_GROUP_REG TIMER_ENABLE0
-# define TIMER_GROUP1 0
#endif
/*
* BF561: 12 timers:
@@ -43,16 +41,15 @@
# define MAX_BLACKFIN_GPTIMERS 12
# define TIMER0_GROUP_REG TMRS8_ENABLE
# define TIMER8_GROUP_REG TMRS4_ENABLE
-# define TIMER_GROUP1 0
-# define TIMER_GROUP2 1
+# define TIMER_GROUP2 1
#endif
/*
* All others: 3 timers:
*/
+#define TIMER_GROUP1 0
#if !defined(MAX_BLACKFIN_GPTIMERS)
# define MAX_BLACKFIN_GPTIMERS 3
# define TIMER0_GROUP_REG TIMER_ENABLE
-# define TIMER_GROUP1 0
#endif
#define BLACKFIN_GPTIMER_IDMASK ((1UL << MAX_BLACKFIN_GPTIMERS) - 1)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
