From patchwork Wed Sep 23 19:37:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime COQUELIN X-Patchwork-Id: 54075 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 9B79122E14 for ; Wed, 23 Sep 2015 19:38:32 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf30098312wic.1 for ; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=3X0IagrZgsTjpGhzY1B4PknAIVvSU4QEkCStWt4uzFQ=; b=jL7M8BP39F7ZoOsWaQaXSfKtnxiEyqbEzDzmwrkV+Pd5NhWmjtDrx3gbP5QHfGXww6 F2a0g7/yNmCFoHV+7IPNWa9W3MdNwE8uFP3fWs6oKhlCIDR1vjsoSfVhexjpBqKgzO2c agQO6fIDVviyHrllow+bjQleh47yjGg7LvlcDsLMOMbPOhotWXXa+FJfNszeKbohNSxN D8vu8pp83CcP47e70RcDLxMnC9P5uzuWguYJby9qcx96s1L/VrzHKDxYVNMqu6nIbvcE nyhuPs7bBmOPoLlg/W4tbWnSzIbEvtPQppIK6cCQUv0ViFgPn1orq22jsq8tP8tzAUSl iQKw== X-Gm-Message-State: ALoCoQlZnYtkxAVUo42m0h/F9mVhYLg/dbuY7A3dVSWvTmoHUBuDm/gmJLy6IkXEsWCEASm8Y/ys X-Received: by 10.112.209.73 with SMTP id mk9mr2532909lbc.14.1443037111893; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.105 with SMTP id z9ls55539laz.18.gmail; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) X-Received: by 10.152.237.1 with SMTP id uy1mr1786972lac.33.1443037111758; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id m9si4861747laf.60.2015.09.23.12.38.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Sep 2015 12:38:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by lahh2 with SMTP id h2so39306434lah.0 for ; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) X-Received: by 10.152.23.97 with SMTP id l1mr6392850laf.56.1443037111160; Wed, 23 Sep 2015 12:38:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp49944lbq; Wed, 23 Sep 2015 12:38:30 -0700 (PDT) X-Received: by 10.66.161.137 with SMTP id xs9mr40269987pab.117.1443037110073; Wed, 23 Sep 2015 12:38:30 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id om6si12719937pbb.143.2015.09.23.12.38.29; Wed, 23 Sep 2015 12:38:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbbIWTi3 (ORCPT + 7 others); Wed, 23 Sep 2015 15:38:29 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:4913 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbbIWTi2 (ORCPT ); Wed, 23 Sep 2015 15:38:28 -0400 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by m0046037.ppops.net (8.14.5/8.14.5) with SMTP id t8NJaiLH001245; Wed, 23 Sep 2015 21:37:44 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by m0046037.ppops.net with ESMTP id 1x3shhaeqj-1 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 23 Sep 2015 21:37:44 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8406A31; Wed, 23 Sep 2015 19:37:26 +0000 (GMT) Received: from Webmail-eu.st.com (Safex1hubcas22.st.com [10.75.90.92]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 04F33133E; Wed, 23 Sep 2015 19:37:42 +0000 (GMT) Received: from localhost (10.251.16.185) by Webmail-ga.st.com (10.75.90.48) with Microsoft SMTP Server (TLS) id 14.3.224.2; Wed, 23 Sep 2015 21:37:42 +0200 From: Maxime Coquelin To: , , Rob Herring CC: , , , Subject: [PATCH 2/3] ARM: dts: stih407/410: Tidy up display nodes Date: Wed, 23 Sep 2015 21:37:28 +0200 Message-ID: <1443037049-6167-3-git-send-email-maxime.coquelin@st.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1443037049-6167-1-git-send-email-maxime.coquelin@st.com> References: <1443037049-6167-1-git-send-email-maxime.coquelin@st.com> MIME-Version: 1.0 X-Originating-IP: [10.251.16.185] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151, 1.0.33, 0.0.0000 definitions=2015-09-23_09:2015-09-23, 2015-09-23, 1970-01-01 signatures=0 Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: maxime.coquelin@st.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The display nodes are common to both STiH407 and STiH410, move them to the family file. Signed-off-by: Maxime Coquelin --- arch/arm/boot/dts/stih407-family.dtsi | 13 +++++++++++++ arch/arm/boot/dts/stih407.dtsi | 13 ------------- arch/arm/boot/dts/stih410.dtsi | 13 ------------- 3 files changed, 13 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 9975e8f..5b454d9 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -152,6 +152,19 @@ ; }; + /* Display */ + vtg_main: sti-vtg-main@8d02800 { + compatible = "st,vtg"; + reg = <0x8d02800 0x200>; + interrupts = ; + }; + + vtg_aux: sti-vtg-aux@8d00200 { + compatible = "st,vtg"; + reg = <0x8d00200 0x100>; + interrupts = ; + }; + serial@9830000 { compatible = "st,asc"; reg = <0x9830000 0x2c>; diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi index 3efa3b2..98c3468 100644 --- a/arch/arm/boot/dts/stih407.dtsi +++ b/arch/arm/boot/dts/stih407.dtsi @@ -10,19 +10,6 @@ #include "stih407-family.dtsi" / { soc { - /* Display */ - vtg_main: sti-vtg-main@8d02800 { - compatible = "st,vtg"; - reg = <0x8d02800 0x200>; - interrupts = ; - }; - - vtg_aux: sti-vtg-aux@8d00200 { - compatible = "st,vtg"; - reg = <0x8d00200 0x100>; - interrupts = ; - }; - sti-display-subsystem { compatible = "st,sti-display-subsystem"; #address-cells = <1>; diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 6f40bc9..23f4a48 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -85,19 +85,6 @@ phy-names = "usb"; }; - /* Display */ - vtg_main: sti-vtg-main@8d02800 { - compatible = "st,vtg"; - reg = <0x8d02800 0x200>; - interrupts = ; - }; - - vtg_aux: sti-vtg-aux@8d00200 { - compatible = "st,vtg"; - reg = <0x8d00200 0x100>; - interrupts = ; - }; - sti-display-subsystem { compatible = "st,sti-display-subsystem"; #address-cells = <1>;