org.handhelds.familiar/packages/linux/openslug-kernel-2.6.11.2/nslu2_2.6.11.patch

   1 diff -urN linux-2.6.11.orig/arch/arm/boot/compressed/head.S linux-2.6.11/arch/arm/boot/compressed/head.S
   2 --- linux-2.6.11.orig/arch/arm/boot/compressed/head.S   2005-03-01 21:38:25.000000000 -1000
   3 +++ linux-2.6.11/arch/arm/boot/compressed/head.S        2005-03-03 00:55:05.000000000 -1000
   4 @@ -79,6 +79,14 @@
   5                 .endm
   6                 .macro  writeb, rb
   7                 str     \rb, [r3, #0]
   8 +               .endm
   9 +#elif defined(CONFIG_ARCH_NSLU2)
  10 +               .macro  loadsp, rb
  11 +               mov     \rb, #0xc8000000
  12 +               .endm
  13 +               .macro  writeb, rb
  14 +               str     \rb, [r3, #0]
  15 +               .endm
  16  #elif defined(CONFIG_ARCH_IXP2000)
  17                 .macro  loadsp, rb
  18                 mov     \rb, #0xc0000000
  19 diff -urN linux-2.6.11.orig/arch/arm/boot/compressed/head-xscale.S linux-2.6.11/arch/arm/boot/compressed/head-xscale.S
  20 --- linux-2.6.11.orig/arch/arm/boot/compressed/head-xscale.S    2005-03-01 21:37:52.000000000 -1000
  21 +++ linux-2.6.11/arch/arm/boot/compressed/head-xscale.S 2005-03-02 01:41:31.000000000 -1000
  22 @@ -47,3 +47,8 @@
  23                 orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
  24  #endif
  25
  26 +#ifdef CONFIG_ARCH_NSLU2
  27 +               mov     r7, #(MACH_TYPE_NSLU2 & 0xff)
  28 +               orr     r7, r7, #(MACH_TYPE_NSLU2 & 0xff00)
  29 +#endif
  30 +
  31 diff -urN linux-2.6.11.orig/arch/arm/mach-ixp4xx/Kconfig linux-2.6.11/arch/arm/mach-ixp4xx/Kconfig
  32 --- linux-2.6.11.orig/arch/arm/mach-ixp4xx/Kconfig      2005-03-01 21:37:49.000000000 -1000
  33 +++ linux-2.6.11/arch/arm/mach-ixp4xx/Kconfig   2005-03-02 01:43:42.000000000 -1000
  34 @@ -43,6 +43,12 @@
  35           IXDP465 Development Platform (Also known as BMP).
  36           For more information on this platform, see Documentation/arm/IXP4xx.
  37
  38 +config ARCH_NSLU2
  39 +       bool "NSLU2"
  40 +       help
  41 +         Say 'Y' here if you want your kernel to support Linksys's
  42 +         NSLU2 NAS device. For more information on this platform,
  43 +         see http://www.nslu2-linux.org
  44
  45  #
  46  # IXCDP1100 is the exact same HW as IXDP425, but with a different machine
  47 diff -urN linux-2.6.11.orig/arch/arm/mach-ixp4xx/Makefile linux-2.6.11/arch/arm/mach-ixp4xx/Makefile
  48 --- linux-2.6.11.orig/arch/arm/mach-ixp4xx/Makefile     2005-03-01 21:37:49.000000000 -1000
  49 +++ linux-2.6.11/arch/arm/mach-ixp4xx/Makefile  2005-03-02 01:44:16.000000000 -1000
  50 @@ -9,4 +9,4 @@
  51  obj-$(CONFIG_ARCH_ADI_COYOTE)  += coyote-pci.o coyote-setup.o
  52  obj-$(CONFIG_ARCH_PRPMC1100)   += prpmc1100-pci.o prpmc1100-setup.o
  53  obj-$(CONFIG_MACH_GTWX5715)    += gtwx5715-pci.o gtwx5715-setup.o
  54 -
  55 +obj-$(CONFIG_ARCH_NSLU2)       += nslu2-pci.o nslu2-setup.o nslu2-part.o nslu2-io.o
  56 diff -urN linux-2.6.11.orig/arch/arm/tools/mach-types linux-2.6.11/arch/arm/tools/mach-types
  57 --- linux-2.6.11.orig/arch/arm/tools/mach-types 2005-03-01 21:38:08.000000000 -1000
  58 +++ linux-2.6.11/arch/arm/tools/mach-types      2005-03-02 01:44:50.000000000 -1000
  59 @@ -604,7 +604,7 @@
  60  roverp7                        MACH_ROVERP7            ROVERP7                 594
  61  pr818s                 MACH_PR818S             PR818S                  595
  62  trxpro                 MACH_TRXPRO             TRXPRO                  596
  63 -nslu2                  MACH_NSLU2              NSLU2                   597
  64 +nslu2                  ARCH_NSLU2              NSLU2                   597
  65  e400                   MACH_E400               E400                    598
  66  trab                   MACH_TRAB               TRAB                    599
  67  cmc_pu2                        MACH_CMC_PU2            CMC_PU2                 600
  68 diff -urN linux-2.6.11.orig/drivers/i2c/chips/Kconfig linux-2.6.11/drivers/i2c/chips/Kconfig
  69 --- linux-2.6.11.orig/drivers/i2c/chips/Kconfig 2005-03-01 21:38:10.000000000 -1000
  70 +++ linux-2.6.11/drivers/i2c/chips/Kconfig      2005-03-02 01:45:28.000000000 -1000
  71 @@ -370,5 +370,14 @@
  72
  73           This driver can also be built as a module.  If so, the module
  74           will be called isp1301_omap.
  75 +config SENSORS_X1205
  76 +       tristate "Xicor X1205 RTC chip"
  77 +       depends on I2C && EXPERIMENTAL
  78 +       select I2C_SENSOR
  79 +       help
  80 +         If you say yes here you get support for the Xicor x1205 RTC chip.
  81 +
  82 +         This driver can also be built as a module.  If so, the module
  83 +         will be called x1205-rtc
  84
  85  endmenu
  86 diff -urN linux-2.6.11.orig/drivers/i2c/chips/Makefile linux-2.6.11/drivers/i2c/chips/Makefile
  87 --- linux-2.6.11.orig/drivers/i2c/chips/Makefile        2005-03-01 21:38:34.000000000 -1000
  88 +++ linux-2.6.11/drivers/i2c/chips/Makefile     2005-03-02 01:45:54.000000000 -1000
  89 @@ -35,6 +35,7 @@
  90  obj-$(CONFIG_SENSORS_VIA686A)  += via686a.o
  91  obj-$(CONFIG_SENSORS_W83L785TS)        += w83l785ts.o
  92  obj-$(CONFIG_ISP1301_OMAP)     += isp1301_omap.o
  93 +obj-$(CONFIG_SENSORS_X1205)     += x1205-rtc.o
  94
  95  ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
  96  EXTRA_CFLAGS += -DDEBUG
  97 diff -urN linux-2.6.11.orig/drivers/mtd/maps/ixp4xx.c linux-2.6.11/drivers/mtd/maps/ixp4xx.c
  98 --- linux-2.6.11.orig/drivers/mtd/maps/ixp4xx.c 2005-03-01 21:37:30.000000000 -1000
  99 +++ linux-2.6.11/drivers/mtd/maps/ixp4xx.c      2005-03-02 01:46:40.000000000 -1000
 100 @@ -94,7 +94,11 @@
 101         struct resource *res;
 102  };
 103
 104 +#ifdef CONFIG_ARCH_NSLU2
 105 +static const char *probes[] = { "cmdlinepart", "RedBoot", "NSLU2", NULL };
 106 +#else
 107  static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
 108 +#endif
 109
 110  static int ixp4xx_flash_remove(struct device *_dev)
 111  {
 112 diff -urN linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/hardware.h linux-2.6.11/include/asm-arm/arch-ixp4xx/hardware.h
 113 --- linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/hardware.h    2005-03-01 21:37:51.000000000 -1000
 114 +++ linux-2.6.11/include/asm-arm/arch-ixp4xx/hardware.h 2005-03-02 17:34:46.000000000 -1000
 115 @@ -44,5 +44,6 @@
 116  #include "ixdp425.h"
 117  #include "coyote.h"
 118  #include "prpmc1100.h"
 119 +#include "nslu2.h"
 120
 121  #endif  /* _ASM_ARCH_HARDWARE_H */
 122 diff -urN linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/irqs.h linux-2.6.11/include/asm-arm/arch-ixp4xx/irqs.h
 123 --- linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/irqs.h        2005-03-01 21:38:12.000000000 -1000
 124 +++ linux-2.6.11/include/asm-arm/arch-ixp4xx/irqs.h     2005-03-02 01:49:27.000000000 -1000
 125 @@ -93,4 +93,11 @@
 126  #define        IRQ_COYOTE_PCI_SLOT1    IRQ_IXP4XX_GPIO11
 127  #define        IRQ_COYOTE_IDE          IRQ_IXP4XX_GPIO5
 128
 129 +/*
 130 + * NSLU2 board IRQs
 131 + */
 132 +#define        IRQ_NSLU2_PCI_INTA      IRQ_IXP4XX_GPIO11
 133 +#define        IRQ_NSLU2_PCI_INTB      IRQ_IXP4XX_GPIO10
 134 +#define        IRQ_NSLU2_PCI_INTC      IRQ_IXP4XX_GPIO9
 135 +
 136  #endif
 137 diff -urN linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h linux-2.6.11/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h
 138 --- linux-2.6.11.orig/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h 2005-03-01 21:37:49.000000000 -1000
 139 +++ linux-2.6.11/include/asm-arm/arch-ixp4xx/ixp4xx-regs.h      2005-03-03 02:26:29.231822000 -1000
 140 @@ -52,7 +52,7 @@
 141   * Expansion BUS Configuration registers
 142   */
 143  #define IXP4XX_EXP_CFG_BASE_PHYS       (0xC4000000)
 144 -#define IXP4XX_EXP_CFG_BASE_VIRT       (0xFFBFD000)
 145 +#define IXP4XX_EXP_CFG_BASE_VIRT       (0xFFBFE000)
 146  #define IXP4XX_EXP_CFG_REGION_SIZE     (0x00001000)
 147
 148  /*
 149 diff -urN linux-2.6.11.orig/include/linux/i2c-id.h linux-2.6.11/include/linux/i2c-id.h
 150 --- linux-2.6.11.orig/include/linux/i2c-id.h    2005-03-01 21:38:34.000000000 -1000
 151 +++ linux-2.6.11/include/linux/i2c-id.h 2005-03-02 01:50:14.000000000 -1000
 152 @@ -110,6 +110,7 @@
 153  #define I2C_DRIVERID_TDA7313   62      /* TDA7313 audio processor      */
 154  #define I2C_DRIVERID_MAX6900   63      /* MAX6900 real-time clock      */
 155  #define I2C_DRIVERID_SAA7114H  64      /* video decoder                */
 156 +#define I2C_DRIVERID_X1205     0xF0
 157
 158
 159  #define I2C_DRIVERID_EXP0      0xF0    /* experimental use id's        */