Merge branch 'for-rmk' of git://git.marvell.com/orion

Merge branch 'orion-devel' into devel

diff --combined arch/arm/Kconfig
index 5f6e34925a329ed10da0a59d498e218ea957562c,2835fb5d21e2e32e757a2029fd3de5e9b2bec438..efeed65b4a66616d5fae54b35fbd0947735359ac
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -148,6 -148,7 +148,6 @@@ config ARCH_MAY_HAVE_PC_FD
  
  config ZONE_DMA
        bool
 -      default y
  
  config GENERIC_ISA_DMA
        bool
@@@ -177,11 -178,6 +177,11 @@@ config OPROFILE_MPCOR
  config OPROFILE_ARM11_CORE
        bool
  
 +config OPROFILE_ARMV7
 +      def_bool y
 +      depends on CPU_V7 && !SMP
 +      bool
 +
  endif
  
  config VECTORS_BASE
@@@ -249,7 -245,6 +249,7 @@@ config ARCH_CLPS750
        select TIMER_ACORN
        select ISA
        select NO_IOPORT
 +      select ARCH_SPARSEMEM_ENABLE
        help
          Support for the Cirrus Logic PS7500FE system-on-a-chip.
  
@@@ -311,7 -306,6 +311,7 @@@ config ARCH_IOP13X
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
 +      select VMSPLIT_1G
        help
          Support for Intel's IOP13XX (XScale) family of processors.
  
@@@ -356,7 -350,6 +356,7 @@@ config ARCH_IXP4X
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 +      select ZONE_DMA if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
  
@@@ -441,7 -434,7 +441,7 @@@ config ARCH_ORION5
        help
          Support for the following Marvell Orion 5x series SoCs:
          Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
-         Orion-2 (5281).
+         Orion-2 (5281), Orion-1-90 (6183).
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
@@@ -471,7 -464,6 +471,7 @@@ config ARCH_RP
        select HAVE_PATA_PLATFORM
        select ISA_DMA_API
        select NO_IOPORT
 +      select ARCH_SPARSEMEM_ENABLE
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -479,7 -471,9 +479,7 @@@
  config ARCH_SA1100
        bool "SA1100-based"
        select ISA
 -      select ARCH_DISCONTIGMEM_ENABLE
        select ARCH_SPARSEMEM_ENABLE
 -      select ARCH_SELECT_MEMORY_MODEL
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select GENERIC_TIME
@@@ -503,7 -497,6 +503,7 @@@ config ARCH_SHAR
        bool "Shark"
        select ISA
        select ISA_DMA
 +      select ZONE_DMA
        select PCI
        help
          Support for the StrongARM based Digital DNARD machine, also known
@@@ -511,8 -504,6 +511,8 @@@
  
  config ARCH_LH7A40X
        bool "Sharp LH7A40X"
 +      select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
 +      select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
        help
          Say Y here for systems based on one of the Sharp LH7A40X
          System on a Chip processors.  These CPUs include an ARM922T
@@@ -524,9 -515,7 +524,9 @@@ config ARCH_DAVINC
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
 +      select ARCH_REQUIRE_GPIOLIB
        select HAVE_CLK
 +      select ZONE_DMA
        help
          Support for TI's DaVinci platform.
  
@@@ -745,29 -734,6 +745,29 @@@ config SM
  
          If you don't know what to do here, say N.
  
 +choice
 +      prompt "Memory split"
 +      default VMSPLIT_3G
 +      help
 +        Select the desired split between kernel and user memory.
 +
 +        If you are not absolutely sure what you are doing, leave this
 +        option alone!
 +
 +      config VMSPLIT_3G
 +              bool "3G/1G user/kernel split"
 +      config VMSPLIT_2G
 +              bool "2G/2G user/kernel split"
 +      config VMSPLIT_1G
 +              bool "1G/3G user/kernel split"
 +endchoice
 +
 +config PAGE_OFFSET
 +      hex
 +      default 0x40000000 if VMSPLIT_1G
 +      default 0x80000000 if VMSPLIT_2G
 +      default 0xC0000000
 +
  config NR_CPUS
        int "Maximum number of CPUs (2-32)"
        range 2 32
