diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 23:37:01 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 23:37:01 +0200 |
| commit | 7b27fa258c8f2670a8c09bbc6c4b2c874d155da2 (patch) | |
| tree | eee3e1cbe481ac38614ab621122626bf5248372e /arch/arm/mach-exynos/mach-exynos5-dt.c | |
| parent | Merge branch 'next/boards' into HEAD (diff) | |
| parent | Merge branch 'next/dt-samsung-new' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| download | linux-7b27fa258c8f2670a8c09bbc6c4b2c874d155da2.tar.xz linux-7b27fa258c8f2670a8c09bbc6c4b2c874d155da2.zip | |
Merge branch 'next/dt2' into HEAD
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos5-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index e707eb1b1eab..fee9dcd49fdf 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -47,6 +47,14 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "s3c2440-i2c.0", NULL), OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), "s3c2440-i2c.1", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, + "dw_mmc.0", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1, + "dw_mmc.1", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI2, + "dw_mmc.2", NULL), + OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI3, + "dw_mmc.3", NULL), OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI0, "exynos4210-spi.0", NULL), OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI1, |