From patchwork Thu Sep 17 12:48:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 7206491 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A85229F39B for ; Thu, 17 Sep 2015 12:48:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5CD4320824 for ; Thu, 17 Sep 2015 12:48:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 612CD2080E for ; Thu, 17 Sep 2015 12:48:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751834AbbIQMsu (ORCPT ); Thu, 17 Sep 2015 08:48:50 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:38253 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751744AbbIQMst (ORCPT ); Thu, 17 Sep 2015 08:48:49 -0400 Received: by wiclk2 with SMTP id lk2so25877885wic.1; Thu, 17 Sep 2015 05:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=tOpfM4feW6rd6idkqyluAkBR+hVAWQIztpkI1r6oQC4=; b=DxWQB8MxQiKcDKScjPH+1xFa1FiOGwm8+/I8iZLuh4AyjliNS4vfbT78RhClsyonBZ 7KGzVU/OuYsYb7JMoU/c2hOda1QkgzgjLbUnHMB1mbcl7AbOH7vQA1wYM9zGKJ1Ggj7o dS8ecXEz0haNeQeSF+zSg2qYULXAhJXhsq/R/75DVN3l4LMequpAmcNDSyQMHTk6u2Xw Oi8Oo9S8NUS3OVmU4vC+ht0FEPH1657r3iDu6XliLz8Y4/gAt1jbte70lu5LlLNrwONb gBLliAdb6cnu0uFcpBk15+p+cxKFhfNGyOcrCi9A3DwwXd9rhq897IY273tpmeFXJ8O2 N3EQ== X-Received: by 10.180.103.70 with SMTP id fu6mr7774825wib.9.1442494127984; Thu, 17 Sep 2015 05:48:47 -0700 (PDT) Received: from cizrna.lan ([109.72.12.203]) by smtp.gmail.com with ESMTPSA id xt1sm3266137wjb.32.2015.09.17.05.48.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 05:48:47 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Sean Paul , Tomeu Vizoso , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Kukjin Kim , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH RESEND] ARM: dts: Move display-timings node from fimd to dp Date: Thu, 17 Sep 2015 14:48:39 +0200 Message-Id: <1442494120-463-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.4.3 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,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: Sean Paul This patch moves the display-timings node from fimd to dp to reflect the device tree bindings change. Signed-off-by: Sean Paul [tomeu.vizoso@collabora.com: Rebased] Signed-off-by: Tomeu Vizoso Reviewed-by: Krzysztof Kozlowski --- Hi, looks like a long time ago the bindings were changed and the DTs for these boards weren't updated. I have retaken Sean's forgotten patch and rebased it, but I have only tested on an Arndale that exynos-drm doesn't complain about missing timings. Regards, Tomeu --- arch/arm/boot/dts/exynos5250-arndale.dts | 8 ++++---- arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 ++++++++-------- arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 ++++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts index db3f65f3eb45..c000532c1444 100644 --- a/arch/arm/boot/dts/exynos5250-arndale.dts +++ b/arch/arm/boot/dts/exynos5250-arndale.dts @@ -129,10 +129,6 @@ samsung,color-depth = <1>; samsung,link-rate = <0x0a>; samsung,lane-count = <4>; -}; - -&fimd { - status = "okay"; display-timings { native-mode = <&timing0>; @@ -152,6 +148,10 @@ }; }; +&fimd { + status = "okay"; +}; + &hdmi { hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>; vdd_osc-supply = <&ldo10_reg>; diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index c625e71217aa..0f5dcd418af8 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -89,14 +89,6 @@ pinctrl-names = "default"; pinctrl-0 = <&dp_hpd>; status = "okay"; -}; - -&ehci { - samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; -}; - -&fimd { - status = "okay"; display-timings { native-mode = <&timing0>; @@ -116,6 +108,14 @@ }; }; +&ehci { + samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; +}; + +&fimd { + status = "okay"; +}; + &hdmi { hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts index 98871f972c8a..7520d52f4e22 100644 --- a/arch/arm/boot/dts/exynos5420-smdk5420.dts +++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts @@ -98,10 +98,7 @@ samsung,link-rate = <0x0a>; samsung,lane-count = <4>; status = "okay"; -}; -&fimd { - status = "okay"; display-timings { native-mode = <&timing0>; timing0: timing@0 { @@ -118,6 +115,10 @@ }; }; +&fimd { + status = "okay"; +}; + &hdmi { status = "okay"; hpd-gpio = <&gpx3 7 0>;