@@@ -844,23 -810,20 +844,23 @@@ config OABI_COMPA
          UNPREDICTABLE (in fact it can be predicted that it won't work
          at all). If in doubt say Y.
  
 +config ARCH_FLATMEM_HAS_HOLES
 +      bool
 +      default y
 +      depends on FLATMEM
 +
 +# Discontigmem is deprecated
  config ARCH_DISCONTIGMEM_ENABLE
        bool
 -      default (ARCH_LH7A40X && !LH7A40X_CONTIGMEM)
 -      help
 -        Say Y to support efficient handling of discontiguous physical memory,
 -        for architectures which are either NUMA (Non-Uniform Memory Access)
 -        or have huge holes in the physical address space for other reasons.
 -        See <file:Documentation/vm/numa> for more.
  
  config ARCH_SPARSEMEM_ENABLE
        bool
  
 +config ARCH_SPARSEMEM_DEFAULT
 +      def_bool ARCH_SPARSEMEM_ENABLE
 +
  config ARCH_SELECT_MEMORY_MODEL
 -      bool
 +      def_bool ARCH_DISCONTIGMEM_ENABLE && ARCH_SPARSEMEM_ENABLE
  
  config NODES_SHIFT
        int
@@@ -877,7 -840,7 +877,7 @@@ 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_DAVINCI || \
 +                 ARCH_AT91 || ARCH_DAVINCI || \
                   ARCH_KS8695 || MACH_RD88F5182
        help
          If you say Y here, the LEDs on your machine will be used
@@@ -1037,9 -1000,9 +1037,9 @@@ config ATAGS_PRO
  
  endmenu
  
 -if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
 +menu "CPU Power Management"
  
 -menu "CPU Frequency scaling"
 +if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
  
  source "drivers/cpufreq/Kconfig"
  
@@@ -1079,12 -1042,10 +1079,12 @@@ config CPU_FREQ_PX
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
  
 -endmenu
 -
  endif
  
 +source "drivers/cpuidle/Kconfig"
 +
 +endmenu
 +
  menu "Floating point emulation"
  
  comment "At least one emulation must be selected"
@@@ -1236,8 -1197,6 +1236,8 @@@ source "drivers/power/Kconfig
  
  source "drivers/hwmon/Kconfig"
  
 +source "drivers/thermal/Kconfig"
 +
  source "drivers/watchdog/Kconfig"
  
  source "drivers/ssb/Kconfig"
@@@ -1258,10 -1217,6 +1258,10 @@@ source "drivers/usb/Kconfig
  
  source "drivers/mmc/Kconfig"
  
 +source "drivers/memstick/Kconfig"
 +
 +source "drivers/accessibility/Kconfig"
 +
  source "drivers/leds/Kconfig"
  
  source "drivers/rtc/Kconfig"
@@@ -1270,8 -1225,6 +1270,8 @@@ source "drivers/dma/Kconfig
  
  source "drivers/dca/Kconfig"
  
 +source "drivers/auxdisplay/Kconfig"
 +
  source "drivers/regulator/Kconfig"
  
  source "drivers/uio/Kconfig"

diff --combined arch/arm/configs/orion5x_defconfig
index 4017d83c9d2de983ba4d1bcf3135b21a65f3fbb2,06760f26eacea998573f722c8b52c52b70534b63..b2456ca544c9ef0bc9971198dd9f544439b93ee9
--- 1/arch/arm/configs/orion5x_defconfig
--- 2/arch/arm/configs/orion5x_defconfig
+++ b/arch/arm/configs/orion5x_defconfig
@@@ -1,7 -1,7 +1,7 @@@
  #
  # Automatically generated make config: don't edit
 -# Linux kernel version: 2.6.26-rc4
 -# Mon Jun  2 23:54:48 2008
 +# Linux kernel version: 2.6.27-rc4
 +# Fri Aug 22 12:38:51 2008
  #
  CONFIG_ARM=y
  CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@@ -12,7 -12,6 +12,7 @@@ CONFIG_MMU=
  # CONFIG_NO_IOPORT is not set
  CONFIG_GENERIC_HARDIRQS=y
  CONFIG_STACKTRACE_SUPPORT=y
 +CONFIG_HAVE_LATENCYTOP_SUPPORT=y
  CONFIG_LOCKDEP_SUPPORT=y
  CONFIG_TRACE_IRQFLAGS_SUPPORT=y
  CONFIG_HARDIRQS_SW_RESEND=y
@@@ -24,7 -23,6 +24,7 @@@ CONFIG_GENERIC_HWEIGHT=
  CONFIG_GENERIC_CALIBRATE_DELAY=y
  CONFIG_ARCH_SUPPORTS_AOUT=y
  CONFIG_ZONE_DMA=y
 +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
  CONFIG_VECTORS_BASE=0xffff0000
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
@@@ -58,6 -56,7 +58,6 @@@ CONFIG_SYSCTL=
  CONFIG_EMBEDDED=y
  CONFIG_UID16=y
  CONFIG_SYSCTL_SYSCALL=y
 -CONFIG_SYSCTL_SYSCALL_CHECK=y
  CONFIG_KALLSYMS=y
  CONFIG_KALLSYMS_ALL=y
  # CONFIG_KALLSYMS_EXTRA_PASS is not set
