Changeset 10169


Ignore:
Timestamp:
2008-01-11T08:33:18+01:00 (10 years ago)
Author:
rwhitby
Message:

Updated the fsg board patch from nslu2-linux

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ixp4xx/patches-2.6.23/030-ixp4xx_fsg_board_support.patch

    r10167 r10169  
    22=================================================================== 
    33--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    4 +++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c        2008-01-09 12:49:07.000000000 +1030 
     4+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-pci.c        2008-01-11 17:06:33.000000000 +1030 
    55@@ -0,0 +1,71 @@ 
    66+/* 
     
    7878=================================================================== 
    7979--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    80 +++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c      2008-01-09 12:49:07.000000000 +1030 
     80+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-setup.c      2008-01-11 17:06:33.000000000 +1030 
    8181@@ -0,0 +1,220 @@ 
    8282+/* 
     
    302302Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig 
    303303=================================================================== 
    304 --- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Kconfig     2008-01-09 12:49:04.000000000 +1030 
    305 +++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig  2008-01-11 13:24:01.000000000 +1030 
     304--- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Kconfig     2008-01-11 17:05:08.000000000 +1030 
     305+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Kconfig  2008-01-11 17:06:33.000000000 +1030 
    306306@@ -125,6 +125,15 @@ 
    307307        depends on ARCH_IXDP425 || MACH_IXDP465 || MACH_KIXRP435 
     
    322322Index: linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile 
    323323=================================================================== 
    324 --- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Makefile    2008-01-09 12:49:04.000000000 +1030 
    325 +++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile 2008-01-09 12:49:07.000000000 +1030 
     324--- linux-2.6.23.12-armeb.orig/arch/arm/mach-ixp4xx/Makefile    2008-01-11 17:05:08.000000000 +1030 
     325+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/Makefile 2008-01-11 17:06:33.000000000 +1030 
    326326@@ -15,6 +15,7 @@ 
    327327 obj-pci-$(CONFIG_MACH_DSMG600)         += dsmg600-pci.o 
     
    343343=================================================================== 
    344344--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    345 +++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h     2008-01-11 13:29:42.000000000 +1030 
    346 @@ -0,0 +1,58 @@ 
     345+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/fsg.h     2008-01-11 17:06:33.000000000 +1030 
     346@@ -0,0 +1,50 @@ 
    347347+/* 
    348348+ * include/asm-arm/arch-ixp4xx/fsg.h 
     
    383383+/* Buttons */ 
    384384+ 
    385 +#define FSG_SB_GPIO            4 
    386 +#define FSG_RB_GPIO            9 
    387 +#define FSG_UB_GPIO            10 
    388 + 
    389 +#define FSG_SB_IRQ             IRQ_IXP4XX_GPIO4 
    390 +#define FSG_RB_IRQ             IRQ_IXP4XX_GPIO9 
    391 +#define FSG_UB_IRQ             IRQ_IXP4XX_GPIO10 
    392 + 
    393 +#define FSG_SB_BM              (1L << FSG_SB_GPIO) 
    394 +#define FSG_RB_BM              (1L << FSG_RB_GPIO) 
    395 +#define FSG_UB_BM              (1L << FSG_UB_GPIO) 
     385+#define FSG_SB_GPIO            4       /* sync button */ 
     386+#define FSG_RB_GPIO            9       /* reset button */ 
     387+#define FSG_UB_GPIO            10      /* usb button */ 
    396388+ 
    397389+/* LEDs */ 
     
    405397Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h 
    406398=================================================================== 
    407 --- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h   2008-01-09 12:49:04.000000000 +1030 
    408 +++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h        2008-01-09 12:49:07.000000000 +1030 
     399--- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/hardware.h   2008-01-11 17:05:08.000000000 +1030 
     400+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/hardware.h        2008-01-11 17:06:33.000000000 +1030 
    409401@@ -45,5 +45,6 @@ 
    410402 #include "nslu2.h" 
     
    416408Index: linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h 
    417409=================================================================== 
    418 --- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h       2008-01-09 12:49:04.000000000 +1030 
    419 +++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h    2008-01-11 13:30:09.000000000 +1030 
     410--- linux-2.6.23.12-armeb.orig/include/asm-arm/arch-ixp4xx/irqs.h       2008-01-11 17:05:08.000000000 +1030 
     411+++ linux-2.6.23.12-armeb/include/asm-arm/arch-ixp4xx/irqs.h    2008-01-11 17:06:33.000000000 +1030 
    420412@@ -128,4 +128,11 @@ 
    421413 #define        IRQ_DSMG600_PCI_INTE    IRQ_IXP4XX_GPIO7 
     
    433425=================================================================== 
    434426--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    435 +++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c      2008-01-11 12:47:50.000000000 +1030 
    436 @@ -0,0 +1,88 @@ 
     427+++ linux-2.6.23.12-armeb/arch/arm/mach-ixp4xx/fsg-power.c      2008-01-11 17:06:33.000000000 +1030 
     428@@ -0,0 +1,89 @@ 
    437429+/* 
    438430+ * arch/arm/mach-ixp4xx/fsg-power.c 
     
    458450+#include <linux/timer.h> 
    459451+ 
     452+#include <asm/gpio.h> 
    460453+#include <asm/mach-types.h> 
    461454+ 
     
    484477+               return 0; 
    485478+ 
    486 +       set_irq_type(FSG_RB_IRQ, IRQT_LOW); 
    487 +       set_irq_type(FSG_SB_IRQ, IRQT_LOW); 
    488 + 
    489 +       if (request_irq(FSG_RB_IRQ, &fsg_reset_handler, 
     479+       set_irq_type(gpio_to_irq(FSG_RB_GPIO), IRQT_LOW); 
     480+       set_irq_type(gpio_to_irq(FSG_SB_GPIO), IRQT_LOW); 
     481+ 
     482+       if (request_irq(gpio_to_irq(FSG_RB_GPIO), &fsg_reset_handler, 
    490483+               IRQF_DISABLED, "FSG reset button", NULL) < 0) { 
    491484+ 
    492485+               printk(KERN_DEBUG "Reset Button IRQ %d not available\n", 
    493 +                       FSG_RB_IRQ); 
     486+                       gpio_to_irq(FSG_RB_GPIO)); 
    494487+ 
    495488+               return -EIO; 
    496489+       } 
    497490+ 
    498 +       if (request_irq(FSG_SB_IRQ, &fsg_power_handler, 
     491+       if (request_irq(gpio_to_irq(FSG_SB_GPIO), &fsg_power_handler, 
    499492+               IRQF_DISABLED, "FSG power button", NULL) < 0) { 
    500493+ 
    501494+               printk(KERN_DEBUG "Power Button IRQ %d not available\n", 
    502 +                       FSG_SB_IRQ); 
     495+                       gpio_to_irq(FSG_SB_GPIO)); 
    503496+ 
    504497+               return -EIO; 
     
    513506+               return; 
    514507+ 
    515 +       free_irq(FSG_SB_IRQ, NULL); 
    516 +       free_irq(FSG_RB_IRQ, NULL); 
     508+       free_irq(gpio_to_irq(FSG_SB_GPIO), NULL); 
     509+       free_irq(gpio_to_irq(FSG_RB_GPIO), NULL); 
    517510+} 
    518511+ 
     
    525518Index: linux-2.6.23.12-armeb/drivers/leds/Kconfig 
    526519=================================================================== 
    527 --- linux-2.6.23.12-armeb.orig/drivers/leds/Kconfig     2008-01-11 13:30:47.000000000 +1030 
    528 +++ linux-2.6.23.12-armeb/drivers/leds/Kconfig  2008-01-11 13:34:34.000000000 +1030 
     520--- linux-2.6.23.12-armeb.orig/drivers/leds/Kconfig     2008-01-11 17:05:08.000000000 +1030 
     521+++ linux-2.6.23.12-armeb/drivers/leds/Kconfig  2008-01-11 17:06:33.000000000 +1030 
    529522@@ -48,6 +48,12 @@ 
    530523          particular board must have LEDs and they must be connected 
     
    542535Index: linux-2.6.23.12-armeb/drivers/leds/Makefile 
    543536=================================================================== 
    544 --- linux-2.6.23.12-armeb.orig/drivers/leds/Makefile    2008-01-11 13:30:50.000000000 +1030 
    545 +++ linux-2.6.23.12-armeb/drivers/leds/Makefile 2008-01-11 13:34:34.000000000 +1030 
     537--- linux-2.6.23.12-armeb.orig/drivers/leds/Makefile    2008-01-11 17:05:08.000000000 +1030 
     538+++ linux-2.6.23.12-armeb/drivers/leds/Makefile 2008-01-11 17:06:33.000000000 +1030 
    546539@@ -9,6 +9,7 @@ 
    547540 obj-$(CONFIG_LEDS_LOCOMO)              += leds-locomo.o 
     
    555548=================================================================== 
    556549--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    557 +++ linux-2.6.23.12-armeb/drivers/leds/leds-fsg.c       2008-01-11 13:34:34.000000000 +1030 
     550+++ linux-2.6.23.12-armeb/drivers/leds/leds-fsg.c       2008-01-11 17:06:33.000000000 +1030 
    558551@@ -0,0 +1,243 @@ 
    559552+/* 
Note: See TracChangeset for help on using the changeset viewer.