Merge branch 'next/soc' into for-next

* next/soc:
  ARM: shmobile: r8a7790: Fix I2C controller names

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --combined arch/arm/arm-soc-for-next-contents.txt
index fada5e91cb537917ea6eb71a74aa2ea8b0af5c33,0000000000000000000000000000000000000000..b287621ae39529f2ed587a52bb087e286de827f4
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,243 -1,0 +1,245 @@@
 +Contents of arm-soc branches contained in for-next
 +
 +dependencies:
 +
 +depends/asoc-dma
 +      git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-dma-v3.14
 +depends/dma-defer-probe
 +      git://git.infradead.org/users/vkoul/slave-dma.git topic/defer_probe
 +depends/dma-of
 +      git://git.infradead.org/users/vkoul/slave-dma.git topic/of
 +depends/tegra-clk
 +      git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 +
 +next/fixes-non-critical
 +      samsung/fixes
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes
 +      samsung/fixes2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes-2
 +      u300/misc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/u300-for-arm-soc-1
 +
 +      patch ARM: bcm2835: Fix grammar in help message                                     
 +      patch irqchip: sirf: set IRQ_LEVEL status_flags
 +
 +next/cleanup
 +      renesas/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14
 +      mvebu/soc
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14
 +      at91/sama5-ccf
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      patches
 +              ARM: at91: remove redundant dependency
 +              ARM: clean up cache handling in platform code
 +              ARM: pxa: Remove unused variables
 +              ARM: pxa: remove IRQF_DISABLED
 +              ARM: mmp: build sram driver alone
 +      patch
 +              ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option
 +      zynq/cleanup
 +              git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.14
 +      samsung/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup
 +      tegra/dma-reset-rework
 +              based on depends/asoc-dma
 +              based on depends/dma-defer-probe
 +              based on depends/dma-of
 +              based on depends/tegra-clk
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 +      samsung/cleanup2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup-2
 +      renesas/cleanup2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.14
 +      renesas/drivers-sci
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.14
 +      qcom/fixes
 +              patch ARM: msm: trout: fix uninit var warning
 +      renesas/drivers-sci2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci2-for-v3.14
 +      mvebu/soc-2
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14-20
 +
 +next/soc
 +      patches
 +              ARM: ep93xx: remove deprecated IRQF_DISABLED
 +              ARM: ep93xx: use soc bus
 +      soc/sched_clock
 +              local branch: rebased onto tip/timers-core-for-linus for dependencies
 +      patch
 +              ARM: at91: sama5d3: add support for sama5d36 chip
 +      berlin/soc
 +              https://github.com/shesselba/linux-berlin.git tags/berlin-3.14
 +      efm32/soc
 +              git://git.pengutronix.de/git/ukl/linux.git tags/efm32
 +      keystone/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git for_3.14/soc
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.14
 +      patch
 +              ARM: moxart: add MOXA ART SoC platform files
 +              MAINTAINERS: take maintainership for Energy Micro efm32 SoCs
 +      samsung/dev
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dev
 +      tegra/powergate
 +              based on tegra/dma-reset-rework
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-powergate
 +      tegra/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-soc
 +      renesas/soc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.14
 +      qcom/soc
 +              contains qcom/fixes
 +              patch ARM: msm: Add support for MSM8974 SoC
 +              patch ARM: msm: Simplify ARCH_MSM_DT config
 +      renesas/soc3
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.14
 +      imx/soc
 +              git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.14
 +      hisi/soc
 +              local branch: v12 series + khilman fixups + rename series
 +      ux500/core
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-core-v3.14
 +      qcom/soc2
 +              patches
 +                      ARM: msm: Move MSM's DT based hardware to multi-platform support              
 +                      ARM: msm: Only build timer.c if required                                      
 +                      ARM: msm: Only build clock.c on proc_comm based platforms   
 +                      ARM: msm_defconfig: Update for multi-platform
 +      patch
 +              ARM: tegra: fix tegra_powergate_sequence_power_up() inline
