aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2013-03-09 03:10:23 -0500
committerKukjin Kim <kgene.kim@samsung.com>2013-03-25 05:17:13 -0400
commitee6c7137d74f29de2c9b81f759ed1fbbd6c4a3d1 (patch)
treee5ce8b1733e3ab81ff0410e3dbf4d197c30e05d0
parent927442741189fe2b6cbefdcd07f158a7ff909ca8 (diff)
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>
Diffstat
-rw-r--r--arch/arm/mach-exynos/mach-exynos4-dt.c103
-rw-r--r--arch/arm/mach-exynos/mach-exynos5-dt.c134
2 files changed, 3 insertions, 234 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c b/arch/arm/mach-exynos/mach-exynos4-dt.c
index 47a2190cc453..ac27f3cd121f 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -11,6 +11,7 @@
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12*/ 12*/
13 13
14#include <linux/kernel.h>
14#include <linux/of_platform.h> 15#include <linux/of_platform.h>
15#include <linux/of_fdt.h> 16#include <linux/of_fdt.h>
16#include <linux/serial_core.h> 17#include <linux/serial_core.h>
@@ -18,109 +19,10 @@
18#include <linux/clocksource.h> 19#include <linux/clocksource.h>
19 20
20#include <asm/mach/arch.h> 21#include <asm/mach/arch.h>
21#include <mach/map.h>
22
23#include <plat/cpu.h>
24#include <plat/regs-serial.h>
25#include <plat/mfc.h> 22#include <plat/mfc.h>
26 23
27#include "common.h" 24#include "common.h"
28 25
29/*
30 * The following lookup table is used to override device names when devices
31 * are registered from device tree. This is temporarily added to enable
32 * device tree support addition for the Exynos4 architecture.
33 *
34 * For drivers that require platform data to be provided from the machine
35 * file, a platform data pointer can also be supplied along with the
36 * devices names. Usually, the platform data elements that cannot be parsed
37 * from the device tree by the drivers (example: function pointers) are
38 * supplied. But it should be noted that this is a temporary mechanism and
39 * at some point, the drivers should be capable of parsing all the platform
40 * data from the device tree.
41 */
42static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = {
43 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART0,
44 "exynos4210-uart.0", NULL),
45 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART1,
46 "exynos4210-uart.1", NULL),
47 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART2,
48 "exynos4210-uart.2", NULL),
49 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS4_PA_UART3,
50 "exynos4210-uart.3", NULL),
51 OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(0),
52 "exynos4-sdhci.0", NULL),
53 OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(1),
54 "exynos4-sdhci.1", NULL),
55 OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(2),
56 "exynos4-sdhci.2", NULL),
57 OF_DEV_AUXDATA("samsung,exynos4210-sdhci", EXYNOS4_PA_HSMMC(3),
58 "exynos4-sdhci.3", NULL),
59 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(0),
60 "s3c2440-i2c.0", NULL),
61 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(1),
62 "s3c2440-i2c.1", NULL),
63 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(2),
64 "s3c2440-i2c.2", NULL),
65 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(3),
66 "s3c2440-i2c.3", NULL),
67 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(4),
68 "s3c2440-i2c.4", NULL),
69 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(5),
70 "s3c2440-i2c.5", NULL),
71 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(6),
72 "s3c2440-i2c.6", NULL),
73 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS4_PA_IIC(7),
74 "s3c2440-i2c.7", NULL),
75 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI0,
76 "exynos4210-spi.0", NULL),
77 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI1,
78 "exynos4210-spi.1", NULL),
79 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS4_PA_SPI2,
80 "exynos4210-spi.2", NULL),
81 OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
82 OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
83 OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
84 OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
85 "exynos-tmu", NULL),
86 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13620000,
87 "exynos-sysmmu.0", NULL), /* MFC_L */
88 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13630000,
89 "exynos-sysmmu.1", NULL), /* MFC_R */
90 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E20000,
91 "exynos-sysmmu.2", NULL), /* TV */
92 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A60000,
93 "exynos-sysmmu.3", NULL), /* JPEG */
94 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A30000,
95 "exynos-sysmmu.4", NULL), /* ROTATOR */
96 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A20000,
97 "exynos-sysmmu.5", NULL), /* FIMC0 */
98 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A30000,
99 "exynos-sysmmu.6", NULL), /* FIMC1 */
100 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A40000,
101 "exynos-sysmmu.7", NULL), /* FIMC2 */
102 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11A50000,
103 "exynos-sysmmu.8", NULL), /* FIMC3 */
104 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12A20000,
105 "exynos-sysmmu.9", NULL), /* G2D(4210) */
106 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A40000,
107 "exynos-sysmmu.9", NULL), /* G2D(4x12) */
108 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11E20000,
109 "exynos-sysmmu.10", NULL), /* FIMD0 */
110 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12220000,
111 "exynos-sysmmu.11", NULL), /* FIMD1(4210) */
112 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x12260000,
113 "exynos-sysmmu.12", NULL), /* IS0(4x12) */
114 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x122B0000,
115 "exynos-sysmmu.13", NULL), /* IS1(4x12) */
116 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123B0000,
117 "exynos-sysmmu.14", NULL), /* FIMC-LITE0(4x12) */
118 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123C0000,
119 "exynos-sysmmu.15", NULL), /* FIMC-LITE1(4x12) */
120 OF_DEV_AUXDATA("samsung,mfc-v5", 0x13400000, "s5p-mfc", NULL),
121 {},
122};
123
124static void __init exynos4_dt_map_io(void) 26static void __init exynos4_dt_map_io(void)
125{ 27{
126 exynos_init_io(NULL, 0); 28 exynos_init_io(NULL, 0);
@@ -128,8 +30,7 @@ static void __init exynos4_dt_map_io(void)
128 30
129static void __init exynos4_dt_machine_init(void) 31static void __init exynos4_dt_machine_init(void)
130{ 32{
131 of_platform_populate(NULL, of_default_bus_match_table, 33 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
132 exynos4_auxdata_lookup, NULL);
133} 34}
134 35
135static char const *exynos4_dt_compat[] __initdata = { 36static 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 9bae9aa8d548..753b94f3fca7 100644
--- a/arch/arm/mach-exynos/mach-exynos5-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos5-dt.c
@@ -11,145 +11,18 @@
11 11
12#include <linux/of_platform.h> 12#include <linux/of_platform.h>
13#include <linux/of_fdt.h> 13#include <linux/of_fdt.h>
14#include <linux/serial_core.h>
15#include <linux/memblock.h> 14#include <linux/memblock.h>
16#include <linux/io.h> 15#include <linux/io.h>
17#include <linux/clocksource.h> 16#include <linux/clocksource.h>
18 17
19#include <asm/mach/arch.h> 18#include <asm/mach/arch.h>
20#include <mach/map.h>
21#include <mach/regs-pmu.h> 19#include <mach/regs-pmu.h>
22 20
23#include <plat/cpu.h> 21#include <plat/cpu.h>
24#include <plat/regs-serial.h>
25#include <plat/mfc.h> 22#include <plat/mfc.h>
26 23
27#include "common.h" 24#include "common.h"
28 25
29/*
30 * The following lookup table is used to override device names when devices
31 * are registered from device tree. This is temporarily added to enable
32 * device tree support addition for the EXYNOS5 architecture.
33 *
34 * For drivers that require platform data to be provided from the machine
35 * file, a platform data pointer can also be supplied along with the
36 * devices names. Usually, the platform data elements that cannot be parsed
37 * from the device tree by the drivers (example: function pointers) are
38 * supplied. But it should be noted that this is a temporary mechanism and
39 * at some point, the drivers should be capable of parsing all the platform
40 * data from the device tree.
41 */
42static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = {
43 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART0,
44 "exynos4210-uart.0", NULL),
45 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART1,
46 "exynos4210-uart.1", NULL),
47 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART2,
48 "exynos4210-uart.2", NULL),
49 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5_PA_UART3,
50 "exynos4210-uart.3", NULL),
51 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(0),
52 "s3c2440-i2c.0", NULL),
53 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1),
54 "s3c2440-i2c.1", NULL),
55 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2),
56 "s3c2440-i2c.2", NULL),
57 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(3),
58 "s3c2440-i2c.3", NULL),
59 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(4),
60 "s3c2440-i2c.4", NULL),
61 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(5),
62 "s3c2440-i2c.5", NULL),
63 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(6),
64 "s3c2440-i2c.6", NULL),
65 OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(7),
66 "s3c2440-i2c.7", NULL),
67 OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8),
68 "s3c2440-hdmiphy-i2c", NULL),
69 OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0,
70 "dw_mmc.0", NULL),
71 OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1,
72 "dw_mmc.1", NULL),
73 OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI2,
74 "dw_mmc.2", NULL),
75 OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI3,
76 "dw_mmc.3", NULL),
77 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI0,
78 "exynos4210-spi.0", NULL),
79 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI1,
80 "exynos4210-spi.1", NULL),
81 OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2,
82 "exynos4210-spi.2", NULL),
83 OF_DEV_AUXDATA("samsung,exynos5-sata-ahci", 0x122F0000,
84 "exynos5-sata", NULL),
85 OF_DEV_AUXDATA("samsung,exynos5-sata-phy", 0x12170000,
86 "exynos5-sata-phy", NULL),
87 OF_DEV_AUXDATA("samsung,exynos5-sata-phy-i2c", 0x121D0000,
88 "exynos5-sata-phy-i2c", NULL),
89 OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL),
90 OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL),
91 OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),
92 OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC0,
93 "exynos-gsc.0", NULL),
94 OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC1,
95 "exynos-gsc.1", NULL),
96 OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC2,
97 "exynos-gsc.2", NULL),
98 OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3,
99 "exynos-gsc.3", NULL),
100 OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000,
101 "exynos5-hdmi", NULL),
102 OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000,
103 "exynos5-mixer", NULL),
104 OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL),
105 OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000,
106 "exynos-tmu", NULL),
107 OF_DEV_AUXDATA("samsung,i2s-v5", 0x03830000,
108 "samsung-i2s.0", NULL),
109 OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D60000,
110 "samsung-i2s.1", NULL),
111 OF_DEV_AUXDATA("samsung,i2s-v5", 0x12D70000,
112 "samsung-i2s.2", NULL),
113 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11210000,
114 "exynos-sysmmu.0", "mfc"), /* MFC_L */
115 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11200000,
116 "exynos-sysmmu.1", "mfc"), /* MFC_R */
117 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14650000,
118 "exynos-sysmmu.2", NULL), /* TV */
119 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11F20000,
120 "exynos-sysmmu.3", "jpeg"), /* JPEG */
121 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x11D40000,
122 "exynos-sysmmu.4", NULL), /* ROTATOR */
123 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E80000,
124 "exynos-sysmmu.5", "gscl"), /* GSCL0 */
125 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13E90000,
126 "exynos-sysmmu.6", "gscl"), /* GSCL1 */
127 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EA0000,
128 "exynos-sysmmu.7", "gscl"), /* GSCL2 */
129 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13EB0000,
130 "exynos-sysmmu.8", "gscl"), /* GSCL3 */
131 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13260000,
132 "exynos-sysmmu.9", NULL), /* FIMC-IS0 */
133 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x132C0000,
134 "exynos-sysmmu.10", NULL), /* FIMC-IS1 */
135 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x14640000,
136 "exynos-sysmmu.11", NULL), /* FIMD1 */
137 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C40000,
138 "exynos-sysmmu.12", NULL), /* FIMC-LITE0 */
139 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x13C50000,
140 "exynos-sysmmu.13", NULL), /* FIMC-LITE1 */
141 OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x10A60000,
142 "exynos-sysmmu.14", NULL), /* G2D */
143 OF_DEV_AUXDATA("samsung,exynos5-dp", 0x145B0000, "exynos-dp", NULL),
144 {},
145};
146
147static const struct of_dev_auxdata exynos5440_auxdata_lookup[] __initconst = {
148 OF_DEV_AUXDATA("samsung,exynos4210-uart", EXYNOS5440_PA_UART0,
149 "exynos4210-uart.0", NULL),
150 {},
151};
152
153static void __init exynos5_dt_map_io(void) 26static void __init exynos5_dt_map_io(void)
154{ 27{
155 exynos_init_io(NULL, 0); 28 exynos_init_io(NULL, 0);
@@ -179,12 +52,7 @@ static void __init exynos5_dt_machine_init(void)
179 } 52 }
180 } 53 }
181 54
182 if (of_machine_is_compatible("samsung,exynos5250")) 55 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
183 of_platform_populate(NULL, of_default_bus_match_table,
184 exynos5250_auxdata_lookup, NULL);
185 else if (of_machine_is_compatible("samsung,exynos5440"))
186 of_platform_populate(NULL, of_default_bus_match_table,
187 exynos5440_auxdata_lookup, NULL);
188} 56}
189 57
190static char const *exynos5_dt_compat[] __initdata = { 58static char const *exynos5_dt_compat[] __initdata = {
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-23 15:57:25 -0400