Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / arm-realview-pb11mp.dts

diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 63d6a051839f55248db749e261885a64961f6ea1..3944765ac4b067b0d12c9edf3e4ff34bcf720d62 100644 (file)
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -627,16 +627,17 @@
                                        };
                                };
 
+                               /* Standard 640x480 VGA timings */
                                panel-timing {
-                                       clock-frequency = <63500127>;
-                                       hactive = <1024>;
-                                       hback-porch = <152>;
-                                       hfront-porch = <48>;
-                                       hsync-len = <104>;
-                                       vactive = <768>;
-                                       vback-porch = <23>;
-                                       vfront-porch = <3>;
-                                       vsync-len = <4>;
+                                       clock-frequency = <25175000>;
+                                       hactive = <640>;
+                                       hback-porch = <48>;
+                                       hfront-porch = <16>;
+                                       hsync-len = <96>;
+                                       vactive = <480>;
+                                       vback-porch = <33>;
+                                       vfront-porch = <10>;
+                                       vsync-len = <2>;
                                };
                        };
                };