From patchwork Sun Mar 11 13:53:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10274747 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 035E96055C for ; Sun, 11 Mar 2018 13:53:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E848B28DE3 for ; Sun, 11 Mar 2018 13:53:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD14628DEB; Sun, 11 Mar 2018 13:53:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 41DA928DE3 for ; Sun, 11 Mar 2018 13:53:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 66A746E3EF; Sun, 11 Mar 2018 13:53:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 22FC56E3EF for ; Sun, 11 Mar 2018 13:53:41 +0000 (UTC) Received: by mail-pl0-x242.google.com with SMTP id w12-v6so7866791plp.4 for ; Sun, 11 Mar 2018 06:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ky6H6TRSO9DgsYIlGt3EI0X1Jq6Ze0jsvvVMqFz/3Bs=; b=Jb4G5QRXybtuiWutoUIUQLFpiPcZSDjOc1iVsepvB4s6uBGYns5y1Z4C9qa3CCoTXw Nwz6qqgzLzIjjfxsP8UT6TQ7clHQdaXTuED39QsNL8f53xko+BlqSyMr3i1rI7V53LO0 OJRAXaVWlAEcj2LrbhgW+a4tJcVGnYv17nRDs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ky6H6TRSO9DgsYIlGt3EI0X1Jq6Ze0jsvvVMqFz/3Bs=; b=eDkw+701QpDocyvc+i06USiWaNhOXaN9ZHXQFHEgloRwxB0NzZVokx/0tIWWnxcIXk Qau2CB3rsNzIlqNVMnPpgkni8X2mgPwYViLcA1ZQyTuTjkJLMXgr0g2SLmkG/a473AwU +39lI3RjdFizD9CldGMJiYjOVMFTX88hG7DXjakHaIsWKYP7fSU8eX1Ev0Dega1p4FG7 AXezGfeP7RquNl3GpNq+1DQuQ0lxL1LCiOVPOq6bwGZWnCHtQebtrcbHjW6XR4hZ5piT 7mkIcjo7ahmoKljr9N8m5nj+J2pbdWjiNhbJ1upv0AwZsi8HIRbYECwt75E6Gw23FYSG hiJg== X-Gm-Message-State: AElRT7HjUCiSLJ4MIcFdO+fBrISR1MJR135vqiSb8Pxm3al8wDwbdaCq kD5cLFJFCLkeOPsVPXCXhSyXNA== X-Google-Smtp-Source: AG47ELtw3+EdO8r/SffYBCjCH5WNzBwzVG7SWifhyIG3ayW3IVi+RC8FNTaYMPq80LuCwtB7jcDqew== X-Received: by 2002:a17:902:3041:: with SMTP id u59-v6mr4848052plb.115.1520776421591; Sun, 11 Mar 2018 06:53:41 -0700 (PDT) Received: from localhost.localdomain ([183.78.63.160]) by smtp.gmail.com with ESMTPSA id t16sm12318721pfm.69.2018.03.11.06.53.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Mar 2018 06:53:40 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/10] ARM: dts: Augment VGA connector bridge on Realview PBX Date: Sun, 11 Mar 2018 14:53:01 +0100 Message-Id: <20180311135307.6271-5-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180311135307.6271-1-linus.walleij@linaro.org> References: <20180311135307.6271-1-linus.walleij@linaro.org> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liviu Dudau , dri-devel@lists.freedesktop.org, Mali DP Maintainers MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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: Liviu Dudau Cc: Mali DP Maintainers Signed-off-by: Linus Walleij Reviewed-by: Liviu Dudau --- arch/arm/boot/dts/arm-realview-pbx.dtsi | 82 ++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/arm-realview-pbx.dtsi b/arch/arm/boot/dts/arm-realview-pbx.dtsi index aeb49c4bd773..10868ba3277f 100644 --- a/arch/arm/boot/dts/arm-realview-pbx.dtsi +++ b/arch/arm/boot/dts/arm-realview-pbx.dtsi @@ -34,7 +34,8 @@ serial1 = &serial1; serial2 = &serial2; serial3 = &serial3; - i2c0 = &i2c; + i2c0 = &i2c0; + i2c1 = &i2c1; }; memory { @@ -158,6 +159,49 @@ 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 @@ <&timclk>; }; - i2c: i2c@10002000 { + i2c0: i2c@10002000 { #address-cells = <1>; #size-cells = <0>; compatible = "arm,versatile-i2c"; @@ -396,7 +440,12 @@ 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 @@ 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>; - }; - }; }; }; };