summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch232
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch184
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch37
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch19
-rw-r--r--packages/linux/ixp4xx-kernel/2.6.15/defconfig5
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.15.1.bb6
6 files changed, 266 insertions, 217 deletions
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch b/packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch
new file mode 100644
index 0000000000..5acf54743c
--- /dev/null
+++ b/packages/linux/ixp4xx-kernel/2.6.15/60-ixp4xx-beeper.patch
@@ -0,0 +1,232 @@
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 7 +
+ drivers/input/misc/Kconfig | 12 ++
+ drivers/input/misc/Makefile | 1
+ drivers/input/misc/ixp4xx-beeper.c | 172 +++++++++++++++++++++++++++++++++++++
+ 4 files changed, 192 insertions(+)
+
+--- linux-nslu2.orig/drivers/input/misc/Kconfig 2006-01-23 02:13:55.000000000 +0100
++++ linux-nslu2/drivers/input/misc/Kconfig 2006-01-23 02:29:48.000000000 +0100
+@@ -50,6 +50,18 @@ config INPUT_WISTRON_BTNS
+ To compile this driver as a module, choose M here: the module will
+ be called wistron_btns.
+
++config INPUT_IXP4XX_BEEPER
++ tristate "IXP4XX Beeper support"
++ depends on ARCH_IXP4XX
++ help
++ If you say yes here, you can connect a beeper to the
++ ixp4xx gpio pins. This is used by the LinkSys NSLU2.
++
++ If unsure, say Y.
++
++ To compile this driver as a module, choose M here: the
++ module will be called ixp4xx-beeper.
++
+ config INPUT_UINPUT
+ tristate "User level driver support"
+ help
+--- linux-nslu2.orig/drivers/input/misc/Makefile 2006-01-23 02:13:55.000000000 +0100
++++ linux-nslu2/drivers/input/misc/Makefile 2006-01-23 02:13:57.000000000 +0100
+@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o
+ obj-$(CONFIG_INPUT_UINPUT) += uinput.o
+ obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
+ obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
++obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:13:55.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:26:04.000000000 +0100
+@@ -52,6 +52,12 @@ static struct platform_device nslu2_i2c_
+ .num_resources = 0,
+ };
+
++static struct platform_device nslu2_beeper = {
++ .name = "ixp4xx-beeper",
++ .id = NSLU2_GPIO_BUZZ,
++ .num_resources = 0,
++};
++
+ static struct resource nslu2_uart_resources[] = {
+ {
+ .start = IXP4XX_UART1_BASE_PHYS,
+@@ -99,6 +105,7 @@ static struct platform_device *nslu2_dev
+ &nslu2_i2c_controller,
+ &nslu2_flash,
+ &nslu2_uart,
++ &nslu2_beeper,
+ };
+
+ static void nslu2_power_off(void)
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-nslu2/drivers/input/misc/ixp4xx-beeper.c 2006-01-23 02:13:57.000000000 +0100
+@@ -0,0 +1,172 @@
++/*
++ * Generic IXP4xx beeper driver
++ *
++ * Copyright (C) 2005 Tower Technologies
++ *
++ * based on nslu2-io.c
++ * Copyright (C) 2004 Karen Spearel
++ *
++ * Author: Alessandro Zummo <a.zummo@towertech.it>
++ * Maintainers: http://www.nslu2-linux.org/
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/input.h>
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <asm/hardware.h>
++
++MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
++MODULE_DESCRIPTION("ixp4xx beeper driver");
++MODULE_LICENSE("GPL");
++
++static DEFINE_SPINLOCK(beep_lock);
++
++static int ixp4xx_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
++{
++ unsigned int pin = (unsigned int) dev->private;
++ unsigned int count = 0;
++ unsigned long flags;
++
++ if (type != EV_SND)
++ return -1;
++
++ switch (code) {
++ case SND_BELL:
++ if (value)
++ value = 1000;
++ case SND_TONE:
++ break;
++ default:
++ return -1;
++ }
++
++ if (value > 20 && value < 32767)
++#ifndef FREQ
++ count = (ixp4xx_get_board_tick_rate() / (value * 4)) - 1;
++#else
++ count = (FREQ / (value * 4)) - 1;
++#endif
++ spin_lock_irqsave(&beep_lock, flags);
++
++ if (count) {
++ gpio_line_config(pin, IXP4XX_GPIO_OUT);
++ gpio_line_set(pin, IXP4XX_GPIO_LOW);
++
++ *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE;
++ } else {
++ gpio_line_config(pin, IXP4XX_GPIO_IN);
++ gpio_line_set(pin, IXP4XX_GPIO_HIGH);
++
++ *IXP4XX_OSRT2 = 0;
++ }
++
++ spin_unlock_irqrestore(&beep_lock, flags);
++
++ return 0;
++}
++
++static irqreturn_t ixp4xx_spkr_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++{
++ /* clear interrupt */
++ *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
++
++ /* flip the beeper output */
++ *IXP4XX_GPIO_GPOUTR ^= (1 << (unsigned int) dev_id);
++
++ return IRQ_HANDLED;
++}
++
++static int __devinit ixp4xx_spkr_probe(struct platform_device *dev)
++{
++ struct input_dev *input_dev;
++ int err;
++
++ input_dev = input_allocate_device();
++ if (!input_dev)
++ return -ENOMEM;
++
++ input_dev->private = (void *) dev->id;
++ input_dev->name = "ixp4xx beeper",
++ input_dev->phys = "ixp4xx/gpio";
++ input_dev->id.bustype = BUS_HOST;
++ input_dev->id.vendor = 0x001f;
++ input_dev->id.product = 0x0001;
++ input_dev->id.version = 0x0100;
++ input_dev->cdev.dev = &dev->dev;
++
++ input_dev->evbit[0] = BIT(EV_SND);
++ input_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE);
++ input_dev->event = ixp4xx_spkr_event;
++
++ err = request_irq(IRQ_IXP4XX_TIMER2, &ixp4xx_spkr_interrupt,
++ SA_INTERRUPT | SA_TIMER, "ixp4xx-beeper", (void *) dev->id);
++ if (err)
++ goto err_free_device;
++
++ err = input_register_device(input_dev);
++ if (err)
++ goto err_free_irq;
++
++ platform_set_drvdata(dev, input_dev);
++
++ return 0;
++
++ err_free_irq:
++ free_irq(IRQ_IXP4XX_TIMER2, dev);
++ err_free_device:
++ input_free_device(input_dev);
++
++ return err;
++}
++
++static int __devexit ixp4xx_spkr_remove(struct platform_device *dev)
++{
++ struct input_dev *input_dev = platform_get_drvdata(dev);
++
++ input_unregister_device(input_dev);
++ platform_set_drvdata(dev, NULL);
++
++ /* turn the speaker off */
++ disable_irq(IRQ_IXP4XX_TIMER2);
++ ixp4xx_spkr_event(NULL, EV_SND, SND_BELL, 0);
++
++ free_irq(IRQ_IXP4XX_TIMER2, dev);
++
++ return 0;
++}
++
++static void ixp4xx_spkr_shutdown(struct platform_device *dev)
++{
++ /* turn off the speaker */
++ disable_irq(IRQ_IXP4XX_TIMER2);
++ ixp4xx_spkr_event(NULL, EV_SND, SND_BELL, 0);
++}
++
++static struct platform_driver ixp4xx_spkr_platform_driver = {
++ .driver = {
++ .name = "ixp4xx-beeper",
++ .owner = THIS_MODULE,
++ },
++ .probe = ixp4xx_spkr_probe,
++ .remove = __devexit_p(ixp4xx_spkr_remove),
++ .shutdown = ixp4xx_spkr_shutdown,
++};
++
++static int __init ixp4xx_spkr_init(void)
++{
++ return platform_driver_register(&ixp4xx_spkr_platform_driver);
++}
++
++static void __exit ixp4xx_spkr_exit(void)
++{
++ platform_driver_unregister(&ixp4xx_spkr_platform_driver);
++}
++
++module_init(ixp4xx_spkr_init);
++module_exit(ixp4xx_spkr_exit);
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch b/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch
deleted file mode 100644
index 6cd1025d38..0000000000
--- a/packages/linux/ixp4xx-kernel/2.6.15/60-nslu2-beeper.patch
+++ /dev/null
@@ -1,184 +0,0 @@
- drivers/input/misc/Kconfig | 12 +++
- drivers/input/misc/Makefile | 1
- drivers/input/misc/nslu2spkr.c | 148 +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 161 insertions(+)
-
---- linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/drivers/input/misc/Kconfig 1970-01-01 00:00:00.000000000 +0000
-@@ -50,6 +50,18 @@ config INPUT_M68K_BEEP
- tristate "M68k Beeper support"
- depends on M68K
-
-+config INPUT_NSLU2_BEEPER
-+ tristate "NSLU2 Beeper support"
-+ depends on MACH_NSLU2
-+ help
-+ Say Y here if you want the embedded beeper on the LinkSys NSLU2
-+ to be used for bells and whistles.
-+
-+ If unsure, say Y.
-+
-+ To compile this driver as a module, choose M here: the
-+ module will be called nslu2spkr.
-+
- config INPUT_UINPUT
- tristate "User level driver support"
- help
---- linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/drivers/input/misc/Makefile 1970-01-01 00:00:00.000000000 +0000
-@@ -11,3 +11,4 @@ obj-$(CONFIG_INPUT_M68K_BEEP) += m68ksp
- obj-$(CONFIG_INPUT_98SPKR) += 98spkr.o
- obj-$(CONFIG_INPUT_UINPUT) += uinput.o
- obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
-+obj-$(CONFIG_INPUT_NSLU2_BEEPER) += nslu2spkr.o
---- linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000
-@@ -0,0 +1,148 @@
-+/*
-+ * drivers/input/misc/nslu2spkr.c
-+ *
-+ * NSLU2 Beeper driver
-+ *
-+ * Copyright (C) 2005 Tower Technologies
-+ *
-+ * based on nslu2-io.c
-+ * Copyright (C) 2004 Karen Spearel
-+ *
-+ * Author: Alessandro Zummo <a.zummo@towertech.it>
-+ * Maintainers: http://www.nslu2-linux.org/
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ */
-+
-+#include <linux/config.h>
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/input.h>
-+#include <linux/delay.h>
-+
-+#include <asm/hardware.h>
-+#include <asm/irq.h>
-+#include <asm/mach-types.h>
-+
-+static unsigned int beep_on_startup = 1;
-+module_param(beep_on_startup, bool, 0);
-+MODULE_PARM_DESC(beep_on_startup, "Play a beep on module startup");
-+
-+DEFINE_SPINLOCK(beep_lock);
-+
-+static int nslu2_spkr_event(struct input_dev *dev, unsigned int type, unsigned int code, int value)
-+{
-+ unsigned int count = 0;
-+ unsigned long flags;
-+
-+ if (type != EV_SND)
-+ return -1;
-+
-+ switch (code) {
-+ case SND_BELL:
-+ if (value) value = 1000;
-+ case SND_TONE:
-+ break;
-+ default:
-+ return -1;
-+ }
-+
-+ if (value > 20 && value < 32767)
-+ count = (NSLU2_FREQ / (value*4)) - 1;
-+
-+ spin_lock_irqsave(&beep_lock, flags);
-+
-+ if (count) {
-+
-+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_OUT);
-+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_LOW);
-+
-+ *IXP4XX_OSRT2 = (count & ~IXP4XX_OST_RELOAD_MASK) | IXP4XX_OST_ENABLE;
-+
-+ } else {
-+
-+ gpio_line_config(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_IN);
-+ gpio_line_set(NSLU2_GPIO_BUZZ, IXP4XX_GPIO_HIGH);
-+
-+ *IXP4XX_OSRT2 = 0;
-+ }
-+
-+ spin_unlock_irqrestore(&beep_lock, flags);
-+
-+ return 0;
-+}
-+
-+static struct input_dev nslu2_spkr_dev = {
-+ .phys = "ixp420/gpio4",
-+ .name = "NSLU2 Beeper",
-+ .evbit[0] = BIT(EV_SND),
-+ .sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE),
-+ .event = nslu2_spkr_event,
-+ .id = {
-+ .bustype = BUS_HOST,
-+ .vendor = 0x001f,
-+ .product = 0x0001,
-+ .version = 0x0100
-+ }
-+};
-+
-+static irqreturn_t nslu2_spkr_handler(int irq, void *dev_id, struct pt_regs *regs)
-+{
-+ /* clear interrupt */
-+ *IXP4XX_OSST = IXP4XX_OSST_TIMER_2_PEND;
-+
-+ /* flip the beeper output */
-+ *IXP4XX_GPIO_GPOUTR ^= NSLU2_BZ_BM;
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int __init nslu2_spkr_init(void)
-+{
-+ if (!(machine_is_nslu2()))
-+ return -ENODEV;
-+
-+ if (request_irq(IRQ_IXP4XX_TIMER2, &nslu2_spkr_handler,
-+ SA_INTERRUPT | SA_TIMER, "nslu2-beeper", NULL < 0)) {
-+
-+ printk(KERN_INFO "NSLU2 beeper: IRQ %d not available\n",
-+ IRQ_IXP4XX_TIMER2);
-+
-+ return -EIO;
-+ }
-+
-+ input_register_device(&nslu2_spkr_dev);
-+
-+ /* do a little beep to tell the world we are alive */
-+ if (beep_on_startup)
-+ {
-+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 440);
-+ msleep(120);
-+ nslu2_spkr_event(NULL, EV_SND, SND_TONE, 0);
-+ }
-+
-+ printk(KERN_INFO "NSLU2: beeper\n");
-+ return 0;
-+}
-+
-+static void __exit nslu2_spkr_exit(void)
-+{
-+ input_unregister_device(&nslu2_spkr_dev);
-+
-+ disable_irq(IRQ_IXP4XX_TIMER2);
-+
-+ /* turn it off */
-+ nslu2_spkr_event(NULL, EV_SND, SND_BELL, 0);
-+
-+ free_irq(IRQ_IXP4XX_TIMER2, NULL);
-+}
-+
-+module_init(nslu2_spkr_init);
-+module_exit(nslu2_spkr_exit);
-+
-+MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
-+MODULE_DESCRIPTION("NSLU2 Beeper driver");
-+MODULE_LICENSE("GPL");
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
index e8131447c8..fee28e6f69 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.15/85-timer.patch
@@ -1,5 +1,11 @@
---- linux-2.6.15/arch/arm/mach-ixp4xx/common.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/arm/mach-ixp4xx/common.c 1970-01-01 00:00:00.000000000 +0000
+ arch/arm/mach-ixp4xx/common.c | 165 +++++++++++++++++++++++++++++++++---
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 5 +
+ include/asm-arm/arch-ixp4xx/nslu2.h | 5 -
+ include/asm-arm/arch-ixp4xx/timex.h | 23 +++--
+ 4 files changed, 176 insertions(+), 22 deletions(-)
+
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/common.c 2006-01-20 20:23:46.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/common.c 2006-01-23 01:09:25.000000000 +0100
@@ -239,36 +239,165 @@ void __init ixp4xx_init_irq(void)
* IXP4xx timer tick
* We use OS timer1 on the CPU for the timer tick and the timestamp
@@ -77,7 +83,7 @@
+ * 4*x+1 = board_tick_rate/HZ
+ *
+ * This needs to be rounded to the closest 4*HZ value:
-+ *
++ *
+ * x = ((board_tick_rate-HZ) + (4*HZ)/2) / 4*HZ
+ * x = (board_tick_rate+HZ) / (4*HZ);
+ */
@@ -213,9 +219,9 @@
}
}
-
---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
-@@ -114,6 +114,11 @@ static void nslu2_power_off(void)
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 01:09:04.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 01:09:25.000000000 +0100
+@@ -120,6 +120,11 @@ static void nslu2_power_off(void)
static void __init nslu2_init(void)
{
@@ -227,19 +233,8 @@
ixp4xx_sys_init();
pm_power_off = nslu2_power_off;
---- linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/drivers/input/misc/nslu2spkr.c 1970-01-01 00:00:00.000000000 +0000
-@@ -51,7 +51,7 @@ static int nslu2_spkr_event(struct input
- }
-
- if (value > 20 && value < 32767)
-- count = (NSLU2_FREQ / (value*4)) - 1;
-+ count = (ixp4xx_get_board_tick_rate() / (value*4)) - 1;
-
- spin_lock_irqsave(&beep_lock, flags);
-
---- linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/include/asm-arm/arch-ixp4xx/nslu2.h 1970-01-01 00:00:00.000000000 +0000
+--- linux-nslu2.orig/include/asm-arm/arch-ixp4xx/nslu2.h 2006-01-20 20:23:46.000000000 +0100
++++ linux-nslu2/include/asm-arm/arch-ixp4xx/nslu2.h 2006-01-23 01:09:25.000000000 +0100
@@ -38,11 +38,6 @@
#define NSLU2_PCI_INTD_PIN 8
@@ -252,8 +247,8 @@
/* GPIO */
#define NSLU2_GPIO0 0
---- linux-2.6.15/include/asm-arm/arch-ixp4xx/timex.h 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/include/asm-arm/arch-ixp4xx/timex.h 1970-01-01 00:00:00.000000000 +0000
+--- linux-nslu2.orig/include/asm-arm/arch-ixp4xx/timex.h 2006-01-20 20:23:46.000000000 +0100
++++ linux-nslu2/include/asm-arm/arch-ixp4xx/timex.h 2006-01-23 01:09:25.000000000 +0100
@@ -6,10 +6,23 @@
#include <asm/hardware.h>
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch b/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch
index 2502b6518d..83043d9c2d 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.15/96-nslu2-leds.patch
@@ -2,17 +2,22 @@ NEW_LEDS support for the LinkSys NSLU2
Signed-off-by: John Bowler <jbowler@acm.org>
---- linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.15/arch/arm/mach-ixp4xx/nslu2-setup.c 1970-01-01 00:00:00.000000000 +0000
-@@ -17,6 +17,7 @@
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 51 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 50 insertions(+), 1 deletion(-)
+
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:13:58.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c 2006-01-23 02:14:51.000000000 +0100
+@@ -17,6 +17,9 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
#include <linux/mtd/mtd.h>
++#ifdef CONFIG_LEDS_CLASS
+#include <linux/leds.h>
++#endif
#include <asm/setup.h>
#include <asm/memory.h>
-@@ -50,6 +51,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_
+@@ -50,6 +53,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_
.scl_pin = NSLU2_SCL_PIN,
};
@@ -55,15 +60,15 @@ Signed-off-by: John Bowler <jbowler@acm.org>
static struct platform_device nslu2_i2c_controller = {
.name = "IXP4XX-I2C",
.id = 0,
-@@ -103,7 +140,6 @@ static struct platform_device nslu2_uart
+@@ -109,7 +148,6 @@ static struct platform_device nslu2_uart
static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_controller,
&nslu2_flash,
- &nslu2_uart,
+ &nslu2_beeper,
};
- static void nslu2_power_off(void)
-@@ -164,7 +200,18 @@ static void __init nslu2_init(void)
+@@ -171,7 +209,18 @@ static void __init nslu2_init(void)
pm_power_off = nslu2_power_off;
diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig
index 6d635ce2c2..3dfbfa5785 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig
+++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.15
-# Sun Jan 22 10:16:00 2006
+# Sun Jan 22 22:47:43 2006
#
CONFIG_ARM=y
CONFIG_MMU=y
@@ -878,7 +878,7 @@ CONFIG_INPUT_EVDEV=m
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
-CONFIG_INPUT_NSLU2_BEEPER=y
+CONFIG_INPUT_IXP4XX_BEEPER=y
# CONFIG_INPUT_UINPUT is not set
#
@@ -1070,6 +1070,7 @@ CONFIG_LEDS_CLASS=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_IXP4XX=y
CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_CPU_ACTIVITY=y
#
# Multimedia devices
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.1.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
index 23eda4568a..add6718b1b 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
@@ -3,12 +3,12 @@
# Increment PR_CONFIG for changes to the ixp4xx-kernel specific
# defconfig (do *NOT* increment anything in here for changes
# to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "0"
#
# Increment the number below (i.e. the digits after PR) when
# making changes within this file or for changes to the patches
# applied to the kernel.
-PR = "r13.${PR_CONFIG}"
+PR = "r14.${PR_CONFIG}"
include ixp4xx-kernel.inc
@@ -37,7 +37,7 @@ IXP4XX_PATCHES += "file://50-nas100d-arch.patch;patch=1"
# IXP4XX_PATCHES += "file://60-nas100d-i2c.patch;patch=1"
# IXP4XX_PATCHES += "file://60-nas100d-ide.patch;patch=1"
# IXP4XX_PATCHES += "file://60-nas100d-rtc.patch;patch=1"
-IXP4XX_PATCHES += "file://60-nslu2-beeper.patch;patch=1"
+IXP4XX_PATCHES += "file://60-ixp4xx-beeper.patch;patch=1"
IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1"
IXP4XX_PATCHES += "file://81-nslu2-power.patch;patch=1"
IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:15:57 +0000