* samsung/driver:
  ARM: EXYNOS: Modified files for SPI consolidation work
  ARM: S5P64X0: Enable SDHCI support
  ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
  ARM: S5P64X0: Add HSMMC setup for host Controller

Dependency for the samsung/drivers branch

Conflicts:
	arch/arm/mach-exynos/Makefile
Signed-off-by: NArnd Bergmann <arnd@arndb.de>

Merge branch 'next-samsung-devel-mmc-spi5' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/driver

Merge branch 'next-samsung-cleanup-spi4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup

Merge branch 'next-samsung-devel-spi3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup

Merge branch 'next-samsung-cleanup-mmc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/cleanup

* samsung/ohci:
  ARM: EXYNOS: Add USB OHCI support to ORIGEN board
  USB: Add Samsung Exynos OHCI diver
  ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
  ARM: EXYNOS: Add USB OHCI device

Merge branch 'next-samsung-devel-ohci' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/ohci

Merge branch 'next-samsung-devel-dt1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into samsung/dt

* tegra/drivers:
  i2c: tegra: Support DVC controller in device tree
  i2c: tegra: Add __devinit/exit to probe/remove

Merge branch 'for-3.3/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/drivers

* omap/ehci:
  MFD: OMAP: USB: Runtime PM support
  ARM: OMAP: USBHOST: Replace usbhs core driver APIs by Runtime pm APIs
  ARM: OMAP: USB: device name change for the clk names of usbhs
  ARM: OMAP: USB: register hwmods of usbhs

This is needed as a dependency for omap/ehci.
Signed-off-by: NArnd Bergmann <arnd@arndb.de>

Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/hwmod

Merge branch 'ehci' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/ehci

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Setup files are added for SPI GPIO configurations and platform data
initialization.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Enables SDHCI supports for SMDK6440 and SMDK6450.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Add support for lookup of sdhci-s3c controller clocks using generic
names for S5P64X0 SoCs.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Adds support for HSMMC for S5P64X0 platform, performs
setup for host controller and related GPIO.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Signed-off-by: NTushar Behera <tushar.behera@linaro.org>
Signed-off-by: NAngus Ainslie <angus.ainslie@linaro.org>
Acked-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch adds USB OHCI driver for Samsung EXYNOS SoCs.
Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Acked-by: NGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Signed-off-by: NJingoo Han <jg1.han@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the s3c6410 varient SoCs.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Added SPI Setup file for GPIO configurations and platform data
initialization.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Added SPI Setup file for GPIO configurations and platform data
initialization.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Added SPI Setup file for GPIO configurations and platform data
initialization.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

As SPI platform devices are consolidated to plat-samsung, some
corresponding changes are required in the respective machine folder.
Setup files are added for SPI GPIO configurations and platform data
initialization.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

SPI platform device definitions consolidated from respective machine
folder to plat-samsung
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

SPI bus clocks can be avoided passing through platform
data as spi driver is getting the bus clock using the
generic clock connection id registered via clkdev.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Registered the SPI bus clocks with clkdev using generic
connection id.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Registered the SPI bus clocks with clkdev using generic
connection id.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Registered the SPI bus clocks with clkdev using generic
connection id.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Registered the SPI bus clocks with clkdev using generic
connection id.
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch modifies the driver to stop depending on the
clock names being passed from platform and switch over
to lookup clocks generic names using clkdev
Signed-off-by: NPadmavathi Venna <padma.v@samsung.com>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

This patch modifies the driver to stop depending on the clock names
being passed from the platform and switch over to bus clock lookup
using generic clock names.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: NChris Ball <cjb@laptop.org>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Add support for lookup of sdhci-s3c controller clocks using generic names
for s3c2416, s3c64xx, s5pc100, s5pv210 and exynos4 SoC's.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
[kgene.kim@samsung.com: fixed trailing whitespace]
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

The bus clocks previously sent through platform data to SDHCI controller
are removed.
Signed-off-by: NRajeshwari Shinde <rajeshwari.s@samsung.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>

Add initial dts file for EXYNOS4210 SoC. This dts file describes
the SoC specific devices and properties. Along with this, add dts
file for Samsung's SMDKV310 board and Insignal's ORIGEN board which
uses the EXYNOS4210 dts file and extends it to describe the board
specific properties.
Signed-off-by: NThomas Abraham <thomas.abraham@linaro.org>
Acked-by: NGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>