Merge tag 'fbdev-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

[linux.git] / drivers / video / fbdev / matrox / matroxfb_maven.c

diff --git a/drivers/video/fbdev/matrox/matroxfb_maven.c b/drivers/video/fbdev/matrox/matroxfb_maven.c
index ee41a0f276b2eae5fb65b530581438a711963a52..bf5ce04f9aea55733bf513bc237f42c489666d26 100644 (file)
--- a/drivers/video/fbdev/matrox/matroxfb_maven.c
+++ b/drivers/video/fbdev/matrox/matroxfb_maven.c
@@ -201,21 +201,23 @@ struct matrox_pll_ctl {
 };
 
 static const struct matrox_pll_features2 maven1000_pll = {
-        50000000,
-       300000000,
-        5, 128,
-        3,  32,
-        3
+       .vco_freq_min = 50000000,
+       .vco_freq_max = 300000000,
+       .feed_div_min = 5,
+       .feed_div_max = 128,
+       .in_div_min = 3,
+       .in_div_max = 32,
+       .post_shift_max = 3
 };
 
 static const struct matrox_pll_ctl maven_PAL = {
-       540000,
-           50
+       .ref_freq = 540000,
+       .den = 50
 };
 
 static const struct matrox_pll_ctl maven_NTSC = {
-       450450, /* 27027000/60 == 27000000/59.94005994 */
-           60
+       .ref_freq = 450450,     /* 27027000/60 == 27000000/59.94005994 */
+       .den = 60
 };
 
 static int matroxfb_PLL_mavenclock(const struct matrox_pll_features2* pll,