ixp4xx-kernel: update LEDs patches, add NSLU2 beeper back in to 2.6.15.1

4 files changed, 11 insertions, 38 deletions

diff --git a/packages/linux/ixp4xx-kernel/2.6.15/96-loft-leds.patch b/packages/linux/ixp4xx-kernel/2.6.15/96-loft-leds.patch
index 6098afcf8f..60fcf52cbb 100644
--- a/packages/linux/ixp4xx-kernel/2.6.15/96-loft-leds.patch
+++ b/packages/linux/ixp4xx-kernel/2.6.15/96-loft-leds.patch
@@ -12,42 +12,18 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  
  #include <asm/types.h>
  #include <asm/setup.h>
-@@ -200,6 +201,53 @@ MACHINE_END
+@@ -200,6 +201,29 @@ MACHINE_END
   * maybe the ixdp425 too.
   */
  #ifdef CONFIG_MACH_LOFT
 +#ifdef CONFIG_LEDS_CLASS
 +static struct resource loft_led_resources[] = {
 +	{
-+		.name		= "J8:1",   /* header */
-+		.start		= 0,
-+		.end		= 0,
-+		.flags		= IXP4XX_GPIO_LOW,
-+	},
-+	{
-+		.name		= "J8:3",   /* header */
-+		.start		= 1,
-+		.end		= 1,
-+		.flags		= IXP4XX_GPIO_LOW,
-+	},
-+	{
-+		.name		= "J8:5",   /* header */
-+		.start		= 2,
-+		.end		= 2,
-+		.flags		= IXP4XX_GPIO_LOW,
-+	},
-+	{
 +		.name		= "ready",  /* green led, also J8 pin 7 */
 +		.start		= 3,
 +		.end		= 3,
 +		.flags		= IXP4XX_GPIO_LOW,
 +	},
-+	{
-+		.name		= "J8:9",   /* header */
-+		.start		= 4,
-+		.end		= 4,
-+		.flags		= IXP4XX_GPIO_LOW,
-+	},
 +};
 +
 +static struct platform_device loft_leds = {
@@ -66,7 +42,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  /*
   * When the EEPROM is added the MAC address are read from it.
   */
-@@ -244,7 +292,16 @@ static void __init loft_init(void)
+@@ -244,7 +268,16 @@ static void __init loft_init(void)
  
  	ixp4xx_sys_init();
  
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 2898e83fdb..2502b6518d 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
@@ -12,7 +12,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  
  #include <asm/setup.h>
  #include <asm/memory.h>
-@@ -50,6 +51,48 @@ static struct ixp4xx_i2c_pins nslu2_i2c_
+@@ -50,6 +51,42 @@ static struct ixp4xx_i2c_pins nslu2_i2c_
  	.scl_pin		= NSLU2_SCL_PIN,
  };
  
@@ -42,12 +42,6 @@ Signed-off-by: John Bowler <jbowler@acm.org>
 +		.end		= NSLU2_LED_DISK2,
 +		.flags		= IXP4XX_GPIO_LOW,
 +	},
-+	{
-+		.name		= "buzzer",
-+		.start		= NSLU2_GPIO_BUZZ,
-+		.end		= NSLU2_GPIO_BUZZ,
-+		.flags		= IXP4XX_GPIO_LOW,
-+	},
 +};
 +
 +static struct platform_device nslu2_leds = {
@@ -61,7 +55,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  static struct platform_device nslu2_i2c_controller = {
  	.name			= "IXP4XX-I2C",
  	.id			= 0,
-@@ -103,7 +146,6 @@ static struct platform_device nslu2_uart
+@@ -103,7 +140,6 @@ static struct platform_device nslu2_uart
  static struct platform_device *nslu2_devices[] __initdata = {
  	&nslu2_i2c_controller,
  	&nslu2_flash,
@@ -69,7 +63,7 @@ Signed-off-by: John Bowler <jbowler@acm.org>
  };
  
  static void nslu2_power_off(void)
-@@ -164,7 +206,18 @@ static void __init nslu2_init(void)
+@@ -164,7 +200,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 9f4896e659..03bfef97d0 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
-# Tue Jan 17 13:02:33 2006
+# Sun Jan 22 10:16:00 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=m
+CONFIG_INPUT_NSLU2_BEEPER=y
 # CONFIG_INPUT_UINPUT is not set
 
 #
@@ -1268,6 +1268,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DATAFAB is not set
 # CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
 # CONFIG_USB_STORAGE_DPCM is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_STORAGE_SDDR09 is not set
@@ -1690,3 +1691,5 @@ CONFIG_CRC32=y
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
+CONFIG_REED_SOLOMON=y
+CONFIG_REED_SOLOMON_DEC16=y
diff --git a/packages/linux/ixp4xx-kernel_2.6.15.1.bb b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
index 41d3101850..545a88dd92 100644
--- a/packages/linux/ixp4xx-kernel_2.6.15.1.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.15.1.bb
@@ -8,7 +8,7 @@ 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 = "r11.${PR_CONFIG}"
+PR = "r12.${PR_CONFIG}"
 
 include ixp4xx-kernel.inc