Re: [U-Boot] [PATCH v1 (WIP) 05/16] [Timer]Remove reset_timer() for non-Nios2 arches

2011-07-14 Thread Graeme Russ 
On 12/07/11 08:02, Wolfgang Denk wrote:
 Dear Graeme Russ,
 
 In message 1309261269-4363-6-git-send-email-graeme.r...@gmail.com you wrote:

 Signed-off-by: Graeme Russ graeme.r...@gmail.com
 
 Seems this patch conflicts with 03/16, which apparently already removed
 the same code, at least in some places?

The conflict was due to a recent patch submitted outside this series -
Fixed during rebase

Regards,

Graeme
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Re: [U-Boot] [PATCH v1 (WIP) 05/16] [Timer]Remove reset_timer() for non-Nios2 arches

2011-07-11 Thread Wolfgang Denk 
Dear Graeme Russ,

In message 1309261269-4363-6-git-send-email-graeme.r...@gmail.com you wrote:
 
 Signed-off-by: Graeme Russ graeme.r...@gmail.com

Seems this patch conflicts with 03/16, which apparently already removed
the same code, at least in some places?

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH, MD: Wolfgang Denk  Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
He only drinks when he gets depressed. Why does he get depressed?
Sometimes it's because he hasn't had a drink.
 - Terry Pratchett, _Men at Arms_
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] [PATCH v1 (WIP) 05/16] [Timer]Remove reset_timer() for non-Nios2 arches

2011-06-28 Thread Graeme Russ 

Signed-off-by: Graeme Russ graeme.r...@gmail.com
---
 arch/arm/cpu/arm1136/mx31/timer.c|5 -
 arch/arm/cpu/arm1136/mx35/timer.c|5 -
 arch/arm/cpu/arm1136/omap24xx/timer.c|5 -
 arch/arm/cpu/arm1176/s3c64xx/timer.c |5 -
 arch/arm/cpu/arm1176/tnetv107x/timer.c   |9 -
 arch/arm/cpu/arm720t/interrupts.c|5 -
 arch/arm/cpu/arm920t/a320/timer.c|6 --
 arch/arm/cpu/arm920t/at91/timer.c|6 --
 arch/arm/cpu/arm920t/at91rm9200/timer.c  |6 --
 arch/arm/cpu/arm920t/ep93xx/timer.c  |5 -
 arch/arm/cpu/arm920t/imx/timer.c |6 --
 arch/arm/cpu/arm920t/ks8695/timer.c  |7 +--
 arch/arm/cpu/arm920t/s3c24x0/timer.c |6 --
 arch/arm/cpu/arm925t/timer.c |6 --
 arch/arm/cpu/arm926ejs/armada100/timer.c |5 -
 arch/arm/cpu/arm926ejs/davinci/timer.c   |5 -
 arch/arm/cpu/arm926ejs/kirkwood/timer.c  |5 -
 arch/arm/cpu/arm926ejs/mb86r0x/timer.c   |5 -
 arch/arm/cpu/arm926ejs/mx25/timer.c  |5 -
 arch/arm/cpu/arm926ejs/mx27/timer.c  |5 -
 arch/arm/cpu/arm926ejs/nomadik/timer.c   |   12 +---
 arch/arm/cpu/arm926ejs/omap/timer.c  |6 --
 arch/arm/cpu/arm926ejs/orion5x/timer.c   |5 -
 arch/arm/cpu/arm926ejs/pantheon/timer.c  |5 -
 arch/arm/cpu/arm926ejs/spear/timer.c |6 --
 arch/arm/cpu/arm926ejs/versatile/timer.c |6 --
 arch/arm/cpu/armv7/mx5/timer.c   |5 -
 arch/arm/cpu/armv7/omap-common/timer.c   |5 -
 arch/arm/cpu/armv7/s5p-common/timer.c|5 -
 arch/arm/cpu/armv7/tegra2/timer.c|5 -
 arch/arm/cpu/ixp/timer.c |5 -
 arch/arm/cpu/lh7a40x/timer.c |6 --
 arch/arm/cpu/pxa/timer.c |7 +--
 arch/arm/cpu/s3c44b0/timer.c |6 --
 arch/arm/cpu/sa1100/timer.c  |5 -
 arch/avr32/cpu/interrupts.c  |7 ---
 arch/blackfin/cpu/interrupts.c   |5 -
 arch/m68k/cpu/mcf547x_8x/slicetimer.c|5 -
 arch/m68k/lib/time.c |5 -
 arch/microblaze/cpu/timer.c  |7 +--
 arch/mips/cpu/mips32/time.c  |6 --
 arch/powerpc/lib/interrupts.c|5 -
 arch/sh/lib/time.c   |7 ---
 arch/sh/lib/time_sh2.c   |8 
 arch/sparc/lib/interrupts.c  |7 +--
 arch/x86/lib/timer.c |5 -
 board/armltd/integrator/timer.c  |5 -
 board/armltd/vexpress/ca9x4_ct_vxp.c |5 -
 board/nvidia/common/board.c  |1 -
 49 files changed, 9 insertions(+), 270 deletions(-)

