Merge branch 'next/soc' into for-next

* next/soc:
  ARM: shmobile: BOCK-W: add USB support
  ARM: shmobile: r8a7778: add USB support
  phy-rcar-usb: add R8A7778 support
  phy-rcar-usb: handle platform data
  ARM: shmobile: Marzen: pass platform data to USB PHY device
  phy-rcar-usb: add platform data
  phy-rcar-usb: correct base address
  ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource
  phy-rcar-usb: remove EHCI internal buffer setup
  ARM: shmobile: r8a7779: setup EHCI internal buffer
  ehci-platform: add pre_setup() method to platform data
  ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code

Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/board-marzen.c

diff --cc arch/arm/arm-soc-for-next-contents.txt
index f9c84cedd7e37da94ee5fe0458637d82a99b9d82,0000000000000000000000000000000000000000..5460116cd46e4cad6548a4a3be7cbf505ce983ad
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,168 -1,0 +1,170 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +depends/rmk-devel-stable
 +      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +      sirf/fixes-non-critical
 +              git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +      omap/fixes-non-critical
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed           
 +      davinci/board
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/board
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +      omap/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
 +      mvebu/cleanup4
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +      vexpress/dual-cluster
 +              git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +              depends on depends/rmk-devel-stable
 +              +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +      zynq/clk
 +              git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +      mvebu/pcie-kirkwood2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +      renesas/pinmux-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +      clps711x/soc
 +              patches
 +                      GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +                      GPIO: clps711x: Add DT support
 +                      ARM: clps711x: Re-add GPIO support
 +                      ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +                      ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +                      ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +                      ARM: clps711x: autcpu12: Add support for NOR flash
 +                      ARM: clps711x: autcpu12: Special driver for handling memory is re
 +                      ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +                      ARM: clps711x: p720t: Define PLD registers as GPIOs
 +                      ARM: clps711x: Move specific definitions from hardware.h to board
 +                      ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +                      ARM: clps711x: Add clocksource framework
 +                      ARM: clps711x: Optimize interrupt handling
 +                      ARM: clps711x: edb7211: Add support for I2C
 +                      ARM: clps711x: edb7211: Control LCD backlight via PWM
 +                      ARM: clps711x: Add support for SYSCON driver
 +                      ARM: clps711x: Update defconfig
 +      patches
 +              ARM: socfpga: Add support to gate peripheral clocks
 +              ARM: socfpga: Add syscon to be part of socfpga
 +      samsung/s3c24xx-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +      omap/pm
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
 +      omap/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      omap/omap5
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
 +      mvebu/regmap
 +              git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11
 +                      depends on cleanup and fixes-non-critical branches
++      renesas/usb
++              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-phy-rcar-usb-for-v3.11
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +              depends on renesas/pinmux-gpio
 +              depends on renesas/soc
 +      ux500/core
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-for-arm-soc
 +      ux500/pinctrl
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-pinctrl-for-arm-soc
 +      patch
 +              "ARM: ux500: board-mop500: remove unused pin modes"
 +      bcm2835/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-defconfig
 +      renesas/defconfig2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.11
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +      patch
 +              "ARM: nomadik: fix clocksource warning"
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      vt8500/dt
 +              git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +      cleanup/dts-cpus
 +              git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +      patch
 +              "ARM: dts: add missing cpu #address-cell values"
 +      mvebu/dt4
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +      patches
 +              ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +              ARM: socfpga: dts: Add gate-clock bindings
 +      samsung/s3c24xx-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
 +      samsung/exynos-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
 +      mvebu/dt5
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-arm-soc
 +      bcm2835/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-dt
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +      timer/dw_apb_timer_of
 +              git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +      samsung/s3c24xx-drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1
 +      omap/gpmc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      ux500/clksrc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-clksrc-for-arm-soc
 +      ux500/dma540_2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc-2
 +
 +next/mailbox:
 +      mailbox/subsystem
 +              git://github.com/sumananna/mailbox.git dbx500-prcmu-mailbox
 +
 +

diff --cc arch/arm/mach-shmobile/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/board-bockw.c
index 2b6103e55c34d6911e83c1e06cb5d78ff5809580,7ed2401b899c05044d2e8471545571711dc9d515..3cf3f08fca68b02d3dc5d64111f0499fb684e523
--- 1/arch/arm/mach-shmobile/board-bockw.c
--- 2/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@@ -56,31 -38,24 +56,37 @@@ static struct resource smsc911x_resourc
        DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
  };
  
 +/* SDHI */
 +static struct sh_mobile_sdhi_info sdhi0_info = {
 +      .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
 +      .tmio_ocr_mask  = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
 +      .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
 +};
 +
+ static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
+ 
  static const struct pinctrl_map bockw_pinctrl_map[] = {
        /* SCIF0 */
        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
                                  "scif0_data_a", "scif0"),
        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
                                  "scif0_ctrl", "scif0"),
 +      /* SDHI0 */
 +      PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
 +                                "sdhi0", "sdhi0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
+                                 "usb0", "usb0"),
+       PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform", "pfc-r8a7778",
+                                 "usb1", "usb1"),
  };
  
 +#define FPGA  0x18200000
  #define IRQ0MR        0x30
 +#define PFC   0xfffc0000
 +#define PUPR4 0x110
  static void __init bockw_init(void)
  {
 -      void __iomem *fpga;
 +      void __iomem *base;
  
        r8a7778_clock_init();
        r8a7778_init_irq_extpin(1);

diff --cc arch/arm/mach-shmobile/board-marzen.c
index a3810b03297c27ecf3e55eee50b77dc4f5a3f47d,b1b41b199f99b429c1e54f865fda63591b2f6930..a7d1010505bf9ff9246df09eca4a9706f2cf3a3f
--- 1/arch/arm/mach-shmobile/board-marzen.c
--- 2/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@@ -405,9 -231,9 +231,10 @@@ 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();
+       r8a7779_add_usb_phy_device(&usb_phy_platform_data);
        platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
  }