Merge branch 'renesas/boards2' into next/late

Conflicts:
	arch/arm/mach-shmobile/setup-r8a7778.c

This is a dependency for the Renesas sh-sci updates.

Signedf-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined arch/arm/mach-shmobile/board-marzen.c
index 9112faef923bb9a22f69a08621ede9f3f5601cae,9b5ed7eb0315e0c05f3dfd7aee5f9a0736552925..a3810b03297c27ecf3e55eee50b77dc4f5a3f47d
--- 1/arch/arm/mach-shmobile/board-marzen.c
--- 2/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@@ -69,7 -69,7 +69,7 @@@ static struct resource smsc911x_resourc
                .flags          = IORESOURCE_MEM,
        },
        [1] = {
-               .start          = gic_iid(0x3c), /* IRQ 1 */
+               .start          = irq_pin(1), /* IRQ 1 */
                .flags          = IORESOURCE_IRQ,
        },
  };
@@@ -213,8 -213,8 +213,8 @@@ static struct platform_device *marzen_d
  static struct usb_phy *phy;
  static int usb_power_on(struct platform_device *pdev)
  {
 -      if (!phy)
 -              return -EIO;
 +      if (IS_ERR(phy))
 +              return PTR_ERR(phy);
  
        pm_runtime_enable(&pdev->dev);
        pm_runtime_get_sync(&pdev->dev);
@@@ -226,7 -226,7 +226,7 @@@
  
  static void usb_power_off(struct platform_device *pdev)
  {
 -      if (!phy)
 +      if (IS_ERR(phy))
                return;
  
        usb_phy_shutdown(phy);
@@@ -350,7 -350,7 +350,7 @@@ static struct platform_device *marzen_l
        &ohci1_device,
  };
  
- void __init marzen_init_late(void)
+ static void __init marzen_init_late(void)
  {
        /* get usb phy */
        phy = usb_get_phy(USB_PHY_TYPE_USB2);
@@@ -405,6 -405,7 +405,7 @@@ static void __init marzen_init(void
        pinctrl_register_mappings(marzen_pinctrl_map,
                                  ARRAY_SIZE(marzen_pinctrl_map));
        r8a7779_pinmux_init();
+       r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
  
        r8a7779_add_standard_devices();
        platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));