OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

72 lines
3.6 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../linux24-psionw/pro16.patch
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. diff -ur linux24-psionw/arch/arm/config.in linux24-psionw-16pro/arch/arm/config.in
  17. --- linux24-psionw/arch/arm/config.in 2000-01-01 00:00:00.000000000 +0100
  18. +++ linux24-psionw-16pro/arch/arm/config.in 2006-07-29 22:47:18.000000000 +0200
  19. @@ -188,6 +188,7 @@
  20. comment 'Psion Windermere Implementations'
  21. choice 'Psion-Windermere Implementations' \
  22. "Psion-5MX-16MB-and-Ericsson-MC218 CONFIG_PSIONW_5MX \
  23. + Psion-5MX-Pro-16MB CONFIG_PSIONW_5MXPRO16MB \
  24. Psion-5MX-Pro-24MB CONFIG_PSIONW_5MXPRO24MB \
  25. Psion-5MX-Pro-32MB CONFIG_PSIONW_5MXPRO32MB \
  26. Psion-Revo-8MB CONFIG_PSIONW_REVO \
  27. diff -ur linux24-psionw/arch/arm/mach-psionw/psionw-arch.c linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c
  28. --- linux24-psionw/arch/arm/mach-psionw/psionw-arch.c 2000-01-01 00:00:00.000000000 +0100
  29. +++ linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c 2006-07-29 22:49:02.000000000 +0200
  30. @@ -48,7 +48,7 @@
  31. char **cmdline, struct meminfo *mi)
  32. {
  33. -#ifdef CONFIG_PSIONW_5MX
  34. +#if defined(CONFIG_PSIONW_5MX) || defined(CONFIG_PSIONW_5MXPRO16MB)
  35. SET_BANK(0, 0xc0000000, 8 * 1024 * 1024);
  36. SET_BANK(1, 0xc1000000, 8 * 1024 * 1024);
  37. mi->nr_banks = 2;
  38. diff -ur linux24-psionw/drivers/pcmcia/psion_etna.h linux24-psionw-16pro/drivers/pcmcia/psion_etna.h
  39. --- linux24-psionw/drivers/pcmcia/psion_etna.h 2000-01-01 00:00:00.000000000 +0100
  40. +++ linux24-psionw-16pro/drivers/pcmcia/psion_etna.h 2006-07-29 22:46:38.000000000 +0200
  41. @@ -72,7 +72,7 @@
  42. save_flags_cli(flags);
  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. /* Set the memory wait states to PCMCIA */
  46. // FIXME5MX: Should be checked...
  47. psionw_writel(0x93930002, MEMCFG1);
  48. diff -ur linux24-psionw/include/asm-arm/hardware/psionw.h linux24-psionw-16pro/include/asm-arm/hardware/psionw.h
  49. --- linux24-psionw/include/asm-arm/hardware/psionw.h 2000-01-01 00:00:00.000000000 +0100
  50. +++ linux24-psionw-16pro/include/asm-arm/hardware/psionw.h 2006-07-29 22:46:04.000000000 +0200
  51. @@ -111,7 +111,7 @@
  52. /*
  53. * ETNA PCMCIA Controller
  54. */
  55. -#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  56. +#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  57. #define ETNA_P_BASE 0x50000000 /* ETNA controller physical base */
  58. #else
  59. #define ETNA_P_BASE 0x20000000 /* ETNA controller physical base */
  60. @@ -150,7 +150,7 @@
  61. #define ETNA_CLEAR_MASK 0xff /* Clear ETNA interrupt */
  62. #define ETNA_CF_IRQ 0x01 /* Enable ETNA Interrupt */
  63. -#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  64. +#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB)
  65. #define CF1_P_BASE 0x30000000 /* PCMCIA physical base */
  66. #else
  67. #define CF1_P_BASE 0x40000000 /* PCMCIA physical base */