@@@ -84,17 -83,11 +84,17 @@@ CONFIG_PROFILING=
  CONFIG_OPROFILE=y
  CONFIG_HAVE_OPROFILE=y
  CONFIG_KPROBES=y
 +# CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS is not set
  CONFIG_KRETPROBES=y
 +# CONFIG_HAVE_IOREMAP_PROT is not set
  CONFIG_HAVE_KPROBES=y
  CONFIG_HAVE_KRETPROBES=y
 +# CONFIG_HAVE_ARCH_TRACEHOOK is not set
  # CONFIG_HAVE_DMA_ATTRS is not set
 +# CONFIG_USE_GENERIC_SMP_HELPERS is not set
 +# CONFIG_HAVE_CLK is not set
  CONFIG_PROC_PAGE_MONITOR=y
 +CONFIG_HAVE_GENERIC_DMA_COHERENT=y
  CONFIG_RT_MUTEXES=y
  # CONFIG_TINY_SHMEM is not set
  CONFIG_BASE_SMALL=0
@@@ -104,13 -97,12 +104,13 @@@ CONFIG_MODULE_UNLOAD=
  # CONFIG_MODULE_FORCE_UNLOAD is not set
  # CONFIG_MODVERSIONS is not set
  # CONFIG_MODULE_SRCVERSION_ALL is not set
 -# CONFIG_KMOD is not set
 +CONFIG_KMOD=y
  CONFIG_BLOCK=y
  # CONFIG_LBD is not set
  # CONFIG_BLK_DEV_IO_TRACE is not set
  # CONFIG_LSF is not set
  # CONFIG_BLK_DEV_BSG is not set
 +# CONFIG_BLK_DEV_INTEGRITY is not set
  
  #
  # IO Schedulers
@@@ -136,6 -128,7 +136,6 @@@ CONFIG_CLASSIC_RCU=
  # CONFIG_ARCH_AT91 is not set
  # CONFIG_ARCH_CLPS7500 is not set
  # CONFIG_ARCH_CLPS711X is not set
 -# CONFIG_ARCH_CO285 is not set
  # CONFIG_ARCH_EBSA110 is not set
  # CONFIG_ARCH_EP93XX is not set
  # CONFIG_ARCH_FOOTBRIDGE is not set
@@@ -149,11 -142,8 +149,11 @@@
  # CONFIG_ARCH_IXP2000 is not set
  # CONFIG_ARCH_IXP4XX is not set
  # CONFIG_ARCH_L7200 is not set
 +# CONFIG_ARCH_KIRKWOOD is not set
  # CONFIG_ARCH_KS8695 is not set
  # CONFIG_ARCH_NS9XXX is not set
 +# CONFIG_ARCH_LOKI is not set
 +# CONFIG_ARCH_MV78XX0 is not set
  # CONFIG_ARCH_MXC is not set
  CONFIG_ARCH_ORION5X=y
  # CONFIG_ARCH_PNX4008 is not set
@@@ -176,14 -166,17 +176,17 @@@ CONFIG_MACH_KUROBOX_PRO=
  CONFIG_MACH_DNS323=y
  CONFIG_MACH_TS209=y
  CONFIG_MACH_LINKSTATION_PRO=y
+ CONFIG_MACH_LINKSTATION_MINI=y
  CONFIG_MACH_TS409=y
  CONFIG_MACH_WRT350N_V2=y
  CONFIG_MACH_TS78XX=y
  CONFIG_MACH_MV2120=y
+ CONFIG_MACH_EDMINI_V2=y
  CONFIG_MACH_MSS2=y
  CONFIG_MACH_WNR854T=y
  CONFIG_MACH_RD88F5181L_GE=y
  CONFIG_MACH_RD88F5181L_FXO=y
+ CONFIG_MACH_RD88F6183AP_GE=y
  
  #
  # Boot options
@@@ -205,7 -198,7 +208,7 @@@ CONFIG_CPU_ABRT_EV5T=
  CONFIG_CPU_PABRT_NOIFAR=y
  CONFIG_CPU_CACHE_VIVT=y
  CONFIG_CPU_COPY_FEROCEON=y
 -CONFIG_CPU_TLB_V4WBI=y
 +CONFIG_CPU_TLB_FEROCEON=y
  CONFIG_CPU_CP15=y
  CONFIG_CPU_CP15_MMU=y
  
