aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5pv210
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s5pv210')
-rw-r--r--arch/arm/mach-s5pv210/cpu.c3
-rw-r--r--arch/arm/mach-s5pv210/mach-aquila.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index c7e0b8a65c4..b9f4d677cf5 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -31,6 +31,7 @@
31#include <plat/cpu.h> 31#include <plat/cpu.h>
32#include <plat/devs.h> 32#include <plat/devs.h>
33#include <plat/clock.h> 33#include <plat/clock.h>
34#include <plat/fb-core.h>
34#include <plat/s5pv210.h> 35#include <plat/s5pv210.h>
35#include <plat/adc-core.h> 36#include <plat/adc-core.h>
36#include <plat/ata-core.h> 37#include <plat/ata-core.h>
@@ -107,6 +108,8 @@ void __init s5pv210_map_io(void)
107 s3c_i2c1_setname("s3c2440-i2c"); 108 s3c_i2c1_setname("s3c2440-i2c");
108 s3c_i2c2_setname("s3c2440-i2c"); 109 s3c_i2c2_setname("s3c2440-i2c");
109 110
111 s3c_fb_setname("s5pv210-fb");
112
110 /* Use s5pv210-keypad instead of samsung-keypad */ 113 /* Use s5pv210-keypad instead of samsung-keypad */
111 samsung_keypad_setname("s5pv210-keypad"); 114 samsung_keypad_setname("s5pv210-keypad");
112} 115}
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index e41266419a3..0dda8012d6b 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -92,7 +92,6 @@ static struct s3c2410_uartcfg aquila_uartcfgs[] __initdata = {
92/* Frame Buffer */ 92/* Frame Buffer */
93static struct s3c_fb_pd_win aquila_fb_win0 = { 93static struct s3c_fb_pd_win aquila_fb_win0 = {
94 .win_mode = { 94 .win_mode = {
95 .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60),
96 .left_margin = 16, 95 .left_margin = 16,
97 .right_margin = 16, 96 .right_margin = 16,
98 .upper_margin = 3, 97 .upper_margin = 3,
@@ -108,7 +107,6 @@ static struct s3c_fb_pd_win aquila_fb_win0 = {
108 107
109static struct s3c_fb_pd_win aquila_fb_win1 = { 108static struct s3c_fb_pd_win aquila_fb_win1 = {
110 .win_mode = { 109 .win_mode = {
111 .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60),
112 .left_margin = 16, 110 .left_margin = 16,
113 .right_margin = 16, 111 .right_margin = 16,
114 .upper_margin = 3, 112 .upper_margin = 3,