From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 03:24:57 +0000 (+1100)
Subject: Merge remote-tracking branch 'iommu/next'
X-Git-Tag: next-20130220~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=daeebd929dcb02809eef737f6147d6fed30b34e5;p=karo-tx-linux.git

Merge remote-tracking branch 'iommu/next'

Conflicts:
	arch/arm/mach-exynos/mach-exynos5-dt.c
---

daeebd929dcb02809eef737f6147d6fed30b34e5
diff --cc arch/arm/mach-exynos/mach-exynos5-dt.c
index ea9e3020972d,26710758c385..dd2b47b3ca33
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@@ -104,12 -104,36 +104,42 @@@ static const struct of_dev_auxdata exyn
  	OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
  	OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
  				"exynos-tmu", NULL),
 +	OF_DEV_AUXDATA("samsung,i2s-v5", 0x03830000,
 +				"samsung-i2s.0", NULL),
 +	OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D60000,
 +				"samsung-i2s.1", NULL),
 +	OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D70000,
 +				"samsung-i2s.2", NULL),
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11210000,
+ 			"exynos-sysmmu.0", "mfc"), /* MFC_L */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11200000,
+ 			"exynos-sysmmu.1", "mfc"), /* MFC_R */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14650000,
+ 			"exynos-sysmmu.2", NULL), /* TV */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11F20000,
+ 			"exynos-sysmmu.3", "jpeg"), /* JPEG */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11D40000,
+ 			"exynos-sysmmu.4", NULL), /* ROTATOR */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E80000,
+ 			"exynos-sysmmu.5", "gscl"), /* GSCL0 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E90000,
+ 			"exynos-sysmmu.6", "gscl"), /* GSCL1 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EA0000,
+ 			"exynos-sysmmu.7", "gscl"), /* GSCL2 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EB0000,
+ 			"exynos-sysmmu.8", "gscl"), /* GSCL3 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13260000,
+ 			"exynos-sysmmu.9", NULL), /* FIMC-IS0 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x132C0000,
+ 			"exynos-sysmmu.10", NULL), /* FIMC-IS1 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14640000,
+ 			"exynos-sysmmu.11", NULL), /* FIMD1 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C40000,
+ 			"exynos-sysmmu.12", NULL), /* FIMC-LITE0 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C50000,
+ 			"exynos-sysmmu.13", NULL), /* FIMC-LITE1 */
+ 	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A60000,
+ 			"exynos-sysmmu.14", NULL), /* G2D */
  	{},
  };