@@@ -290,6 -283,10 +293,6 @@@ CONFIG_BINFMT_ELF=
  #
  # CONFIG_PM is not set
  CONFIG_ARCH_SUSPEND_POSSIBLE=y
 -
 -#
 -# Networking
 -#
  CONFIG_NET=y
  
  #
@@@ -367,7 -364,6 +370,7 @@@ CONFIG_NET_PKTGEN=
  #
  # CONFIG_CFG80211 is not set
  CONFIG_WIRELESS_EXT=y
 +CONFIG_WIRELESS_EXT_SYSFS=y
  # CONFIG_MAC80211 is not set
  # CONFIG_IEEE80211 is not set
  # CONFIG_RFKILL is not set
@@@ -384,8 -380,6 +387,8 @@@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplu
  CONFIG_STANDALONE=y
  CONFIG_PREVENT_FIRMWARE_BUILD=y
  CONFIG_FW_LOADER=y
 +# CONFIG_FIRMWARE_IN_KERNEL is not set
 +CONFIG_EXTRA_FIRMWARE=""
  # CONFIG_DEBUG_DRIVER is not set
  # CONFIG_DEBUG_DEVRES is not set
  # CONFIG_SYS_HYPERVISOR is not set
@@@ -508,7 -502,6 +511,7 @@@ CONFIG_MISC_DEVICES=
  # CONFIG_SGI_IOC4 is not set
  # CONFIG_TIFM_CORE is not set
  # CONFIG_ENCLOSURE_SERVICES is not set
 +# CONFIG_HP_ILO is not set
  CONFIG_HAVE_IDE=y
  # CONFIG_IDE is not set
  
@@@ -585,7 -578,6 +588,7 @@@ CONFIG_SCSI_LOWLEVEL=
  # CONFIG_SCSI_NSP32 is not set
  # CONFIG_SCSI_DEBUG is not set
  # CONFIG_SCSI_SRP is not set
 +# CONFIG_SCSI_DH is not set
  CONFIG_ATA=y
  # CONFIG_ATA_NONSTANDARD is not set
  CONFIG_SATA_PMP=y
@@@ -652,14 -644,11 +655,14 @@@ CONFIG_SATA_MV=
  #
  # IEEE 1394 (FireWire) support
  #
 +
 +#
 +# Enable only one of the two stacks, unless you know what you are doing
 +#
  # CONFIG_FIREWIRE is not set
  # CONFIG_IEEE1394 is not set
  # CONFIG_I2O is not set
  CONFIG_NETDEVICES=y
 -# CONFIG_NETDEVICES_MULTIQUEUE is not set
  # CONFIG_DUMMY is not set
  # CONFIG_BONDING is not set
  # CONFIG_MACVLAN is not set
@@@ -708,6 -697,7 +711,6 @@@ CONFIG_NETDEV_1000=
  # CONFIG_DL2K is not set
  # CONFIG_E1000 is not set
  # CONFIG_E1000E is not set
 -# CONFIG_E1000E_ENABLED is not set
  # CONFIG_IP1000 is not set
  # CONFIG_IGB is not set
  # CONFIG_NS83820 is not set
@@@ -723,7 -713,6 +726,7 @@@
  CONFIG_MV643XX_ETH=y
  # CONFIG_QLA3XXX is not set
  # CONFIG_ATL1 is not set
 +# CONFIG_ATL1E is not set
  # CONFIG_NETDEV_10000 is not set
  # CONFIG_TR is not set
  
