bk://bk.arm.linux.org.uk/linux-2.6-rmk ben-linux@org.rmk.(none)[rmk]|ChangeSet|20050228184407|03858 ben-linux # This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/02/28 12:13:44-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # CREDITS # 2005/02/28 12:13:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/02/28 18:44:07+00:00 ben-linux@org.rmk.(none) # [ARM PATCH] 2505/1: Remove FTVPCI from debug code # # Patch from Ben Dooks # # Remove the currently #if'ed out FTVPCI debug code # from arch/arm/kernel/debug.S as FTVPCI has no current # build candidate. # # Signed-off-by: Ben Dooks # Signed-off-by: Russell King # # arch/arm/kernel/debug.S # 2005/02/28 00:52:39+00:00 ben-linux@org.rmk.(none) +0 -23 # [PATCH] 2505/1: Remove FTVPCI from debug code # # ChangeSet # 2005/02/28 18:38:04+00:00 ben-linux@org.rmk.(none) # [ARM PATCH] 2498/1: CREDITS - add Ben Dooks # # Patch from Ben Dooks # # Add Ben Dooks to the credits file # # Signed-off-by: Ben Dooks # Signed-off-by: Russell King # # CREDITS # 2005/02/21 14:30:58+00:00 ben-linux@org.rmk.(none) +15 -0 # [PATCH] 2498/1: CREDITS - add Ben Dooks # # ChangeSet # 2005/02/28 18:31:03+00:00 sascha@de.rmk.(none) # [ARM PATCH] 2497/1: i.MX pll decode # # Patch from Sascha Hauer # # This patch provided by Pavel Pisa fixes a wrong bitmask in # imx_decode_pll. # Sascha Hauer # # Signed-off-by: Pavel Pisa # # Signed-off-by: Sascha Hauer # Signed-off-by: Russell King # # arch/arm/mach-imx/generic.c # 2005/02/22 12:12:37+00:00 sascha@de.rmk.(none) +2 -2 # [PATCH] 2497/1: i.MX pll decode # # ChangeSet # 2005/02/28 18:24:24+00:00 sascha@de.rmk.(none) # [ARM PATCH] 2496/1: i.MX DMA fix # # Patch from Sascha Hauer # # This patch fixes the handling of the dma interrupt acknowledge register (DISR). # A DMA interrupt is acknowledged by setting the corresponding bit in # DISR. So we are not allowed to use |= on this register because we could # lose interrupts. # Sascha Hauer # # Signed-off-by: Sascha Hauer # Signed-off-by: Russell King # # arch/arm/mach-imx/dma.c # 2005/02/28 00:00:00+00:00 sascha@de.rmk.(none) +2 -2 # [PATCH] 2496/1: i.MX DMA fix # # ChangeSet # 2005/02/04 23:55:48-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/02/04 23:55:43-08:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2005/02/04 23:55:43-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/02/03 12:27:49-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/02/03 12:27:45-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/02/02 20:58:58-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/02/02 20:58:53-08:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2005/02/02 20:58:53-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/28 14:23:08-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/28 14:23:02-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/15 17:59:46-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/15 17:59:40-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/13 16:36:43-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/13 16:36:39-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/13 16:33:42-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/13 16:33:38-08:00 akpm@bix.(none) +0 -0 # Auto merged # # CREDITS # 2005/01/13 16:33:38-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/12 12:14:51-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/12 12:14:47-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 21:32:02-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # CREDITS # 2005/01/11 21:31:56-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/11 11:47:36-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/11 11:47:31-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/10 20:25:29-08:00 akpm@bix.(none) # Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/10 20:25:24-08:00 akpm@bix.(none) +0 -0 # Auto merged # # ChangeSet # 2005/01/10 14:38:10-08:00 akpm@bix.(none) # Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk # into bix.(none):/usr/src/bk-arm # # MAINTAINERS # 2005/01/10 14:38:06-08:00 akpm@bix.(none) +0 -0 # Auto merged # diff -Nru a/CREDITS b/CREDITS --- a/CREDITS 2005-02-28 17:16:26 -08:00 +++ b/CREDITS 2005-02-28 17:16:26 -08:00 @@ -805,6 +805,21 @@ S: Round Rock, TX 78682 S: USA +N: Ben Dooks +E: ben-linux@fluff.org +E: ben@simtec.co.uk +W: http://www.fluff.org/ben/ +W: http://www.simtec.co.uk/ +D: Samsung S3C2410/S3C2440 support, general ARM support +D: Maintaining Simtec Electronics development boards +S: Simtec Electronics +S: Avondale Drive +S: Tarleton +S: Preston +S: Lancs +S: PR4 6AX +S: United Kingdom + N: John G Dorsey E: john+@cs.cmu.edu D: ARM Linux ports to Assabet/Neponset, Spot diff -Nru a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S --- a/arch/arm/kernel/debug.S 2005-02-28 17:16:26 -08:00 +++ b/arch/arm/kernel/debug.S 2005-02-28 17:16:26 -08:00 @@ -52,29 +52,6 @@ #include #endif -#if 0 -// #elif defined(CONFIG_ARCH_FTVPCI) - .macro addruart,rx - mrc p15, 0, \rx, c1, c0 - tst \rx, #1 @ MMU enabled? - movne \rx, #0xe0000000 - moveq \rx, #0x10000000 - .endm - - .macro senduart,rd,rx - str \rd, [\rx, #0xc] - .endm - - .macro busyuart,rd,rx -1001: ldr \rd, [\rx, #0x4] - tst \rd, #1 << 2 - beq 1001b - .endm - - .macro waituart,rd,rx - .endm -#endif - /* * Useful debugging routines */ diff -Nru a/arch/arm/mach-imx/dma.c b/arch/arm/mach-imx/dma.c --- a/arch/arm/mach-imx/dma.c 2005-02-28 17:16:26 -08:00 +++ b/arch/arm/mach-imx/dma.c 2005-02-28 17:16:26 -08:00 @@ -136,7 +136,7 @@ i, channel->name); DBOSR |= (1 << i); } - DISR |= (1 << i); + DISR = (1 << i); } return IRQ_HANDLED; } @@ -158,10 +158,10 @@ */ printk(KERN_WARNING "spurious IRQ for DMA channel %d\n", i); - DISR |= (1 << i); } } } + DISR = disr; return IRQ_HANDLED; } diff -Nru a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c --- a/arch/arm/mach-imx/generic.c 2005-02-28 17:16:26 -08:00 +++ b/arch/arm/mach-imx/generic.c 2005-02-28 17:16:26 -08:00 @@ -100,8 +100,8 @@ static unsigned int imx_decode_pll(unsigned int pll) { u32 mfi = (pll >> 10) & 0xf; - u32 mfn = pll & 0x3f; - u32 mfd = (pll >> 16) & 0x3f; + u32 mfn = pll & 0x3ff; + u32 mfd = (pll >> 16) & 0x3ff; u32 pd = (pll >> 26) & 0xf; u32 f_ref = (CSCR & CSCR_SYSTEM_SEL) ? 16000000 : (CLK32 * 512);