Merge branch 'fixes' into devel

diff --combined arch/arm/Kconfig
index 35c5326311b31f18d48ac9db051f8820eacbb830,0d8fac3b03713020cf4ad3dc98eab209cbc0a5a1..e55bbd32dcac388b8034924fac8937f4a269ac4e
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -114,6 -114,9 +114,6 @@@ config GENERIC_CALIBRATE_DELA
        bool
        default y
  
 -config GENERIC_BUST_SPINLOCK
 -      bool
 -
  config ARCH_MAY_HAVE_PC_FDC
        bool
  
@@@ -244,15 -247,6 +244,15 @@@ config ARCH_IM
        help
          Support for Motorola's i.MX family of processors (MX1, MXL).
  
 +config ARCH_IOP13XX
 +      bool "IOP13xx-based"
 +      depends on MMU
 +      select PLAT_IOP
 +      select PCI
 +      select ARCH_SUPPORTS_MSI
 +      help
 +        Support for Intel's IOP13XX (XScale) family of processors.
 +
  config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
@@@ -270,12 -264,22 +270,12 @@@ config ARCH_IOP33
        help
          Support for Intel's IOP33X (XScale) family of processors.
  
 -config ARCH_IOP13XX
 -      bool "IOP13xx-based"
 -      depends on MMU
 -      select PLAT_IOP
 -      select PCI
 -      select ARCH_SUPPORTS_MSI
 -      help
 -        Support for Intel's IOP13XX (XScale) family of processors.
 -
 -config ARCH_IXP4XX
 -      bool "IXP4xx-based"
 +config ARCH_IXP23XX
 +      bool "IXP23XX-based"
        depends on MMU
 -      select GENERIC_TIME
 -      select GENERIC_CLOCKEVENTS
 +      select PCI
        help
 -        Support for Intel's IXP4XX (XScale) family of processors.
 +        Support for Intel's IXP23xx (XScale) family of processors.
  
  config ARCH_IXP2000
        bool "IXP2400/2800-based"
@@@ -284,13 -288,12 +284,13 @@@
        help
          Support for Intel's IXP2400/2800 (XScale) family of processors.
  
 -config ARCH_IXP23XX
 -      bool "IXP23XX-based"
 +config ARCH_IXP4XX
 +      bool "IXP4xx-based"
        depends on MMU
 -      select PCI
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
        help
 -        Support for Intel's IXP23xx (XScale) family of processors.
 +        Support for Intel's IXP4XX (XScale) family of processors.
  
  config ARCH_L7200
        bool "LinkUp-L7200"
@@@ -305,12 -308,6 +305,12 @@@
          If you have any questions or comments about the Linux kernel port
          to this board, send e-mail to <sjhill@cotw.com>.
  
 +config ARCH_KS8695
 +      bool "Micrel/Kendin KS8695"
 +      help
 +        Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
 +        System-on-Chip devices.
 +
  config ARCH_NS9XXX
        bool "NetSilicon NS9xxx"
        help
@@@ -357,7 -354,6 +357,6 @@@ config ARCH_SA110
  config ARCH_S3C2410
        bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442, S3C2443"
        select GENERIC_GPIO
-       select GENERIC_TIME
        help
          Samsung S3C2410X CPU based systems, such as the Simtec Electronics
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@@ -380,13 -376,6 +379,13 @@@ config ARCH_LH7A40
          core with a wide array of integrated devices for
          hand-held and low-power applications.
  
 +config ARCH_DAVINCI
 +      bool "TI DaVinci"
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      help
 +        Support for TI's DaVinci platform.
 +
  config ARCH_OMAP
        bool "TI OMAP"
        select GENERIC_GPIO
@@@ -455,10 -444,6 +454,10 @@@ source "arch/arm/mach-netx/Kconfig
  
  source "arch/arm/mach-ns9xxx/Kconfig"
  
 +source "arch/arm/mach-davinci/Kconfig"
 +
 +source "arch/arm/mach-ks8695/Kconfig"
 +
  # Definitions to make life easier
  config ARCH_ACORN
        bool