@@@ -829,65 -818,44 +832,65 @@@ CONFIG_DEVPORT=
  CONFIG_I2C=y
  CONFIG_I2C_BOARDINFO=y
  CONFIG_I2C_CHARDEV=y
 +CONFIG_I2C_HELPER_AUTO=y
  
  #
  # I2C Hardware Bus support
  #
 +
 +#
 +# PC SMBus host controller drivers
 +#
  # CONFIG_I2C_ALI1535 is not set
  # CONFIG_I2C_ALI1563 is not set
  # CONFIG_I2C_ALI15X3 is not set
  # CONFIG_I2C_AMD756 is not set
  # CONFIG_I2C_AMD8111 is not set
 -# CONFIG_I2C_GPIO is not set
  # CONFIG_I2C_I801 is not set
 -# CONFIG_I2C_I810 is not set
 +# CONFIG_I2C_ISCH is not set
  # CONFIG_I2C_PIIX4 is not set
  # CONFIG_I2C_NFORCE2 is not set
 -# CONFIG_I2C_OCORES is not set
 -# CONFIG_I2C_PARPORT_LIGHT is not set
 -# CONFIG_I2C_PROSAVAGE is not set
 -# CONFIG_I2C_SAVAGE4 is not set
 -# CONFIG_I2C_SIMTEC is not set
  # CONFIG_I2C_SIS5595 is not set
  # CONFIG_I2C_SIS630 is not set
  # CONFIG_I2C_SIS96X is not set
 -# CONFIG_I2C_TAOS_EVM is not set
 -# CONFIG_I2C_STUB is not set
 -# CONFIG_I2C_TINY_USB is not set
  # CONFIG_I2C_VIA is not set
  # CONFIG_I2C_VIAPRO is not set
 +
 +#
 +# I2C system bus drivers (mostly embedded / system-on-chip)
 +#
 +# CONFIG_I2C_GPIO is not set
 +CONFIG_I2C_MV64XXX=y
 +# CONFIG_I2C_OCORES is not set
 +# CONFIG_I2C_SIMTEC is not set
 +
 +#
 +# External I2C/SMBus adapter drivers
 +#
 +# CONFIG_I2C_PARPORT_LIGHT is not set
 +# CONFIG_I2C_TAOS_EVM is not set
 +# CONFIG_I2C_TINY_USB is not set
 +
 +#
 +# Graphics adapter I2C/DDC channel drivers
 +#
  # CONFIG_I2C_VOODOO3 is not set
 +
 +#
 +# Other I2C/SMBus bus drivers
 +#
  # CONFIG_I2C_PCA_PLATFORM is not set
 -CONFIG_I2C_MV64XXX=y
 +# CONFIG_I2C_STUB is not set
  
  #
  # Miscellaneous I2C Chip support
  #
  # CONFIG_DS1682 is not set
 +# CONFIG_AT24 is not set
  # CONFIG_SENSORS_EEPROM is not set
  # CONFIG_SENSORS_PCF8574 is not set
  # CONFIG_PCF8575 is not set
 +# CONFIG_SENSORS_PCA9539 is not set
  # CONFIG_SENSORS_PCF8591 is not set
  # CONFIG_SENSORS_MAX6875 is not set
  # CONFIG_SENSORS_TSL2550 is not set
@@@ -900,7 -868,6 +903,7 @@@
  # CONFIG_POWER_SUPPLY is not set
  CONFIG_HWMON=y
  # CONFIG_HWMON_VID is not set
 +# CONFIG_SENSORS_AD7414 is not set
  # CONFIG_SENSORS_AD7418 is not set
  # CONFIG_SENSORS_ADM1021 is not set
  # CONFIG_SENSORS_ADM1025 is not set
@@@ -920,7 -887,7 +923,7 @@@
  # CONFIG_SENSORS_GL520SM is not set
  # CONFIG_SENSORS_IT87 is not set
  # CONFIG_SENSORS_LM63 is not set
 -# CONFIG_SENSORS_LM75 is not set
 +CONFIG_SENSORS_LM75=y
  # CONFIG_SENSORS_LM77 is not set
  # CONFIG_SENSORS_LM78 is not set
  # CONFIG_SENSORS_LM80 is not set
@@@ -964,12 -931,9 +967,12 @@@ CONFIG_SSB_POSSIBLE=
  #
  # Multifunction device drivers
  #
 +# CONFIG_MFD_CORE is not set
  # CONFIG_MFD_SM501 is not set
 -# CONFIG_MFD_ASIC3 is not set
  # CONFIG_HTC_PASIC3 is not set
 +# CONFIG_MFD_TMIO is not set
 +# CONFIG_MFD_T7L66XB is not set
 +# CONFIG_MFD_TC6387XB is not set
  
  #
  # Multimedia devices
@@@ -1000,6 -964,10 +1003,6 @@@
  # Display device support
  #
  # CONFIG_DISPLAY_SUPPORT is not set
 -
 -#
 -# Sound
 -#
  # CONFIG_SOUND is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
@@@ -1030,7 -998,6 +1033,7 @@@ CONFIG_USB_DEVICE_CLASS=
  # CONFIG_USB_OTG is not set
  # CONFIG_USB_OTG_WHITELIST is not set
  # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 +# CONFIG_USB_MON is not set
  
  #
  # USB Host Controller Drivers
@@@ -1073,7 -1040,6 +1076,7 @@@ CONFIG_USB_STORAGE_JUMPSHOT=
  # CONFIG_USB_STORAGE_ALAUDA is not set
  # CONFIG_USB_STORAGE_ONETOUCH is not set
  # CONFIG_USB_STORAGE_KARMA is not set
 +# CONFIG_USB_STORAGE_SIERRA is not set
  # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
  # CONFIG_USB_LIBUSUAL is not set
  
