diff options
| author | Kukjin Kim | 2012-11-20 10:19:10 +0100 |
|---|---|---|
| committer | Kukjin Kim | 2012-11-20 10:19:10 +0100 |
| commit | 840ed42942cc1ebbda2ed55f4019673b537fc5de (patch) | |
| tree | 415644488e3966837eeb5061d96d4ca7db862318 /arch/arm/mach-exynos/mach-exynos5-dt.c | |
| parent | ARM: EXYNOS: Add dp clock support for EXYNOS5 (diff) | |
| parent | ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms (diff) | |
| download | kernel-qcow2-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.gz kernel-qcow2-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.tar.xz kernel-qcow2-linux-840ed42942cc1ebbda2ed55f4019673b537fc5de.zip | |
Merge branch 'next/hdmi-samsung' into next/devel-samsung
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 db1cd8eacf28..db035374087e 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -47,6 +47,10 @@ 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,s3c2440-i2c", EXYNOS5_PA_IIC(2), + "s3c2440-i2c.2", NULL), + OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8), + "s3c2440-hdmiphy-i2c", 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, @@ -72,6 +76,10 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos-gsc.2", NULL), OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3, "exynos-gsc.3", NULL), + OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, + "exynos5-hdmi", NULL), + OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000, + "exynos5-mixer", NULL), {}, }; |