From patchwork Thu Dec 8 00:57:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9467349 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50AEA60231 for ; Fri, 9 Dec 2016 01:40:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 449E328534 for ; Fri, 9 Dec 2016 01:40:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38FC328615; Fri, 9 Dec 2016 01:40:12 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 C128028534 for ; Fri, 9 Dec 2016 01:40:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D220A6E8AD; Fri, 9 Dec 2016 01:39:52 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id D0BD06E654 for ; Thu, 8 Dec 2016 00:59:27 +0000 (UTC) Received: by mail-pg0-x244.google.com with SMTP id x23so25023770pgx.3 for ; Wed, 07 Dec 2016 16:59:27 -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:in-reply-to:references; bh=91RHKiECttwRm7CMv9zfqvjiT0IMu25kypq0sGH9cJA=; b=klba289cp8CfYKc0v2NG5guTvQ80hpD7ZfZkaznhxX5+Qg8+GGMj3ivJ9zDum/lffz gLcTmgH/Miop5sKVsFdEP5ac+uQGGbfmhQ4GSBimX9djWg81Ewzm5zhiVd7xzPYJMYjs wQWTkVnCc8cRHYxWPXZeLTrrHcBN8rQpF77jZzkHUfR8A3KOGs7OZboakapE8a8zqUCR FNX2QtyiSrN93DrJM3ymLtYN0ZM80ZkdZXDdBtq+MDtKPBrp0X9aarb8Q5IR/waaQcA5 W09HDTiVO8K7GVAVslDSrIdilyb1OSB53RR93Hh8szWJ9bkaBzoeeauVjeTCr7ZJE4JG T17w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=91RHKiECttwRm7CMv9zfqvjiT0IMu25kypq0sGH9cJA=; b=BUMosJWlk5FnqoM4tvY+Ws+JhZNwqeackyiR0sRN+JsMr21p1nrqwQnhfOG0VeuTH3 VbuWUvc0odUswqmy4APSUNnVrYpOxg69jS7nhokoNe0B4hdIHTtnORSGRwAYuS/MctBW KVvF+RPC4Tebbe7aLCB00HuU1jegkQ3dTN7Ur0H9ecTgQ/RUEYKpjOVWJucUNOINODqz ZzQ6/iUIjXqb/yeZWPlIZ9U3T5/NaENvROZ1UC1KUR41IbMP1fG3EqGRW2f4IwB7ClTN BLvpNrXZsYwIAYU5dkQnU3ZtfIlxWpp49DbIpR7VtepGchqB+1Jlxny6P1bNmfKsSYqU LbZQ== X-Gm-Message-State: AKaTC02BkJM3nQsziqQgiTxGZ71cwB96qvrALmEHN5m2dIG/DCxLUqajrXpiQ19TF7eH/w== X-Received: by 10.84.215.148 with SMTP id l20mr152384730pli.120.1481158767284; Wed, 07 Dec 2016 16:59:27 -0800 (PST) Received: from majic.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id n25sm45265872pfi.33.2016.12.07.16.59.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 16:59:26 -0800 (PST) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: shawnguo@kernel.org, kernel@pengutronix.de, fabio.estevam@nxp.com, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, tomi.valkeinen@ti.com, p.zabel@pengutronix.de Subject: [PATCH 02/12] ARM: dts: imx6qdl: rename ipu client nodes Date: Wed, 7 Dec 2016 16:57:43 -0800 Message-Id: <1481158673-15937-3-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481158673-15937-1-git-send-email-steve_longerbeam@mentor.com> References: <1481158673-15937-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 09 Dec 2016 01:39:51 +0000 Cc: devicetree@vger.kernel.org, linux-fbdev@vger.kernel.org, Steve Longerbeam , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP To allow for IPU client devices that are composed of more than one port for input and output (SMFC and IC), change the nodes from being a single port node to nodes that can contain multiple ports. Rename the nodes to use the following format: "ipu_". The IPUv3 driver will then need to lookup the client nodes by name rather than by port id. Signed-off-by: Steve Longerbeam --- arch/arm/boot/dts/imx6q.dtsi | 12 ++++++------ arch/arm/boot/dts/imx6qdl.dtsi | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index e9a5d0b..2b261ba 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -141,18 +141,18 @@ clock-names = "bus", "di0", "di1"; resets = <&src 4>; - ipu2_csi0: port@0 { + ipu2_csi0: ipu2_csi@0 { reg = <0>; }; - ipu2_csi1: port@1 { + ipu2_csi1: ipu2_csi@1 { reg = <1>; }; - ipu2_di0: port@2 { + ipu2_di0: ipu2_di@0 { #address-cells = <1>; #size-cells = <0>; - reg = <2>; + reg = <0>; ipu2_di0_disp0: disp0-endpoint { }; @@ -174,10 +174,10 @@ }; }; - ipu2_di1: port@3 { + ipu2_di1: ipu2_di@1 { #address-cells = <1>; #size-cells = <0>; - reg = <3>; + reg = <1>; ipu2_di1_hdmi: hdmi-endpoint { remote-endpoint = <&hdmi_mux_3>; diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index e01e5d5..2465187 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -1226,18 +1226,18 @@ clock-names = "bus", "di0", "di1"; resets = <&src 2>; - ipu1_csi0: port@0 { + ipu1_csi0: ipu1_csi@0 { reg = <0>; }; - ipu1_csi1: port@1 { + ipu1_csi1: ipu1_csi@1 { reg = <1>; }; - ipu1_di0: port@2 { + ipu1_di0: ipu1_di@0 { #address-cells = <1>; #size-cells = <0>; - reg = <2>; + reg = <0>; ipu1_di0_disp0: disp0-endpoint { }; @@ -1259,10 +1259,10 @@ }; }; - ipu1_di1: port@3 { + ipu1_di1: ipu1_di@1 { #address-cells = <1>; #size-cells = <0>; - reg = <3>; + reg = <1>; ipu1_di1_disp1: disp1-endpoint { };