@@@ -1082,6 -1048,7 +1085,6 @@@
  #
  # CONFIG_USB_MDC800 is not set
  # CONFIG_USB_MICROTEK is not set
 -# CONFIG_USB_MON is not set
  
  #
  # USB port drivers
@@@ -1094,6 -1061,7 +1097,6 @@@
  # CONFIG_USB_EMI62 is not set
  # CONFIG_USB_EMI26 is not set
  # CONFIG_USB_ADUTUX is not set
 -# CONFIG_USB_AUERSWALD is not set
  # CONFIG_USB_RIO500 is not set
  # CONFIG_USB_LEGOTOWER is not set
  # CONFIG_USB_LCD is not set
@@@ -1119,9 -1087,7 +1122,9 @@@ CONFIG_LEDS_CLASS=
  #
  # LED drivers
  #
 +# CONFIG_LEDS_PCA9532 is not set
  CONFIG_LEDS_GPIO=y
 +# CONFIG_LEDS_PCA955X is not set
  
  #
  # LED Triggers
@@@ -1160,7 -1126,6 +1163,7 @@@ CONFIG_RTC_DRV_PCF8563=
  CONFIG_RTC_DRV_M41T80=y
  # CONFIG_RTC_DRV_M41T80_WDT is not set
  CONFIG_RTC_DRV_S35390A=y
 +# CONFIG_RTC_DRV_FM3130 is not set
  
  #
  # SPI RTC drivers
@@@ -1181,27 -1146,6 +1184,27 @@@
  #
  # on-CPU RTC drivers
  #
 +CONFIG_DMADEVICES=y
 +
 +#
 +# DMA Devices
 +#
 +CONFIG_MV_XOR=y
 +CONFIG_DMA_ENGINE=y
 +
 +#
 +# DMA Clients
 +#
 +# CONFIG_NET_DMA is not set
 +# CONFIG_DMATEST is not set
 +
 +#
 +# Voltage and Current regulators
 +#
 +# CONFIG_REGULATOR is not set
 +# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 +# CONFIG_REGULATOR_BQ24022 is not set
  # CONFIG_UIO is not set
  
  #
@@@ -1281,7 -1225,6 +1284,7 @@@ CONFIG_JFFS2_RTIME=
  CONFIG_CRAMFS=y
  # CONFIG_VXFS_FS is not set
  # CONFIG_MINIX_FS is not set
 +# CONFIG_OMFS_FS is not set
  # CONFIG_HPFS_FS is not set
  # CONFIG_QNX4FS_FS is not set
  # CONFIG_ROMFS_FS is not set
@@@ -1292,12 -1235,13 +1295,12 @@@ CONFIG_NFS_FS=
  CONFIG_NFS_V3=y
  # CONFIG_NFS_V3_ACL is not set
  # CONFIG_NFS_V4 is not set
 -# CONFIG_NFSD is not set
  CONFIG_ROOT_NFS=y
 +# CONFIG_NFSD is not set
  CONFIG_LOCKD=y
  CONFIG_LOCKD_V4=y
  CONFIG_NFS_COMMON=y
  CONFIG_SUNRPC=y
 -# CONFIG_SUNRPC_BIND34 is not set
  # CONFIG_RPCSEC_GSS_KRB5 is not set
  # CONFIG_RPCSEC_GSS_SPKM3 is not set
  # CONFIG_SMB_FS is not set
@@@ -1383,8 -1327,6 +1386,8 @@@ CONFIG_MAGIC_SYSRQ=
  CONFIG_DEBUG_KERNEL=y
  # CONFIG_DEBUG_SHIRQ is not set
  CONFIG_DETECT_SOFTLOCKUP=y
 +# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
 +CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
  CONFIG_SCHED_DEBUG=y
  CONFIG_SCHEDSTATS=y
  # CONFIG_TIMER_STATS is not set
@@@ -1399,13 -1341,11 +1402,13 @@@ CONFIG_DEBUG_PREEMPT=
  # CONFIG_LOCK_STAT is not set
  # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
  # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 +CONFIG_STACKTRACE=y
  # CONFIG_DEBUG_KOBJECT is not set
  # CONFIG_DEBUG_BUGVERBOSE is not set
  CONFIG_DEBUG_INFO=y
  # CONFIG_DEBUG_VM is not set
  # CONFIG_DEBUG_WRITECOUNT is not set
 +# CONFIG_DEBUG_MEMORY_INIT is not set
  # CONFIG_DEBUG_LIST is not set
  # CONFIG_DEBUG_SG is not set
  CONFIG_FRAME_POINTER=y
