[kernel] r8818 - in dists/trunk/linux-2.6/debian: . patches/bugfix/arm patches/series

[Gordon Farquharson]

Author: gordon-guest
Date: Wed May 30 05:11:28 2007
New Revision: 8818

Log:
arm/ixp4xx: Add patch to set NSLU2 timer frequency.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-freq-fixup.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May 30 05:11:28 2007
@@ -35,8 +35,9 @@
   * arm/ixp4xx: Update NPE driver for 2.6.22.
   * arm: Mark CHELSIO_T3, NETXEN_NIC, BCM43XX, and VIDEO_BT848 as broken
     on ARM.
+  * arm/ixp4xx: Add patch to set NSLU2 timer frequency.
 
- -- Gordon Farquharson <gordonfarquharson at gmail.com>  Mon, 28 May 2007 20:54:23 -0600
+ -- Gordon Farquharson <gordonfarquharson at gmail.com>  Tue, 29 May 2007 23:06:04 -0600
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-freq-fixup.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/nslu2-freq-fixup.patch	Wed May 30 05:11:28 2007
@@ -0,0 +1,65 @@
+diff -Naurp a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
+--- a/arch/arm/mach-ixp4xx/common.c	2007-05-29 21:14:27.000000000 -0600
++++ b/arch/arm/mach-ixp4xx/common.c	2007-05-29 21:33:08.000000000 -0600
+@@ -284,7 +284,7 @@ static struct irqaction ixp4xx_timer_irq
+ 	.handler	= ixp4xx_timer_interrupt,
+ };
+ 
+-static void __init ixp4xx_timer_init(void)
++void __init ixp4xx_timer_init(void)
+ {
+ 	/* Reset/disable counter */
+ 	*IXP4XX_OSRT1 = 0;
+diff -Naurp a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
+--- a/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-05-29 21:14:27.000000000 -0600
++++ b/arch/arm/mach-ixp4xx/nslu2-setup.c	2007-05-29 21:33:08.000000000 -0600
+@@ -23,6 +23,7 @@
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/flash.h>
++#include <asm/mach/time.h>
+ 
+ static struct flash_platform_data nslu2_flash_data = {
+ 	.map_name		= "cfi_probe",
+@@ -212,10 +213,21 @@ static struct mtd_notifier nslu2_flash_n
+ 	.remove = nslu2_flash_remove,
+ };
+ 
+-static void __init nslu2_init(void)
++static void __init nslu2_timer_init(void)
+ {
++	/* The xtal on this machine is non-standard. */
+ 	ixp4xx_timer_freq = NSLU2_FREQ;
+ 
++	/* Call standard timer_init function. */
++	ixp4xx_timer_init();
++}
++
++static struct sys_timer nslu2_timer = {
++	.init   = nslu2_timer_init,
++};
++
++static void __init nslu2_init(void)
++{
+ 	/* The flash has an ethernet MAC embedded in it which we need,
+ 	 * that is all this notifier does.
+ 	 */
+@@ -245,6 +257,6 @@ MACHINE_START(NSLU2, "Linksys NSLU2")
+ 	.boot_params	= 0x00000100,
+ 	.map_io		= ixp4xx_map_io,
+ 	.init_irq	= ixp4xx_init_irq,
+-	.timer          = &ixp4xx_timer,
++	.timer          = &nslu2_timer,
+ 	.init_machine	= nslu2_init,
+ MACHINE_END
+diff -Naurp a/include/asm-arm/arch-ixp4xx/platform.h b/include/asm-arm/arch-ixp4xx/platform.h
+--- a/include/asm-arm/arch-ixp4xx/platform.h	2007-05-29 21:14:27.000000000 -0600
++++ b/include/asm-arm/arch-ixp4xx/platform.h	2007-05-29 21:33:08.000000000 -0600
+@@ -132,6 +132,7 @@ extern unsigned long ixp4xx_timer_freq;
+ extern void ixp4xx_map_io(void);
+ extern void ixp4xx_init_irq(void);
+ extern void ixp4xx_sys_init(void);
++extern void ixp4xx_timer_init(void);
+ extern struct sys_timer ixp4xx_timer;
+ extern void ixp4xx_pci_preinit(void);
+ struct pci_sys_data;

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed May 30 05:11:28 2007
@@ -35,3 +35,4 @@
 + features/alpha/isa-mapping-support.patch
 + bugfix/powerpc/libgcc-__ucmpdi2.patch
 + bugfix/arm/disable-broken-config-options-1.patch
++ bugfix/arm/nslu2-freq-fixup.patch