Merge branch 'rmobile-latest' of git://github.com/pmundt/linux-sh

* 'rmobile-latest' of git://github.com/pmundt/linux-sh: (21 commits)
  ARM: mach-shmobile: ag5evm needs CONFIG_I2C
  ARM: mach-shmobile: sh73a0 and AG5EVM PINT support
  ARM: mach-shmobile: Add support for PINT though INTC macros
  ARM: mach-shmobile: SDHI0 GPIO hotplug for AG5EVM
  ARM: mach-shmobile: Use common INTC IRQ code on sh73a0
  ARM: mach-shmobile: Use common INTC IRQ code on sh7372
  ARM: mach-shmobile: Use common INTC IRQ code on sh7377
  ARM: mach-shmobile: Use common INTC IRQ code on sh7367
  ARM: mach-shmobile: sh73a0 GPIO IRQ support
  ARM: sh7372 ap4evb NOR Flash USB boot fix
  ARM: mach-shmobile: sh7372 Mackerel NOR Flash USB boot fix
  sh: intc: Allow triggering on both edges for ARM SoCs
  ARM: mach-shmobile: Break out INTC IRQ code
  ARM: mach-shmobile: Kota2 SDHI0 and SDHI1 support
  ARM: mach-shmobile: Kota2 SCIFA4 and SCIFB support
  ARM: mach-shmobile: Kota2 MMCIF support
  ARM: mach-shmobile: Kota2 GPIO LEDs support
  ARM: mach-shmobile: Kota2 GPIO Keys support
  ARM: mach-shmobile: Kota2 KEYSC support
  ARM: mach-shmobile: Kota2 SCIFA2 and SMSC911X support
  ...

diff --combined arch/arm/mach-shmobile/board-ap4evb.c
index f9f66c2,7283d69..a3aa0f6
--- 1/arch/arm/mach-shmobile/board-ap4evb.c
--- 2/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -200,8 -200,8 +200,8 @@@ static struct physmap_flash_data nor_fl
  
  static struct resource nor_flash_resources[] = {
        [0]     = {
-               .start  = 0x00000000,
-               .end    = 0x08000000 - 1,
+               .start  = 0x20000000, /* CS0 shadow instead of regular CS0 */
+               .end    = 0x28000000 - 1, /* needed by USB MASK ROM boot */             
                .flags  = IORESOURCE_MEM,
        }
  };
@@@ -933,7 -933,7 +933,7 @@@ static struct platform_device ap4evb_ca
  static struct sh_csi2_client_config csi2_clients[] = {
        {
                .phy            = SH_CSI2_PHY_MAIN,
 -              .lanes          = 3,
 +              .lanes          = 0,            /* default: 2 lanes */
                .channel        = 0,
                .pdev           = &ap4evb_camera,
        },

diff --combined arch/arm/mach-shmobile/board-mackerel.c
index 6820423,6c621c2..9c5e598
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -273,8 -273,8 +273,8 @@@ static struct physmap_flash_data nor_fl
  
  static struct resource nor_flash_resources[] = {
        [0]     = {
-               .start  = 0x00000000,
-               .end    = 0x08000000 - 1,
+               .start  = 0x20000000, /* CS0 shadow instead of regular CS0 */
+               .end    = 0x28000000 - 1, /* needed by USB MASK ROM boot */
                .flags  = IORESOURCE_MEM,
        }
  };
@@@ -1223,10 -1223,9 +1223,10 @@@ static struct soc_camera_platform_info 
                .width = 640,
                .height = 480,
        },
 -      .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
 -      SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
 -      SOCAM_DATA_ACTIVE_HIGH,
 +      .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
 +      V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
 +      V4L2_MBUS_DATA_ACTIVE_HIGH,
 +      .mbus_type = V4L2_MBUS_PARALLEL,
        .set_capture = camera_set_capture,
  };