From patchwork Tue Feb 18 22:03:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 3675501 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42F52BF13A for ; Tue, 18 Feb 2014 22:04:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F3D9201BA for ; Tue, 18 Feb 2014 22:04:13 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75BC820176 for ; Tue, 18 Feb 2014 22:04:12 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFslq-0007sC-LK; Tue, 18 Feb 2014 22:04:06 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFslo-0001Yz-66; Tue, 18 Feb 2014 22:04:04 +0000 Received: from mail-bk0-f43.google.com ([209.85.214.43]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WFslm-0001YF-0F for linux-arm-kernel@lists.infradead.org; Tue, 18 Feb 2014 22:04:02 +0000 Received: by mail-bk0-f43.google.com with SMTP id mx12so1406222bkb.2 for ; Tue, 18 Feb 2014 14:03:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=TK/gP4Xtjlr8EKHCfYf+cyUCQ2xIWYrmc4E37wNjaVM=; b=mkhGA8uKsxU5gh4z0kIYSwgnYeYiVpr67ngdlrpUClceccaV/JlIQIjH5kq3H8ly1s 7d7CLSGJZB1TB0YNSAZxiNq/dh5RBpRc/2lOx3ipvTdyDkvSYBwDandoAFmy1HiNaS/2 +8gO8yGYF6iHfJqbHRKZPjcZ1s7Xb64ovSbsSX4S1LQCByKPd5rtJfCEgQ/HFRv/1sWp vpAuXoDFQl4NSRYTfYygziePesyOjdCZ3sAJ2hDK1DrkgZQu0OqxXR/vetVQvMINSlcR mH0q9o0XvQu96WIkTpfz/c4Vw219xE9DcltSW33k2FokfyvX9TVcRb7aygRmjYLtW+g1 FfEQ== X-Received: by 10.204.65.129 with SMTP id j1mr12764bki.121.1392761013346; Tue, 18 Feb 2014 14:03:33 -0800 (PST) Received: from localhost (port-53245.pppoe.wtnet.de. [46.59.208.166]) by mx.google.com with ESMTPSA id f11sm16016236bkj.6.2014.02.18.14.03.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Feb 2014 14:03:32 -0800 (PST) From: Thierry Reding To: Stephen Warren , arm@kernel.org Subject: [PATCH] ARM: tegra: Add head numbers to display controllers Date: Tue, 18 Feb 2014 23:03:31 +0100 Message-Id: <1392761011-21701-1-git-send-email-thierry.reding@gmail.com> X-Mailer: git-send-email 1.8.4.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140218_170402_185583_6FC2399B X-CRM114-Status: UNSURE ( 8.28 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.7 (--) Cc: linux-tegra@vger.kernel.org, Thierry Reding , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Thierry Reding The number of the head specifies the index of the display controller unit and is required to properly configure outputs so that they receive video data from the correct source. Signed-off-by: Thierry Reding Acked-by: Stephen Warren --- Hi Olof, Kevin, Stephen requested that I send this patch your way so that it can be applied for 3.14. They aren't strictly necessary because there's a fallback if they are missing but if they aren't present, the driver will output undesirable error messages. Thanks, Thierry arch/arm/boot/dts/tegra114.dtsi | 4 ++++ arch/arm/boot/dts/tegra20.dtsi | 4 ++++ arch/arm/boot/dts/tegra30.dtsi | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi index 389e987ec281..44ec401ec366 100644 --- a/arch/arm/boot/dts/tegra114.dtsi +++ b/arch/arm/boot/dts/tegra114.dtsi @@ -57,6 +57,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + nvidia,head = <0>; + rgb { status = "disabled"; }; @@ -72,6 +74,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + nvidia,head = <1>; + rgb { status = "disabled"; }; diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 480ecda3416b..48d2a7f4d0c0 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -94,6 +94,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + nvidia,head = <0>; + rgb { status = "disabled"; }; @@ -109,6 +111,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + nvidia,head = <1>; + rgb { status = "disabled"; }; diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 18d52a7704cc..7f995739c1a7 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -170,6 +170,8 @@ resets = <&tegra_car 27>; reset-names = "dc"; + nvidia,head = <0>; + rgb { status = "disabled"; }; @@ -185,6 +187,8 @@ resets = <&tegra_car 26>; reset-names = "dc"; + nvidia,head = <1>; + rgb { status = "disabled"; };