++      renesas/fixes (based on renesas/soc3)
++              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-fixes-for-v3.14
 +    
 +next/dt
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1
 +      mvebu/dt
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14
 +      sti/dt
 +              http://git.stlinux.com/devel/kernel/linux-sti.git tags/DT-for-v3.14-part-1
 +      mvebu/dt-2
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-2            
 +      patch
 +              ARM: at91: sama5d3/dt: add sama5d36ek dts files (based on next/cleanup for dependencies)
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      integrator/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-v3.14-1
 +      patches
 +              ARM: pxa: add PWM nodes to pxa27x.dtsi
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-v3.14
 +      mvebu/dt-3
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-3
 +      mvebu/dt-4
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-4
 +      keystone/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-dts
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.14
 +      zynq/dt
 +              git://git.xilinx.com/linux-xlnx.git tags/zynq-dt-for-3.14
 +      patch
 +              ARM: moxart: add MOXA ART SoC device tree files
 +      samsung/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt
 +      at91/dt-2
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt2
 +      samsung/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-2
 +      tegra/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt
 +      tegra/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt-2
 +      renesas/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14
 +      qcom/dt
 +              contains qcom/fixes and qcom/soc
 +              patch ARM: dts: MSM8974: Add restart node
 +              patch ARM: dts: MSM8974: Add MMIO architected timer node
 +      mvebu/dt-5
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-5
 +      sunxi/dt
 +              https://github.com/mripard/linux.git tags/sunxi-dt-for-3.14
 +      patch ARM: bcm2835: add USB controller to device tree                               
 +      renesas/dt3
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.14
 +              depends on depends/clk-next-shmobile
 +              depends on depends/clksource-shmobile
 +              depends on depends/pinctrl-for-next
 +      samsung/dt3
 +               git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-3
 +
 +next/boards
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14
 +      mvebu/defconfig
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14
 +      patch
 +              ARM: multi_v7_defconfig: Fix STi support
 +      omap/board-removal
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/board-removal-safe
 +      samsung/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig
 +      mvebu/defconfig-2
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14-2
 +      tegra/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig
 +      tegra/defconfig2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig-2
 +      samsung/defconfig2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig-2
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.14
 +      renesas/defconfig2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.14
 +      qcom/boards
 +              contains qcom/fixes, qcom/soc and qcom/dt
 +              patch ARM: msm: Add support for APQ8074 Dragonboard
 +              patch defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
 +              patch ARM: msm_defconfig: Enable restart driver
 +      renesas/boards2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards2-for-v3.14
 +      patch ARM: bcm2835: bcm2835_defconfig updates   
 +
 +next/drivers
 +      mvebu/drivers
 +              git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14
 +      samsung/s3c64xx-dmaengine
 +              git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine
 +      renesas/drivers-usb
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-usb-r8a66597-hcd-for-v3.14
 +      at91/drivers
 +              git://github.com/at91linux/linux-at91.git tags/at91-drivers
 +              Contains at91/dt
 +      samsung/irq
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-irq
 +      tegra/trusted-foundations
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-trusted-foundations
 +      sunxi/drivers
 +              https://github.com/mripard/linux.git tags/sunxi-drivers-for-3.14
 +      renesas/drivers-irqchip
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
 +      renesas/sh-sci
 +              contains renesas/drivers-sci2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-soc-for-v3.14
 +      renesas/sci3
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci3-for-v3.14
 +      davinci/gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.14/gpio
 +      sunxi/core
 +               https://github.com/mripard/linux.git tags/sunxi-core-for-3.14
 +               based on sunxi/drivers
 +      integrator/core
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-for-v3.14
 +      qcom/drivers
 +              based on qcom/boards
 +              patches
 +                      tty: serial: Limit msm_serial_hs driver to platforms that use it              
 +                      mmc: msm_sdcc: Limit driver to platforms that use it                          
 +                      usb: phy: msm: Move mach dependent code to platform data  
 +
 +Patches only in for-next, not in any topic branch due to conflicts:
 +
 +ARM: multi_v7: copy most options from tegra_defconfig

diff --combined arch/arm/mach-shmobile/clock-r8a7790.c
index c5c60ecdec8f78138e2c0aaf9667ff513c627d7d,e6f88dd838d544963d0ce6d3721c41f94113306c..f44987a92ad420d27fb3dab5638a1a1f6a32942a
--- 1/arch/arm/mach-shmobile/clock-r8a7790.c
--- 2/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@@ -78,7 -78,7 +78,7 @@@ static struct sh_clk_ops followparent_c
  };
  
  static struct clk main_clk = {
 -      /* .parent will be set r8a73a4_clock_init */
 +      /* .parent will be set r8a7790_clock_init */
        .ops    = &followparent_clk_ops,
  };
  
@@@ -292,27 -292,27 +292,27 @@@ static struct clk_lookup lookups[] = 
        CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
        CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
        CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
-       CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
+       CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
        CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
-       CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
+       CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
        CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
-       CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
+       CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
        CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
-       CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
+       CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
        CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
        CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
        CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
 -      CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
 +      CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
        CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
 -      CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
 +      CLKDEV_DEV_ID("ee100000.sd", &mstp_clks[MSTP314]),
        CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
 -      CLKDEV_DEV_ID("ee120000.sdhi", &mstp_clks[MSTP313]),
 +      CLKDEV_DEV_ID("ee120000.sd", &mstp_clks[MSTP313]),
        CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]),
 -      CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP312]),
 +      CLKDEV_DEV_ID("ee140000.sd", &mstp_clks[MSTP312]),
        CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
 -      CLKDEV_DEV_ID("ee160000.sdhi", &mstp_clks[MSTP311]),
 +      CLKDEV_DEV_ID("ee160000.sd", &mstp_clks[MSTP311]),
        CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
 -      CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
 +      CLKDEV_DEV_ID("ee220000.mmc", &mstp_clks[MSTP305]),
        CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
        CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
        CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),

diff --combined arch/arm/mach-shmobile/setup-r8a7790.c
index 7800cec79652767be86fab21b12ea6222b1956c2,d6589f33f31ad1c726f7d099a8aec7f91d024ce6..6ab37aa1e919825aa6584441cffc91b7057fcbf5
--- 1/arch/arm/mach-shmobile/setup-r8a7790.c
--- 2/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -34,10 -34,6 +34,10 @@@ static const struct resource pfc_resour
        DEFINE_RES_MEM(0xe6060000, 0x250),
  };
  
 +#define r8a7790_register_pfc()                                                \
 +      platform_device_register_simple("pfc-r8a7790", -1, pfc_resources, \
 +                                      ARRAY_SIZE(pfc_resources))
 +
  #define R8A7790_GPIO(idx)                                             \
  static const struct resource r8a7790_gpio##idx##_resources[] __initconst = { \
        DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50),              \
@@@ -85,12 -81,13 +85,12 @@@ static struct resource i2c_resources[] 
  
  #define r8a7790_register_i2c(idx)             \
        platform_device_register_simple(        \
-               "i2c-rcar", idx,                \
+               "i2c-rcar_gen2", idx,           \
                i2c_resources + (2 * idx), 2);  \
  
  void __init r8a7790_pinmux_init(void)
  {
 -      platform_device_register_simple("pfc-r8a7790", -1, pfc_resources,
 -                                      ARRAY_SIZE(pfc_resources));
 +      r8a7790_register_pfc();
        r8a7790_register_gpio(0);
        r8a7790_register_gpio(1);
        r8a7790_register_gpio(2);