From 0d1b6472f70437e58ddc734b3c77b4cb5673f54d Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Mon, 19 Nov 2012 16:24:46 +0900 Subject: [PATCH] --- yaml --- r: 339845 b: refs/heads/master c: 868b2f23749d21737ff0c292175da42dce106b22 h: refs/heads/master i: 339843: e0b822638d7477234d7b367677c0fb2f5a88e392 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/common.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/[refs] b/[refs] index e9fbb22845a1..017e29f3a30f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9213c50d18a0fbf5865afa3aa0cce33c8a076f76 +refs/heads/master: 868b2f23749d21737ff0c292175da42dce106b22 diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c index 5b35d7168f3c..3a92998be109 100644 --- a/trunk/arch/arm/mach-exynos/common.c +++ b/trunk/arch/arm/mach-exynos/common.c @@ -338,23 +338,6 @@ static void __init exynos4_map_io(void) static void __init exynos5_map_io(void) { iotable_init(exynos5_iodesc, ARRAY_SIZE(exynos5_iodesc)); - - s3c_device_i2c0.resource[0].start = EXYNOS5_PA_IIC(0); - s3c_device_i2c0.resource[0].end = EXYNOS5_PA_IIC(0) + SZ_4K - 1; - s3c_device_i2c0.resource[1].start = EXYNOS5_IRQ_IIC; - s3c_device_i2c0.resource[1].end = EXYNOS5_IRQ_IIC; - - s3c_sdhci_setname(0, "exynos4-sdhci"); - s3c_sdhci_setname(1, "exynos4-sdhci"); - s3c_sdhci_setname(2, "exynos4-sdhci"); - s3c_sdhci_setname(3, "exynos4-sdhci"); - - /* The I2C bus controllers are directly compatible with s3c2440 */ - s3c_i2c0_setname("s3c2440-i2c"); - s3c_i2c1_setname("s3c2440-i2c"); - s3c_i2c2_setname("s3c2440-i2c"); - - s3c64xx_spi_setname("exynos4210-spi"); } static void __init exynos4_init_clocks(int xtal)