Merge git://git.marvell.com/orion into devel

diff --combined arch/arm/Makefile
index 69d3038,384f6b1..260864f
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -76,6 -76,7 +76,7 @@@ tune-$(CONFIG_CPU_SA110)      :=-mtune=stron
  tune-$(CONFIG_CPU_SA1100)     :=-mtune=strongarm1100
  tune-$(CONFIG_CPU_XSCALE)     :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
  tune-$(CONFIG_CPU_XSC3)               :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
+ tune-$(CONFIG_CPU_FEROCEON)   :=$(call cc-option,-mtune=marvell-f,-mtune=xscale)
  tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
  
  ifeq ($(CONFIG_AEABI),y)
@@@ -96,6 -97,7 +97,6 @@@ textofs-y     := 0x0000800
  
   machine-$(CONFIG_ARCH_RPC)      := rpc
   machine-$(CONFIG_ARCH_EBSA110)          := ebsa110
 - machine-$(CONFIG_ARCH_CLPS7500)   := clps7500
   machine-$(CONFIG_FOOTBRIDGE)    := footbridge
   machine-$(CONFIG_ARCH_SHARK)    := shark
   machine-$(CONFIG_ARCH_SA1100)           := sa1100
@@@ -143,7 -145,6 +144,7 @@@ endi
   machine-$(CONFIG_ARCH_MSM)      := msm
   machine-$(CONFIG_ARCH_LOKI)       := loki
   machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0
 + machine-$(CONFIG_ARCH_W90X900)    := w90x900
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.

diff --combined arch/arm/mach-pxa/pcm990-baseboard.c
index 1e75154,b36cec5..3ea01e0
--- 1/arch/arm/mach-pxa/pcm990-baseboard.c
--- 2/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@@ -55,10 -55,6 +55,10 @@@ static unsigned long pcm990_pin_config[
        GPIO89_USBH1_PEN,
        /* PWM0 */
        GPIO16_PWM0_OUT,
 +
 +      /* I2C */
 +      GPIO117_I2C_SCL,
 +      GPIO118_I2C_SDA,
  };
  
  /*
@@@ -389,6 -385,7 +389,7 @@@ static struct soc_camera_link iclink[] 
                .gpio   = NR_BUILTIN_GPIO + 1,
        }, {
                .bus_id = 0, /* Must match with the camera ID above */
+               .gpio   = -ENXIO,
        }
  };