diff options
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-anw6410.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-hmt.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq5.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq7.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/mach-smdkc100.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pv210/mach-aquila.c | 2 |
7 files changed, 3 insertions, 10 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c index 4a0bb243d14a..742dc87bd9c1 100644 --- a/arch/arm/mach-s3c64xx/mach-anw6410.c +++ b/arch/arm/mach-s3c64xx/mach-anw6410.c | |||
@@ -134,7 +134,6 @@ static struct platform_device anw6410_lcd_powerdev = { | |||
134 | static struct s3c_fb_pd_win anw6410_fb_win0 = { | 134 | static struct s3c_fb_pd_win anw6410_fb_win0 = { |
135 | /* this is to ensure we use win0 */ | 135 | /* this is to ensure we use win0 */ |
136 | .win_mode = { | 136 | .win_mode = { |
137 | .pixclock = 41094, | ||
138 | .left_margin = 8, | 137 | .left_margin = 8, |
139 | .right_margin = 13, | 138 | .right_margin = 13, |
140 | .upper_margin = 7, | 139 | .upper_margin = 7, |
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c index 187441a78dd5..fba90229f0df 100644 --- a/arch/arm/mach-s3c64xx/mach-hmt.c +++ b/arch/arm/mach-s3c64xx/mach-hmt.c | |||
@@ -128,7 +128,6 @@ static struct platform_device hmt_backlight_device = { | |||
128 | 128 | ||
129 | static struct s3c_fb_pd_win hmt_fb_win0 = { | 129 | static struct s3c_fb_pd_win hmt_fb_win0 = { |
130 | .win_mode = { | 130 | .win_mode = { |
131 | .pixclock = 41094, | ||
132 | .left_margin = 8, | 131 | .left_margin = 8, |
133 | .right_margin = 13, | 132 | .right_margin = 13, |
134 | .upper_margin = 7, | 133 | .upper_margin = 7, |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c index 1d0326ead90f..a065062ec2a4 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq5.c +++ b/arch/arm/mach-s3c64xx/mach-smartq5.c | |||
@@ -134,8 +134,6 @@ static struct platform_device smartq5_buttons_device = { | |||
134 | 134 | ||
135 | static struct s3c_fb_pd_win smartq5_fb_win0 = { | 135 | static struct s3c_fb_pd_win smartq5_fb_win0 = { |
136 | .win_mode = { | 136 | .win_mode = { |
137 | .pixclock = 1000000000000ULL / | ||
138 | ((40+1+216+800)*(10+1+35+480)*80), | ||
139 | .left_margin = 40, | 137 | .left_margin = 40, |
140 | .right_margin = 216, | 138 | .right_margin = 216, |
141 | .upper_margin = 10, | 139 | .upper_margin = 10, |
@@ -144,6 +142,7 @@ static struct s3c_fb_pd_win smartq5_fb_win0 = { | |||
144 | .vsync_len = 1, | 142 | .vsync_len = 1, |
145 | .xres = 800, | 143 | .xres = 800, |
146 | .yres = 480, | 144 | .yres = 480, |
145 | .refresh = 80, | ||
147 | }, | 146 | }, |
148 | .max_bpp = 32, | 147 | .max_bpp = 32, |
149 | .default_bpp = 16, | 148 | .default_bpp = 16, |
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c index e0bc78ecb156..0ecf45137546 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq7.c +++ b/arch/arm/mach-s3c64xx/mach-smartq7.c | |||
@@ -150,8 +150,6 @@ static struct platform_device smartq7_buttons_device = { | |||
150 | 150 | ||
151 | static struct s3c_fb_pd_win smartq7_fb_win0 = { | 151 | static struct s3c_fb_pd_win smartq7_fb_win0 = { |
152 | .win_mode = { | 152 | .win_mode = { |
153 | .pixclock = 1000000000000ULL / | ||
154 | ((3+10+5+800)*(1+3+20+480)*80), | ||
155 | .left_margin = 3, | 153 | .left_margin = 3, |
156 | .right_margin = 5, | 154 | .right_margin = 5, |
157 | .upper_margin = 1, | 155 | .upper_margin = 1, |
@@ -160,6 +158,7 @@ static struct s3c_fb_pd_win smartq7_fb_win0 = { | |||
160 | .vsync_len = 3, | 158 | .vsync_len = 3, |
161 | .xres = 800, | 159 | .xres = 800, |
162 | .yres = 480, | 160 | .yres = 480, |
161 | .refresh = 80, | ||
163 | }, | 162 | }, |
164 | .max_bpp = 32, | 163 | .max_bpp = 32, |
165 | .default_bpp = 16, | 164 | .default_bpp = 16, |
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index d9a03555f88b..0302fcc50b1f 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c | |||
@@ -141,7 +141,6 @@ static struct platform_device smdk6410_lcd_powerdev = { | |||
141 | static struct s3c_fb_pd_win smdk6410_fb_win0 = { | 141 | static struct s3c_fb_pd_win smdk6410_fb_win0 = { |
142 | /* this is to ensure we use win0 */ | 142 | /* this is to ensure we use win0 */ |
143 | .win_mode = { | 143 | .win_mode = { |
144 | .pixclock = 41094, | ||
145 | .left_margin = 8, | 144 | .left_margin = 8, |
146 | .right_margin = 13, | 145 | .right_margin = 13, |
147 | .upper_margin = 7, | 146 | .upper_margin = 7, |
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c index af22f8202a07..117fbbada526 100644 --- a/arch/arm/mach-s5pc100/mach-smdkc100.c +++ b/arch/arm/mach-s5pc100/mach-smdkc100.c | |||
@@ -128,7 +128,6 @@ static struct platform_device smdkc100_lcd_powerdev = { | |||
128 | static struct s3c_fb_pd_win smdkc100_fb_win0 = { | 128 | static struct s3c_fb_pd_win smdkc100_fb_win0 = { |
129 | /* this is to ensure we use win0 */ | 129 | /* this is to ensure we use win0 */ |
130 | .win_mode = { | 130 | .win_mode = { |
131 | .pixclock = 1000000000000ULL / ((8+13+3+800)*(7+5+1+480)*80), | ||
132 | .left_margin = 8, | 131 | .left_margin = 8, |
133 | .right_margin = 13, | 132 | .right_margin = 13, |
134 | .upper_margin = 7, | 133 | .upper_margin = 7, |
@@ -137,6 +136,7 @@ static struct s3c_fb_pd_win smdkc100_fb_win0 = { | |||
137 | .vsync_len = 1, | 136 | .vsync_len = 1, |
138 | .xres = 800, | 137 | .xres = 800, |
139 | .yres = 480, | 138 | .yres = 480, |
139 | .refresh = 80, | ||
140 | }, | 140 | }, |
141 | .max_bpp = 32, | 141 | .max_bpp = 32, |
142 | .default_bpp = 16, | 142 | .default_bpp = 16, |
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c index 10bc76ec4025..881fe89eefd2 100644 --- a/arch/arm/mach-s5pv210/mach-aquila.c +++ b/arch/arm/mach-s5pv210/mach-aquila.c | |||
@@ -77,7 +77,6 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = { | |||
77 | /* Frame Buffer */ | 77 | /* Frame Buffer */ |
78 | static struct s3c_fb_pd_win aquila_fb_win0 = { | 78 | static struct s3c_fb_pd_win aquila_fb_win0 = { |
79 | .win_mode = { | 79 | .win_mode = { |
80 | .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60), | ||
81 | .left_margin = 16, | 80 | .left_margin = 16, |
82 | .right_margin = 16, | 81 | .right_margin = 16, |
83 | .upper_margin = 3, | 82 | .upper_margin = 3, |
@@ -93,7 +92,6 @@ static struct s3c_fb_pd_win aquila_fb_win0 = { | |||
93 | 92 | ||
94 | static struct s3c_fb_pd_win aquila_fb_win1 = { | 93 | static struct s3c_fb_pd_win aquila_fb_win1 = { |
95 | .win_mode = { | 94 | .win_mode = { |
96 | .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60), | ||
97 | .left_margin = 16, | 95 | .left_margin = 16, |
98 | .right_margin = 16, | 96 | .right_margin = 16, |
99 | .upper_margin = 3, | 97 | .upper_margin = 3, |