From patchwork Fri Nov 23 12:31:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 10695741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 999A613BB for ; Fri, 23 Nov 2018 12:32:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A1662BEC4 for ; Fri, 23 Nov 2018 12:32:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 781C92BFC0; Fri, 23 Nov 2018 12:32:01 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 211662BEC4 for ; Fri, 23 Nov 2018 12:32:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 452336E687; Fri, 23 Nov 2018 12:32:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by gabe.freedesktop.org (Postfix) with ESMTPS id E44336E688 for ; Fri, 23 Nov 2018 12:31:50 +0000 (UTC) Received: by mail-ed1-x543.google.com with SMTP id j6so10120909edp.9 for ; Fri, 23 Nov 2018 04:31:50 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=95lnMwV0xz6QCWg2ibgxwMxKqcmkmH4hhHUwDkGKlDQ=; b=NK/CylsjRy7oCOH3JpmqxUTPwKoIkogkvZST6s6lm7FEIy/baDez9K1lOkcMmZFpBJ rpnA/MjDbOlHamkBBoB9RkB7KxZ0my3g8i4HESMSajvSEuv/sJZzqahNkS0e8Ymkt1b6 BpWeLUL+kSDwxGdcbKiLse3DE7py6SVPlQGEmNUJwpjmvNqt+fZUHfcojWLu4uQIt1qM Saln8ErW7pkt/Xbj6QGv2iVzswy7TqU0sxFSOqJQt9aNPinSLTraeuwFwwTmKtPO+u4X SjQwfiwFc74lqru66uzvX7ratVIWaSsFEprMcof/5uxeUAbblHFqifQvi6dpoqeah81L q3RQ== X-Gm-Message-State: AA+aEWaD9If57eDapimW7R8NdqrWlETZ6J06i/DqOxyKvfhSKN8hn481 AE+cmWiRdZIEc3DHv4FXETQ= X-Google-Smtp-Source: AFSGD/VOTA8cXjUfX9VfgzI4J+sPCa+9XRb1mriClafedvTllZIkx7HApRGLjNtxD3oKqu9iZKFJzg== X-Received: by 2002:a50:d557:: with SMTP id f23mr13361771edj.291.1542976309271; Fri, 23 Nov 2018 04:31:49 -0800 (PST) Received: from localhost (pD9E51040.dip0.t-ipconnect.de. [217.229.16.64]) by smtp.gmail.com with ESMTPSA id k13sm14991660edx.29.2018.11.23.04.31.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Nov 2018 04:31:48 -0800 (PST) From: Thierry Reding To: Thierry Reding Subject: [PATCH 7/7] arm64: tegra: Enable HDMI on P2972-0000 Date: Fri, 23 Nov 2018 13:31:38 +0100 Message-Id: <20181123123138.20739-7-thierry.reding@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181123123138.20739-1-thierry.reding@gmail.com> References: <20181123123138.20739-1-thierry.reding@gmail.com> MIME-Version: 1.0 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: linux-tegra@vger.kernel.org, Mikko Perttunen , dri-devel@lists.freedesktop.org, Jon Hunter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding Add the 5V HDMI regulator and hook up the VDD_1V0 and VDD_1V8HS supplies from the PMIC to the display block. Also enable the display hub which is responsible for instantiating the display controllers. Finally, enable the third SOR that drives the TMDS signals to the HDMI connector. Signed-off-by: Thierry Reding --- .../arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 15 +++++++++-- .../boot/dts/nvidia/tegra194-p2972-0000.dts | 25 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi index 57d3f00464ce..204a207ff4bd 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi @@ -163,7 +163,7 @@ in-ldo4-6-supply = <&vdd_5v0_sys>; in-ldo7-8-supply = <&vdd_1v8ls>; - sd0 { + vdd_1v0: sd0 { regulator-name = "VDD_1V0"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; @@ -171,7 +171,7 @@ regulator-boot-on; }; - sd1 { + vdd_1v8hs: sd1 { regulator-name = "VDD_1V8HS"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -262,5 +262,16 @@ regulator-always-on; regulator-boot-on; }; + + vdd_hdmi: regulator@1 { + compatible = "regulator-fixed"; + reg = <1>; + + regulator-name = "VDD_5V0_HDMI_CON"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio TEGRA194_MAIN_GPIO(A, 3) GPIO_ACTIVE_HIGH>; + enable-active-high; + }; }; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts index 86f05504ca38..cbae8e8b1281 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts @@ -13,6 +13,31 @@ status = "okay"; }; + host1x@13e00000 { + display-hub@15200000 { + status = "okay"; + }; + + dpaux@155e0000 { + status = "okay"; + }; + + sor@15b80000 { + status = "okay"; + + avdd-io-supply = <&vdd_1v0>; + vdd-pll-supply = <&vdd_1v8hs>; + hdmi-supply = <&vdd_hdmi>; + + nvidia,ddc-i2c-bus = <&ddc>; + nvidia,hpd-gpio = <&gpio TEGRA194_MAIN_GPIO(M, 2) GPIO_ACTIVE_LOW>; + }; + }; + + ddc: i2c@31c0000 { + status = "okay"; + }; + pwm@c340000 { status = "okay"; };