diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/mach-exynos/mach-smdkv310.c | |
parent | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 (diff) | |
parent | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (diff) |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/mach-smdkv310.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-smdkv310.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c b/arch/arm/mach-exynos/mach-smdkv310.c index 25a5a405c4bf..b2c5557f50e4 100644 --- a/arch/arm/mach-exynos/mach-smdkv310.c +++ b/arch/arm/mach-exynos/mach-smdkv310.c | |||
@@ -21,13 +21,13 @@ | |||
21 | #include <linux/pwm_backlight.h> | 21 | #include <linux/pwm_backlight.h> |
22 | 22 | ||
23 | #include <asm/mach/arch.h> | 23 | #include <asm/mach/arch.h> |
24 | #include <asm/hardware/gic.h> | ||
24 | #include <asm/mach-types.h> | 25 | #include <asm/mach-types.h> |
25 | 26 | ||
26 | #include <video/platform_lcd.h> | 27 | #include <video/platform_lcd.h> |
27 | #include <plat/regs-serial.h> | 28 | #include <plat/regs-serial.h> |
28 | #include <plat/regs-srom.h> | 29 | #include <plat/regs-srom.h> |
29 | #include <plat/regs-fb-v4.h> | 30 | #include <plat/regs-fb-v4.h> |
30 | #include <plat/exynos4.h> | ||
31 | #include <plat/cpu.h> | 31 | #include <plat/cpu.h> |
32 | #include <plat/devs.h> | 32 | #include <plat/devs.h> |
33 | #include <plat/fb.h> | 33 | #include <plat/fb.h> |
@@ -44,6 +44,8 @@ | |||
44 | #include <mach/map.h> | 44 | #include <mach/map.h> |
45 | #include <mach/ohci.h> | 45 | #include <mach/ohci.h> |
46 | 46 | ||
47 | #include "common.h" | ||
48 | |||
47 | /* Following are default values for UCON, ULCON and UFCON UART registers */ | 49 | /* Following are default values for UCON, ULCON and UFCON UART registers */ |
48 | #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | 50 | #define SMDKV310_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ |
49 | S3C2410_UCON_RXILEVEL | \ | 51 | S3C2410_UCON_RXILEVEL | \ |
@@ -130,9 +132,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd, | |||
130 | gpio_free(EXYNOS4_GPD0(1)); | 132 | gpio_free(EXYNOS4_GPD0(1)); |
131 | #endif | 133 | #endif |
132 | /* fire nRESET on power up */ | 134 | /* fire nRESET on power up */ |
133 | gpio_request(EXYNOS4_GPX0(6), "GPX0"); | 135 | gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0"); |
134 | |||
135 | gpio_direction_output(EXYNOS4_GPX0(6), 1); | ||
136 | mdelay(100); | 136 | mdelay(100); |
137 | 137 | ||
138 | gpio_set_value(EXYNOS4_GPX0(6), 0); | 138 | gpio_set_value(EXYNOS4_GPX0(6), 0); |
@@ -344,7 +344,7 @@ static void s5p_tv_setup(void) | |||
344 | 344 | ||
345 | static void __init smdkv310_map_io(void) | 345 | static void __init smdkv310_map_io(void) |
346 | { | 346 | { |
347 | s5p_init_io(NULL, 0, S5P_VA_CHIPID); | 347 | exynos_init_io(NULL, 0); |
348 | s3c24xx_init_clocks(24000000); | 348 | s3c24xx_init_clocks(24000000); |
349 | s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs)); | 349 | s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs)); |
350 | } | 350 | } |
@@ -388,9 +388,11 @@ MACHINE_START(SMDKV310, "SMDKV310") | |||
388 | .atag_offset = 0x100, | 388 | .atag_offset = 0x100, |
389 | .init_irq = exynos4_init_irq, | 389 | .init_irq = exynos4_init_irq, |
390 | .map_io = smdkv310_map_io, | 390 | .map_io = smdkv310_map_io, |
391 | .handle_irq = gic_handle_irq, | ||
391 | .init_machine = smdkv310_machine_init, | 392 | .init_machine = smdkv310_machine_init, |
392 | .timer = &exynos4_timer, | 393 | .timer = &exynos4_timer, |
393 | .reserve = &smdkv310_reserve, | 394 | .reserve = &smdkv310_reserve, |
395 | .restart = exynos4_restart, | ||
394 | MACHINE_END | 396 | MACHINE_END |
395 | 397 | ||
396 | MACHINE_START(SMDKC210, "SMDKC210") | 398 | MACHINE_START(SMDKC210, "SMDKC210") |
@@ -398,6 +400,8 @@ MACHINE_START(SMDKC210, "SMDKC210") | |||
398 | .atag_offset = 0x100, | 400 | .atag_offset = 0x100, |
399 | .init_irq = exynos4_init_irq, | 401 | .init_irq = exynos4_init_irq, |
400 | .map_io = smdkv310_map_io, | 402 | .map_io = smdkv310_map_io, |
403 | .handle_irq = gic_handle_irq, | ||
401 | .init_machine = smdkv310_machine_init, | 404 | .init_machine = smdkv310_machine_init, |
402 | .timer = &exynos4_timer, | 405 | .timer = &exynos4_timer, |
406 | .restart = exynos4_restart, | ||
403 | MACHINE_END | 407 | MACHINE_END |