ARM: dts: Augment VGA connector bridge on Realview PBX

The PL111 in the ARM reference platforms are connected to
"panels" that are actually dumb VGA DAC connector bridges.
Now that we can support the proper bridges in the DRM driver,
fix this up.

Cc: Mali DP Maintainers <malidp@foss.arm.com>
Reviewed-by: Liviu Dudau <liviu.dudau@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi
index aeb49c4bd773f40fea508ea2e2ab342270664030..10868ba3277f52d1eef2be37df09b101187d9fcf 100644 (file)
--- a/arch/arm/boot/dts/arm-realview-pbx.dtsi
+++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi
@@ -34,7 +34,8 @@ aliases {
                serial1 = &serial1;
                serial2 = &serial2;
                serial3 = &serial3;
-               i2c0 = &i2c;
+               i2c0 = &i2c0;
+               i2c1 = &i2c1;
        };
 
        memory {
@@ -158,6 +159,49 @@ usb: usb@4f000000 {
                port1-otg;
        };
 
+       bridge {
+               compatible = "ti,ths8134a", "ti,ths8134";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               vga_bridge_in: endpoint {
+                                       remote-endpoint = <&clcd_pads>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+
+                               vga_bridge_out: endpoint {
+                                       remote-endpoint = <&vga_con_in>;
+                               };
+                       };
+               };
+       };
+
+       vga {
+               /*
+                * This DDC I2C is connected directly to the DVI portions
+                * of the connector, so it's not really working when the
+                * monitor is connected to the VGA connector.
+                */
+               compatible = "vga-connector";
+               ddc-i2c-bus = <&i2c1>;
+
+               port {
+                       vga_con_in: endpoint {
+                               remote-endpoint = <&vga_bridge_out>;
+                       };
+               };
+       };
+
        soc: soc@0 {
                compatible = "arm,realview-pbx-soc", "simple-bus";
                #address-cells = <1>;
@@ -285,7 +329,7 @@ sp810_syscon0: sysctl@10001000 {
                                               <&timclk>;
                };
 
-               i2c: i2c@10002000 {
+               i2c0: i2c@10002000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "arm,versatile-i2c";
@@ -396,7 +440,12 @@ gpio2: gpio@10015000 {
                        clock-names = "apb_pclk";
                };
 
-               /* DVI serial bus control is at 10016000 */
+               i2c1: i2c@10016000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "arm,versatile-i2c";
+                       reg = <0x10016000 0x1000>;
+               };
 
                rtc: rtc@10017000 {
                        compatible = "arm,pl031", "arm,primecell";
@@ -506,36 +555,15 @@ clcd: clcd@10020000 {
                        interrupt-names = "combined";
                        clocks = <&oscclk4>, <&pclk>;
                        clock-names = "clcdclk", "apb_pclk";
+                       /* 1024x768 16bpp @65MHz works fine */
+                       max-memory-bandwidth = <95000000>;
 
                        port {
                                clcd_pads: endpoint {
-                                       remote-endpoint = <&clcd_panel>;
+                                       remote-endpoint = <&vga_bridge_in>;
                                        arm,pl11x,tft-r0g0b0-pads = <0 8 16>;
                                };
                        };
-
-                       panel {
-                               compatible = "panel-dpi";
-
-                               port {
-                                       clcd_panel: endpoint {
-                                               remote-endpoint = <&clcd_pads>;
-                                       };
-                               };
-
-                               /* Standard 640x480 VGA timings */
-                               panel-timing {
-                                       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>;
-                               };
-                       };
                };
        };
 };