arm/ixp4xx: Add patch to set NSLU2 timer frequency.
svn path=/dists/sid/linux-2.6/; revision=8617
This commit is contained in:
parent
b6962ad483
commit
ae7035e8ea
|
@ -1,3 +1,9 @@
|
|||
linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
|
||||
|
||||
* arm/ixp4xx: Add patch to set NSLU2 timer frequency.
|
||||
|
||||
-- Gordon Farquharson <gordonfarquharson@gmail.com> Sun, 20 May 2007 09:19:54 -0600
|
||||
|
||||
linux-2.6 (2.6.21-2) unstable; urgency=low
|
||||
|
||||
[ Christian T. Steigies ]
|
||||
|
|
|
@ -0,0 +1,65 @@
|
|||
diff -Naur a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
|
||||
--- a/arch/arm/mach-ixp4xx/common.c 2007-05-19 21:50:18.000000000 -0600
|
||||
+++ b/arch/arm/mach-ixp4xx/common.c 2007-05-19 22:33:51.000000000 -0600
|
||||
@@ -269,7 +269,7 @@
|
||||
.handler = ixp4xx_timer_interrupt,
|
||||
};
|
||||
|
||||
-static void __init ixp4xx_timer_init(void)
|
||||
+void __init ixp4xx_timer_init(void)
|
||||
{
|
||||
/* Clear Pending Interrupt by writing '1' to it */
|
||||
*IXP4XX_OSST = IXP4XX_OSST_TIMER_1_PEND;
|
||||
diff -Naur 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-19 21:50:18.000000000 -0600
|
||||
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c 2007-05-19 22:31:54.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 @@
|
||||
.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 @@
|
||||
.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 -Naur 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-19 21:50:18.000000000 -0600
|
||||
+++ b/include/asm-arm/arch-ixp4xx/platform.h 2007-05-19 22:35:24.000000000 -0600
|
||||
@@ -132,6 +132,7 @@
|
||||
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;
|
|
@ -0,0 +1 @@
|
|||
+ features/arm/nslu2-freq-fixup.patch
|
Loading…
Reference in New Issue