@@@ -519,7 -504,7 +518,7 @@@ config ISA_DMA_AP
        bool
  
  config PCI
 -      bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX
 +      bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695
        help
          Find out whether you have a PCI motherboard. PCI is the name of a
          bus system, i.e. the way the CPU talks to the other stuff inside
@@@ -688,8 -673,7 +687,8 @@@ config LED
                   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
                   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
                   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
 -                 ARCH_AT91 || MACH_TRIZEPS4
 +                 ARCH_AT91 || MACH_TRIZEPS4 || ARCH_DAVINCI || \
 +                 ARCH_KS8695
        help
          If you say Y here, the LEDs on your machine will be used
          to provide useful information about your current system status.

diff --combined arch/arm/mach-at91/Makefile
index 56b0d06c764bb5e2e2c0cd72eb39a2c713febb5f,cd1bc541f28e93b799500486214ad63686e5e0b4..a4d80eb056ee02f174e4a7620f495c3d21353f47
--- 1/arch/arm/mach-at91/Makefile
--- 2/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@@ -14,7 -14,6 +14,7 @@@ obj-$(CONFIG_ARCH_AT91RM9200) += at91rm
  obj-$(CONFIG_ARCH_AT91SAM9260)        += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o
  obj-$(CONFIG_ARCH_AT91SAM9261)        += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o
  obj-$(CONFIG_ARCH_AT91SAM9263)        += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o
 +obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o
  
  # AT91RM9200 board-specific support
  obj-$(CONFIG_MACH_ONEARM)     += board-1arm.o
@@@ -37,12 -36,10 +37,13 @@@ obj-$(CONFIG_MACH_AT91SAM9261EK) += boa
  # AT91SAM9263 board-specific support
  obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
  
 +# AT91SAM9RL board-specific support
 +obj-$(CONFIG_MACH_AT91SAM9RLEK)       += board-sam9rlek.o
 +
  # LEDs support
  led-$(CONFIG_ARCH_AT91RM9200DK)       += leds.o
  led-$(CONFIG_MACH_AT91RM9200EK)       += leds.o
+ led-$(CONFIG_MACH_AT91SAM9261EK)+= leds.o
  led-$(CONFIG_MACH_CSB337)     += leds.o
  led-$(CONFIG_MACH_CSB637)     += leds.o
  led-$(CONFIG_MACH_KB9200)     += leds.o

diff --combined include/asm-arm/arch-at91/hardware.h
index 0e51ad224eaa940850c14b028dc61c67b75788ad,1c14382dc3f52c5cbada40dcc2c378a7e1f703e3..46835e945aea0b875a9e5f252155c0d27355f381
--- 1/include/asm-arm/arch-at91/hardware.h
--- 2/include/asm-arm/arch-at91/hardware.h
+++ b/include/asm-arm/arch-at91/hardware.h
@@@ -24,8 -24,6 +24,8 @@@
  #include <asm/arch/at91sam9261.h>
  #elif defined(CONFIG_ARCH_AT91SAM9263)
  #include <asm/arch/at91sam9263.h>
 +#elif defined(CONFIG_ARCH_AT91SAM9RL)
 +#include <asm/arch/at91sam9rl.h>
  #else
  #error "Unsupported AT91 processor"
  #endif
@@@ -71,22 -69,5 +71,5 @@@
  /* Clocks */
  #define AT91_SLOW_CLOCK               32768           /* slow clock */
  
- #ifndef __ASSEMBLY__
- #include <asm/io.h>
- 
- static inline unsigned int at91_sys_read(unsigned int reg_offset)
- {
-       void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
- 
-       return __raw_readl(addr + reg_offset);
- }
- 
- static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
- {
-       void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
- 
-       __raw_writel(value, addr + reg_offset);
- }
- #endif
  
  #endif