@@@ -1415,18 -1355,7 +1418,18 @@@
  # CONFIG_BACKTRACE_SELF_TEST is not set
  # CONFIG_LKDTM is not set
  # CONFIG_FAULT_INJECTION is not set
 +CONFIG_LATENCYTOP=y
 +CONFIG_SYSCTL_SYSCALL_CHECK=y
 +CONFIG_HAVE_FTRACE=y
 +CONFIG_HAVE_DYNAMIC_FTRACE=y
 +# CONFIG_FTRACE is not set
 +# CONFIG_IRQSOFF_TRACER is not set
 +# CONFIG_PREEMPT_TRACER is not set
 +# CONFIG_SCHED_TRACER is not set
 +# CONFIG_CONTEXT_SWITCH_TRACER is not set
  # CONFIG_SAMPLES is not set
 +CONFIG_HAVE_ARCH_KGDB=y
 +# CONFIG_KGDB is not set
  CONFIG_DEBUG_USER=y
  CONFIG_DEBUG_ERRORS=y
  # CONFIG_DEBUG_STACK_USAGE is not set
@@@ -1439,7 -1368,6 +1442,7 @@@ CONFIG_DEBUG_LL=
  # CONFIG_KEYS is not set
  # CONFIG_SECURITY is not set
  # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 +CONFIG_ASYNC_CORE=y
  CONFIG_CRYPTO=y
  
  #
@@@ -1485,10 -1413,6 +1488,10 @@@ CONFIG_CRYPTO_PCBC=
  # CONFIG_CRYPTO_MD4 is not set
  # CONFIG_CRYPTO_MD5 is not set
  # CONFIG_CRYPTO_MICHAEL_MIC is not set
 +# CONFIG_CRYPTO_RMD128 is not set
 +# CONFIG_CRYPTO_RMD160 is not set
 +# CONFIG_CRYPTO_RMD256 is not set
 +# CONFIG_CRYPTO_RMD320 is not set
  # CONFIG_CRYPTO_SHA1 is not set
  # CONFIG_CRYPTO_SHA256 is not set
  # CONFIG_CRYPTO_SHA512 is not set
@@@ -1530,7 -1454,6 +1533,7 @@@ CONFIG_BITREVERSE=
  # CONFIG_GENERIC_FIND_NEXT_BIT is not set
  # CONFIG_CRC_CCITT is not set
  # CONFIG_CRC16 is not set
 +CONFIG_CRC_T10DIF=y
  CONFIG_CRC_ITU_T=m
  CONFIG_CRC32=y
  # CONFIG_CRC7 is not set

diff --combined arch/arm/mach-orion5x/common.h
index 0bd195551a27b08774de9a9491c5a8a4ea7c9cc5,af9588d23f29884d61b7a1afdc2d0469a95c0aed..1f8b2da676a5e86187cb8b6dcd92a5d278d83f26
--- 1/arch/arm/mach-orion5x/common.h
--- 2/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@@ -10,6 -10,7 +10,7 @@@ struct mv_sata_platform_data
  void orion5x_map_io(void);
  void orion5x_init_irq(void);
  void orion5x_init(void);
+ extern int orion5x_tclk;
  extern struct sys_timer orion5x_timer;
  
  /*
@@@ -30,6 -31,7 +31,7 @@@ void orion5x_ehci1_init(void)
  void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);
  void orion5x_i2c_init(void);
  void orion5x_sata_init(struct mv_sata_platform_data *sata_data);
+ void orion5x_spi_init(void);
  void orion5x_uart0_init(void);
  void orion5x_uart1_init(void);
  void orion5x_xor_init(void);
@@@ -41,7 -43,6 +43,7 @@@ struct pci_bus
  struct pci_sys_data;
  
  void orion5x_pcie_id(u32 *dev, u32 *rev);
 +void orion5x_pci_disable(void);
  void orion5x_pci_set_cardbus_mode(void);
  int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys);
  struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);

diff --combined arch/arm/mach-orion5x/kurobox_pro-setup.c
index e321ec331839c1f8e68959bbe8a3ff1e44030f54,171ffaf98ddfe8111d16fca7e089d05660b0dc94..c5bd54d8aa0c0bbceb65c1ed3aa59c05e36765f4
--- 1/arch/arm/mach-orion5x/kurobox_pro-setup.c
--- 2/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@@ -146,10 -146,8 +146,10 @@@ static struct hw_pci kurobox_pro_pci __
  
  static int __init kurobox_pro_pci_init(void)
  {
 -      if (machine_is_kurobox_pro())
 +      if (machine_is_kurobox_pro()) {
 +              orion5x_pci_disable();
                pci_common_init(&kurobox_pro_pci);
 +      }
  
        return 0;
  }
@@@ -293,7 -291,7 +293,7 @@@ static void kurobox_pro_power_off(void
        const unsigned char shutdownwait[]      = {0x00, 0x0c};
        const unsigned char poweroff[]          = {0x00, 0x06};
        /* 38400 baud divisor */