diff --git a/arch/arm/cpu/arm1136/mx31/timer.c 
b/arch/arm/cpu/arm1136/mx31/timer.c
index d51acbb..eac4ffb 100644
--- a/arch/arm/cpu/arm1136/mx31/timer.c
+++ b/arch/arm/cpu/arm1136/mx31/timer.c
@@ -113,11 +113,6 @@ void reset_timer_masked (void)
gd-tbl = 0; /* start advancing time stamp from 0 */
 }
 
-void reset_timer(void)
-{
-   reset_timer_masked();
-}
-
 unsigned long long get_ticks (void)
 {
ulong now = GPTCNT; /* current tick value */
diff --git a/arch/arm/cpu/arm1136/mx35/timer.c 
b/arch/arm/cpu/arm1136/mx35/timer.c
index 6dfb63a..80c0675 100644
--- a/arch/arm/cpu/arm1136/mx35/timer.c
+++ b/arch/arm/cpu/arm1136/mx35/timer.c
@@ -73,11 +73,6 @@ inline ulong get_timer_masked(void)
return val;
 }
 
-void reset_timer(void)
-{
-   reset_timer_masked();
-}
-
 ulong get_timer(ulong base)
 {
ulong tmp;
diff --git a/arch/arm/cpu/arm1136/omap24xx/timer.c 
b/arch/arm/cpu/arm1136/omap24xx/timer.c
index d6267ba..6f1ebbf 100644
--- a/arch/arm/cpu/arm1136/omap24xx/timer.c
+++ b/arch/arm/cpu/arm1136/omap24xx/timer.c
@@ -57,11 +57,6 @@ int timer_init (void)
 /*
  * timer without interrupts
  */
-void reset_timer (void)
-{
-   reset_timer_masked ();
-}
-
 ulong get_timer (ulong base)
 {
return get_timer_masked () - base;
diff --git a/arch/arm/cpu/arm1176/s3c64xx/timer.c 
b/arch/arm/cpu/arm1176/s3c64xx/timer.c
index 8e54060..bc21f86 100644
--- a/arch/arm/cpu/arm1176/s3c64xx/timer.c
+++ b/arch/arm/cpu/arm1176/s3c64xx/timer.c
@@ -142,11 +142,6 @@ void reset_timer_masked(void)
timestamp = 0;
 }
 
-void reset_timer(void)
-{
-   reset_timer_masked();
-}
-
 ulong get_timer_masked(void)
 {
unsigned long long res = get_ticks();
diff --git a/arch/arm/cpu/arm1176/tnetv107x/timer.c 
b/arch/arm/cpu/arm1176/tnetv107x/timer.c
index c27375c..b3123c5 100644
--- a/arch/arm/cpu/arm1176/tnetv107x/timer.c
+++ b/arch/arm/cpu/arm1176/tnetv107x/timer.c
@@ -60,15 +60,6 @@ int timer_init(void)
return 0;
 }
 
-void reset_timer(void)
-{
-   lastinc = timestamp = 0;
-
-   __raw_writel(0, regs-tcr);
-   __raw_writel(0, regs-tim34);
-   __raw_writel(2