package/arm/linux24-psionw/pro16.patch

   1 diff -ur linux24-psionw/arch/arm/config.in linux24-psionw-16pro/arch/arm/config.in
   2 --- linux24-psionw/arch/arm/config.in   2000-01-01 00:00:00.000000000 +0100
   3 +++ linux24-psionw-16pro/arch/arm/config.in     2006-07-29 22:47:18.000000000 +0200
   4 @@ -188,6 +188,7 @@
   5  comment 'Psion Windermere Implementations'
   6  choice 'Psion-Windermere Implementations'                    \
   7          "Psion-5MX-16MB-and-Ericsson-MC218 CONFIG_PSIONW_5MX \
   8 +         Psion-5MX-Pro-16MB CONFIG_PSIONW_5MXPRO16MB         \
   9           Psion-5MX-Pro-24MB CONFIG_PSIONW_5MXPRO24MB         \
  10           Psion-5MX-Pro-32MB CONFIG_PSIONW_5MXPRO32MB         \
  11           Psion-Revo-8MB CONFIG_PSIONW_REVO                   \
  12 diff -ur linux24-psionw/arch/arm/mach-psionw/psionw-arch.c linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c
  13 --- linux24-psionw/arch/arm/mach-psionw/psionw-arch.c   2000-01-01 00:00:00.000000000 +0100
  14 +++ linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c     2006-07-29 22:49:02.000000000 +0200
  15 @@ -48,7 +48,7 @@
  16              char **cmdline, struct meminfo *mi)
  17  {
  18
  19 -#ifdef CONFIG_PSIONW_5MX
  20 +#if defined(CONFIG_PSIONW_5MX) || defined(CONFIG_PSIONW_5MXPRO16MB)
  21         SET_BANK(0, 0xc0000000, 8 * 1024 * 1024);
  22         SET_BANK(1, 0xc1000000, 8 * 1024 * 1024);
  23         mi->nr_banks = 2;
  24 diff -ur linux24-psionw/drivers/pcmcia/psion_etna.h linux24-psionw-16pro/drivers/pcmcia/psion_etna.h
  25 --- linux24-psionw/drivers/pcmcia/psion_etna.h  2000-01-01 00:00:00.000000000 +0100
  26 +++ linux24-psionw-16pro/drivers/pcmcia/psion_etna.h    2006-07-29 22:46:38.000000000 +0200
  27 @@ -72,7 +72,7 @@
  28
  29         save_flags_cli(flags);
  30
  31 -#if defined(CONFIG_PSIONW_5MXPRO24MB) | defined(CONFIG_PSIONW_5MXPRO32MB)
  32 +#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  33         /* Set the memory wait states to PCMCIA */
  34         // FIXME5MX: Should be checked...
  35         psionw_writel(0x93930002, MEMCFG1);
  36 diff -ur linux24-psionw/include/asm-arm/hardware/psionw.h linux24-psionw-16pro/include/asm-arm/hardware/psionw.h
  37 --- linux24-psionw/include/asm-arm/hardware/psionw.h    2000-01-01 00:00:00.000000000 +0100
  38 +++ linux24-psionw-16pro/include/asm-arm/hardware/psionw.h      2006-07-29 22:46:04.000000000 +0200
  39 @@ -111,7 +111,7 @@
  40  /*
  41   * ETNA PCMCIA Controller
  42   */
  43 -#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  44 +#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  45  #define ETNA_P_BASE    0x50000000      /* ETNA controller physical base */
  46  #else
  47  #define ETNA_P_BASE    0x20000000      /* ETNA controller physical base */
  48 @@ -150,7 +150,7 @@
  49  #define ETNA_CLEAR_MASK        0xff            /* Clear ETNA interrupt */
  50  #define        ETNA_CF_IRQ     0x01            /* Enable ETNA Interrupt */
  51
  52 -#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  53 +#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  54  #define CF1_P_BASE     0x30000000      /* PCMCIA physical base */
  55  #else
  56  #define CF1_P_BASE     0x40000000      /* PCMCIA physical base */