-       const unsigned divisor = ((ORION5X_TCLK + (8 * 38400)) / (16 * 38400));
+       const unsigned divisor = ((orion5x_tclk + (8 * 38400)) / (16 * 38400));
  
        pr_info("%s: triggering power-off...\n", __func__);
  

diff --combined arch/arm/mm/proc-feroceon.S
index 2b8bb383755e66a6cfdbbabebcd1a7b757e6b7fe,207392f1ce8a15ae0cbf214fe4d818ebceffae17..0fe1f8fc348802777a02e42da50c58f56e2a2d9e
--- 1/arch/arm/mm/proc-feroceon.S
--- 2/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@@ -22,7 -22,7 +22,7 @@@
  #include <linux/linkage.h>
  #include <linux/init.h>
  #include <asm/assembler.h>
 -#include <asm/elf.h>
 +#include <asm/hwcap.h>
  #include <asm/pgtable-hwdef.h>
  #include <asm/pgtable.h>
  #include <asm/page.h>
@@@ -80,7 -80,8 +80,8 @@@ ENTRY(cpu_feroceon_proc_fin
        msr     cpsr_c, ip
        bl      feroceon_flush_kern_cache_all
  
- #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH)
+ #if defined(CONFIG_CACHE_FEROCEON_L2) && \
+       !defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
        mov     r0, #0
        mcr     p15, 1, r0, c15, c9, 0          @ clean L2
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB
@@@ -389,7 -390,8 +390,8 @@@ ENTRY(feroceon_range_cache_fns
  
        .align  5
  ENTRY(cpu_feroceon_dcache_clean_area)
- #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH)
+ #if defined(CONFIG_CACHE_FEROCEON_L2) && \
+       !defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
        mov     r2, r0
        mov     r3, r1
  #endif
@@@ -397,7 -399,8 +399,8 @@@
        add     r0, r0, #CACHE_DLINESIZE
        subs    r1, r1, #CACHE_DLINESIZE
        bhi     1b
- #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH)
+ #if defined(CONFIG_CACHE_FEROCEON_L2) && \
+       !defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
  1:    mcr     p15, 1, r2, c15, c9, 1          @ clean L2 entry
        add     r2, r2, #CACHE_DLINESIZE
        subs    r3, r3, #CACHE_DLINESIZE
@@@ -446,10 -449,28 +449,11 @@@ ENTRY(cpu_feroceon_switch_mm
        .align  5
  ENTRY(cpu_feroceon_set_pte_ext)
  #ifdef CONFIG_MMU
 -      str     r1, [r0], #-2048                @ linux version
 -
 -      eor     r1, r1, #L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_WRITE | L_PTE_DIRTY
 -
 -      bic     r2, r1, #PTE_SMALL_AP_MASK
 -      bic     r2, r2, #PTE_TYPE_MASK
 -      orr     r2, r2, #PTE_TYPE_SMALL
 -
 -      tst     r1, #L_PTE_USER                 @ User?
 -      orrne   r2, r2, #PTE_SMALL_AP_URO_SRW
 -
 -      tst     r1, #L_PTE_WRITE | L_PTE_DIRTY  @ Write and Dirty?
 -      orreq   r2, r2, #PTE_SMALL_AP_UNO_SRW
 -
 -      tst     r1, #L_PTE_PRESENT | L_PTE_YOUNG        @ Present and Young?
 -      movne   r2, #0
 -
 -      str     r2, [r0]                        @ hardware version
 +      armv3_set_pte_ext wc_disable=0
        mov     r0, r0
        mcr     p15, 0, r0, c7, c10, 1          @ clean D entry
- #if defined(CONFIG_CACHE_FEROCEON_L2) && !defined(CONFIG_L2_CACHE_WRITETHROUGH)
+ #if defined(CONFIG_CACHE_FEROCEON_L2) && \
+       !defined(CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH)
        mcr     p15, 1, r0, c15, c9, 1          @ clean L2 entry
  #endif
        mcr     p15, 0, r0, c7, c10, 4          @ drain WB