ARM: EXYNOS: remove auxdata table from exynos4/5 dt machine file

With support for device tree based clock lookup now available, remove
the auxdata table from exynos4/5 dt-enabled machine file.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 47a2190cc453867cc986e9692b8abd07c93e3375..ac27f3cd121f7b98da9b4ca1caa0e746c8470fb3 100644 (file)
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -11,6 +11,7 @@
  * published by the Free Software Foundation.
 */
 
+#include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/of_fdt.h>
 #include <linux/serial_core.h>
@@ -18,109 +19,10 @@
 #include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
-#include <mach/map.h>
-
-#include <plat/cpu.h>
-#include <plat/regs-serial.h>
 #include <plat/mfc.h>
 
 #include "common.h"
 
-/*
- * The following lookup table is used to override device names when devices
- * are registered from device tree. This is temporarily added to enable
- * device tree support addition for the Exynos4 architecture.
- *
- * For drivers that require platform data to be provided from the machine
- * file, a platform data pointer can also be supplied along with the
- * devices names. Usually, the platform data elements that cannot be parsed
- * from the device tree by the drivers (example: function pointers) are
- * supplied. But it should be noted that this is a temporary mechanism and
- * at some point, the drivers should be capable of parsing all the platform
- * data from the device tree.
- */
-static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART0,
-                               "exynos4210-uart.0", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1,
-                               "exynos4210-uart.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART2,
-                               "exynos4210-uart.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART3,
-                               "exynos4210-uart.3", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0),
-                               "exynos4-sdhci.0", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(1),
-                               "exynos4-sdhci.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(2),
-                               "exynos4-sdhci.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(3),
-                               "exynos4-sdhci.3", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(0),
-                               "s3c2440-i2c.0", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(1),
-                               "s3c2440-i2c.1", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(2),
-                               "s3c2440-i2c.2", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(3),
-                               "s3c2440-i2c.3", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(4),
-                               "s3c2440-i2c.4", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(5),
-                               "s3c2440-i2c.5", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(6),
-                               "s3c2440-i2c.6", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(7),
-                               "s3c2440-i2c.7", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI0,
-                               "exynos4210-spi.0", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI1,
-                               "exynos4210-spi.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI2,
-                               "exynos4210-spi.2", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
-                               "exynos-tmu", NULL),
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13620000,
-                       "exynos-sysmmu.0", NULL), /* MFC_L */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13630000,
-                       "exynos-sysmmu.1", NULL), /* MFC_R */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E20000,
-                       "exynos-sysmmu.2", NULL), /* TV */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A60000,
-                       "exynos-sysmmu.3", NULL), /* JPEG */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A30000,
-                       "exynos-sysmmu.4", NULL), /* ROTATOR */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A20000,
-                       "exynos-sysmmu.5", NULL), /* FIMC0 */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A30000,
-                       "exynos-sysmmu.6", NULL), /* FIMC1 */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A40000,
-                       "exynos-sysmmu.7", NULL), /* FIMC2 */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A50000,
-                       "exynos-sysmmu.8", NULL), /* FIMC3 */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A20000,
-                       "exynos-sysmmu.9", NULL), /* G2D(4210) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A40000,
-                       "exynos-sysmmu.9", NULL), /* G2D(4x12) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11E20000,
-                       "exynos-sysmmu.10", NULL), /* FIMD0 */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12220000,
-                       "exynos-sysmmu.11", NULL), /* FIMD1(4210) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12260000,
-                       "exynos-sysmmu.12", NULL), /* IS0(4x12) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x122B0000,
-                       "exynos-sysmmu.13", NULL), /* IS1(4x12) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123B0000,
-                       "exynos-sysmmu.14", NULL), /* FIMC-LITE0(4x12) */
-       OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123C0000,
-                       "exynos-sysmmu.15", NULL), /* FIMC-LITE1(4x12) */
-       OF_DEV_AUXDATA("samsung,mfc-v5", 0x13400000, "s5p-mfc", NULL),
-       {},
-};
-
 static void __init exynos4_dt_map_io(void)
 {
        exynos_init_io(NULL, 0);
@@ -128,8 +30,7 @@ static void __init exynos4_dt_map_io(void)
 
 static void __init exynos4_dt_machine_init(void)
 {
-       of_platform_populate(NULL, of_default_bus_match_table,
-                               exynos4_auxdata_lookup, NULL);
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static char const *exynos4_dt_compat[] __initdata = {

diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c
index 9bae9aa8d548567d5df4b88017082fce40a2928b..753b94f3fca7e3ba4c3895582f638e6c395e60fd 100644 (file)
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -11,145 +11,18 @@
 
 #include <linux/of_platform.h>
 #include <linux/of_fdt.h>
-#include <linux/serial_core.h>
 #include <linux/memblock.h>
 #include <linux/io.h>
 #include <linux/clocksource.h>
 
 #include <asm/mach/arch.h>
-#include <mach/map.h>
 #include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
-#include <plat/regs-serial.h>
 #include <plat/mfc.h>
 
 #include "common.h"
 
-/*
- * The following lookup table is used to override device names when devices
- * are registered from device tree. This is temporarily added to enable
- * device tree support addition for the EXYNOS5 architecture.
- *
- * For drivers that require platform data to be provided from the machine
- * file, a platform data pointer can also be supplied along with the
- * devices names. Usually, the platform data elements that cannot be parsed
- * from the device tree by the drivers (example: function pointers) are
- * supplied. But it should be noted that this is a temporary mechanism and
- * at some point, the drivers should be capable of parsing all the platform
- * data from the device tree.
- */
-static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART0,
-                               "exynos4210-uart.0", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART1,
-                               "exynos4210-uart.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART2,
-                               "exynos4210-uart.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART3,
-                               "exynos4210-uart.3", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(0),
-                               "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-i2c", EXYNOS5_PA_IIC(3),
-                               "s3c2440-i2c.3", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(4),
-                               "s3c2440-i2c.4", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(5),
-                               "s3c2440-i2c.5", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(6),
-                               "s3c2440-i2c.6", NULL),
-       OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(7),
-                               "s3c2440-i2c.7", 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,
-                               "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,
-                               "exynos4210-spi.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2,
-                               "exynos4210-spi.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-sata-ahci", 0x122F0000,
-                               "exynos5-sata", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-sata-phy", 0x12170000,
-                               "exynos5-sata-phy", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-sata-phy-i2c", 0x121D0000,
-                               "exynos5-sata-phy-i2c", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL),
-       OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC0,
-                               "exynos-gsc.0", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC1,
-                               "exynos-gsc.1", NULL),
-       OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC2,
-                               "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),
-       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 */
-       OF_DEV_AUXDATA("samsung,exynos5-dp", 0x145B0000, "exynos-dp", NULL),
-       {},
-};
-
-static const struct of_dev_auxdata exynos5440_auxdata_lookup[] __initconst = {
-       OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5440_PA_UART0,
-                               "exynos4210-uart.0", NULL),
-       {},
-};
-
 static void __init exynos5_dt_map_io(void)
 {
        exynos_init_io(NULL, 0);
@@ -179,12 +52,7 @@ static void __init exynos5_dt_machine_init(void)
                }
        }
 
-       if (of_machine_is_compatible("samsung,exynos5250"))
-               of_platform_populate(NULL, of_default_bus_match_table,
-                                    exynos5250_auxdata_lookup, NULL);
-       else if (of_machine_is_compatible("samsung,exynos5440"))
-               of_platform_populate(NULL, of_default_bus_match_table,
-                                    exynos5440_auxdata_lookup, NULL);
+       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static char const *exynos5_dt_compat[] __initdata = {