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: 1002288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y3vCCUEB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 431bKN045Rz9s7T for ; Fri, 23 Nov 2018 23:31:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504321AbeKWXPw (ORCPT ); Fri, 23 Nov 2018 18:15:52 -0500 Received: from mail-ed1-f65.google.com ([209.85.208.65]:41562 "EHLO mail-ed1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504319AbeKWXPw (ORCPT ); Fri, 23 Nov 2018 18:15:52 -0500 Received: by mail-ed1-f65.google.com with SMTP id z28so10119836edi.8 for ; Fri, 23 Nov 2018 04:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=95lnMwV0xz6QCWg2ibgxwMxKqcmkmH4hhHUwDkGKlDQ=; b=Y3vCCUEBQjR/jZH4EstGTebQWNgFs5Vg+NpPPNtPUyL3gIps1NO8lk4aHb4PwIgfGc vxhmFr264WV9bBs4RlQMc1vk80mjpM9LUiZoHHcqWNFguMZ8HdBPbjwYQGvk0snqpbou bn55Oa1QcNj5Bmd4W9yuhFJhkkuWRHPJf9yk9wYd30X2tDY2jtIJP0TVd+TDDYmCAXWw oS1r6oPhbu1BXXIh44SoDtedsHXagTRftyfPv0c9lk8zj3S+yQscIG5/o5YA48xxQURh KjcF5YniyaMhmBqL115YULSDwKUsrQVumzpuIgrrzd2Zp4E2KEV1jCOWDeyPq5pMzrQt DMPw== 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=hHMTNwP5txxPn/OAKm1y6eroExK26wsldBEO4ofhccWhSnMrHqVXRZxEMEzK8gygIB c20tiSYfl751z4KbRKbGmFm2pFrHMDcnd6j+T7+h73ckbYnjqSFiBZXrEDZXB8YT9Arq 4Ai41zl929kqxqoLSzE7OdKNIm/kMUJ2Qbb7Z6dgP828/B7QyXOgyVoiOh8+QbR5o7N9 3EoLuDPvzEVG7BEJAjh9qz+/LhTLIrqKAp2lZD9kCq9MNb0oRgBm9UGHS/iFa2bY9GhC b/Z85ufTki61nW1ZoEdmkr6tLJvKkY72CSdQ6bxQ7XjGJWvuDMMR0yG1iJYcv/1SSIlm nSGg== X-Gm-Message-State: AA+aEWbJk1zZhaoHKx7BDk1qdG+1BsJxtehWCcaJQmuAgr23ux4slVoT 67N7EnUqUCGu3pO8uEA058s= 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 Cc: Jon Hunter , Mikko Perttunen , dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org 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 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org 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"; };