diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2010-05-20 01:51:08 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 02:28:32 -0400 |
commit | acc84707d3487735fc666fdeab76185d086428c0 (patch) | |
tree | 2ad25308d04b36f1fc2d0d9413f3a4fa9179331e /arch/arm/mach-s5pc100/mach-smdkc100.c | |
parent | 2af716ba77d26f3d291fe7c7f5a5108d4945c69f (diff) |
ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework
This patch moves S5PC100 SoC support to plat-s5p framework. Most
periperal support code has been already moved from plat-s5pc1xx to
mach-s5pc100.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/mach-smdkc100.c')
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index b6f8a58cf94c..a95d8f7d36d1 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -149,8 +149,6 @@ static struct s3c_fb_platdata smdkc100_lcd_pdata __initdata = { | |||
149 | .setup_gpio = s5pc100_fb_gpio_setup_24bpp, | 149 | .setup_gpio = s5pc100_fb_gpio_setup_24bpp, |
150 | }; | 150 | }; |
151 | 151 | ||
152 | static struct map_desc smdkc100_iodesc[] = {}; | ||
153 | |||
154 | static struct platform_device *smdkc100_devices[] __initdata = { | 152 | static struct platform_device *smdkc100_devices[] __initdata = { |
155 | &s3c_device_i2c0, | 153 | &s3c_device_i2c0, |
156 | &s3c_device_i2c1, | 154 | &s3c_device_i2c1, |
@@ -163,7 +161,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { | |||
163 | 161 | ||
164 | static void __init smdkc100_map_io(void) | 162 | static void __init smdkc100_map_io(void) |
165 | { | 163 | { |
166 | s5pc1xx_init_io(smdkc100_iodesc, ARRAY_SIZE(smdkc100_iodesc)); | 164 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); |
167 | s3c24xx_init_clocks(12000000); | 165 | s3c24xx_init_clocks(12000000); |
168 | s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs)); | 166 | s3c24xx_init_uarts(smdkc100_uartcfgs, ARRAY_SIZE(smdkc100_uartcfgs)); |
169 | } | 167 | } |
@@ -187,10 +185,9 @@ static void __init smdkc100_machine_init(void) | |||
187 | 185 | ||
188 | MACHINE_START(SMDKC100, "SMDKC100") | 186 | MACHINE_START(SMDKC100, "SMDKC100") |
189 | /* Maintainer: Byungho Min <bhmin@samsung.com> */ | 187 | /* Maintainer: Byungho Min <bhmin@samsung.com> */ |
190 | .phys_io = S5PC100_PA_UART & 0xfff00000, | 188 | .phys_io = S3C_PA_UART & 0xfff00000, |
191 | .io_pg_offst = (((u32)S5PC1XX_VA_UART) >> 18) & 0xfffc, | 189 | .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc, |
192 | .boot_params = S5PC100_PA_SDRAM + 0x100, | 190 | .boot_params = S5P_PA_SDRAM + 0x100, |
193 | |||
194 | .init_irq = s5pc100_init_irq, | 191 | .init_irq = s5pc100_init_irq, |
195 | .map_io = smdkc100_map_io, | 192 | .map_io = smdkc100_map_io, |
196 | .init_machine = smdkc100_machine_init, | 193 | .init_machine = smdkc100_machine_init, |