From patchwork Thu Oct 5 14:31:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Franchi X-Patchwork-Id: 9987343 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 0B57A6029B for ; Thu, 5 Oct 2017 14:32:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F015928C5B for ; Thu, 5 Oct 2017 14:32:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E32B428CA0; Thu, 5 Oct 2017 14:32:49 +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.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CAE2928C5B for ; Thu, 5 Oct 2017 14:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CRczDaulUestLWX4TOKHbeeSL9uyUJDUGlId5ZiKlQ0=; b=tzT0/eEHSxryPL /OrXSFBm6kZMi1Zia5NjxiL5PWd6nM6JxboPdciY7/4kX5GvoNqyiHy4tXzm1jzTv2F8mNfP6DL9R 2p/Y8+28Wb57qm8IEO9qAmj1C9Ar6t2iTmHhYKeDz+D3LlGaQkN/COlFBV6f1plHfL4EOcuvdfhCr f4OK8zMZRcftp8uOoVthkkd7HzF758rfDehAV7KAJNZZJ9FzEcr8FaKXkJ7Zn4T1dsBd6ODwrbOZF HgVWWBYVmTSOiyN7omxqX8eoUGYzWf1N8wS4yPNtU5aJdMOppSQjUzdd8nabyR8jWi+jyGErxo9uU bMvLlMJONFCjE6cQgjrg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e07Cd-0008Ns-3f; Thu, 05 Oct 2017 14:32:43 +0000 Received: from mail-bn3nam01on0623.outbound.protection.outlook.com ([2a01:111:f400:fe41::623] helo=NAM01-BN3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e07CE-000806-ON for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2017 14:32:21 +0000 Received: from BLUPR0301CA0041.namprd03.prod.outlook.com (10.162.113.179) by CO2PR03MB2358.namprd03.prod.outlook.com (10.166.93.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Thu, 5 Oct 2017 14:31:55 +0000 Received: from BL2FFO11FD019.protection.gbl (2a01:111:f400:7c09::150) by BLUPR0301CA0041.outlook.office365.com (2a01:111:e400:5259::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.56.11 via Frontend Transport; Thu, 5 Oct 2017 14:31:54 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Thu, 5 Oct 2017 14:31:54 +0000 Received: from b58965-3.am.freescale.net (b58965-3.am.freescale.net [10.29.244.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v95EVod0021205; Thu, 5 Oct 2017 07:31:52 -0700 From: Marco Franchi To: Subject: [PATCH v3 2/2] ARM: dts: imx51: Fix inconsistent display port names Date: Thu, 5 Oct 2017 11:31:41 -0300 Message-ID: <1507213901-1349-2-git-send-email-marco.franchi@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507213901-1349-1-git-send-email-marco.franchi@nxp.com> References: <1507213901-1349-1-git-send-email-marco.franchi@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131516875149567137; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7966004)(39380400002)(346002)(39860400002)(376002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(16586007)(2906002)(316002)(8936002)(8676002)(8656003)(5003940100001)(189998001)(97736004)(36756003)(68736007)(50986999)(85426001)(6916009)(104016004)(81156014)(4326008)(2950100002)(86362001)(575784001)(54906003)(5660300001)(2351001)(53936002)(498600001)(33646002)(39060400002)(77096006)(81166006)(50226002)(48376002)(47776003)(76176999)(50466002)(106466001)(356003)(305945005)(6666003)(105606002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2358; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:Ae7pDVj7i4H+8SpGEjDt4TNKhyb9Edb9c/hX6C3kCBItgsXn4uZ5ixaqcreUtl7frLhJRME/dWbBlyBjsH4Y8PUxjqTMUAZqEGe94NGq8V2CJSa8K8e7f1Toic4f3apD MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45a09e50-3c2e-40e9-64a1-08d50bfdd3b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:CO2PR03MB2358; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 3:jPvQFPbY1ZlZc4PAZMR6p1EV6lLwB7a4nfNxtd/H7VZM8aYzMqIiFv3BjPinx5i033KUvm9ko6zytmcwXvNCRvwSjfcfbiI96KqV9exUznsdLN83EJFdBpbbwbia6B4Kp82wPB27WDrLVEvwLRBMO/BaF9FEV1VnMJUFpK5Bkdn9Iqp/nk4NlY5698i0jnfgRKYB7+qfzIsSt4M47nEMnVV11R6cMh1sXpzOOUbmCsERTSvBCTlpS9/frKBNmI67IIpWrn3AnCpkRb88IVx2sjUrD+nNCeT+/ABrvpKrWdJ2azZtc6AzihlWBNzhdEjR3iY525W0iun0cYbHb77O+13WRc8WKCugyMRkvppLXD4=; 25:q1WiGmvDfwyhvF9q60/v0LotHu57AWKkFdmQQr4ziV5t/MTL0yt07W5AuXhGLmize31sDBtbiCpcqTWY9mPpaTXs5TO0chUr6p9p39fddExwsPNadyPyxCFLOMNmb4u6wSRZj7H+25vykX3bNDkuKTqtGLA0V6+LSwmINH21ap4CZG/94utIvvEzRd9+N6aFtt8DjrAVZbQ8GLL3d2faOSiNEXg2gpNb3J9uxfcPuP63NADSoco7bctsxRLfh47GITghExNUsKftbBDidaTb+EJJoRE+xibCd0y94auA5hkS94Snd8PUuFhoKtd/byqz1Q2YrRujiQ6nNAa6VH3pyg== X-MS-TrafficTypeDiagnostic: CO2PR03MB2358: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 31:jOrY82yEO1RR2L9BOoY1FhdWb8ulcdS+I9uPRo8UZuYdNIsI507+SoxEFCMhB5ZWfMTySaX7NHam22Q1ddZJdXZmB6XPbjV+QCCdSMSFSvT+pJbN69sCu2TXL8yE+8tO5y1lstzXrwlH2qdgxLcIvyBKzHLSpE2HA9LsXKpmZefUxroksF6iGftiiCSbMbCYYjrYYd9lZTsi7642HvA9FYWqlX31trJ02jw1FT26CH8=; 4:81G3mNgBH1rgHJ+Jlrh7uPA/hHSBS6bUjPJdwjUAWVPuEVBWf9MOA+Y5TR4h/EnCdkBGdV7sUxU2H8Uqnj81DsI76IeowRuII1wxi3l29pmhH965d40D1z+pxUriaTgba4DzwHYj8lwQIk8MN4jdXMKtEs4M5YNAug7PBHR1lVUZ5XFpcxk04fZYvdsHmWwm0/dWlsTsUVpJfDCCAYKhltGawe33BR+cRevld14EbSIYdevuWZD7aVykMEEWMGfoiVA05iqIPuu5zA8SkLpMA8m86l4uqvMETzq13YzyyN8= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123561025)(20161123565025)(20161123559100)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CO2PR03MB2358; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CO2PR03MB2358; X-Forefront-PRVS: 04519BA941 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2358; 23:pwolFHeDMiJhwiFn1xTB5eAjzO3w7n7DGffmcIr33?= =?us-ascii?Q?/i9tmKh5zkJSRhOdO5TBE+0aF0Q122rdWgkRwO/JDN/yul4iJKByCuMoLUYB?= =?us-ascii?Q?ERas8pI/i9h6WnnA09imp+RTvS/zYrK2la173IdDRbm2FUI5ZUDcdU4yWZz7?= =?us-ascii?Q?E/+voQ4ydtI5Ovw2I2BqPsfIPslvChBoiqaGnY1tWlh+8EpbFK0LmnFFFpri?= =?us-ascii?Q?k8CeeamlNag3gUCV4WCgE9e+Jr9ahxpxJ+tm8SUgkYFxeqCDkJ4H9XW37FRF?= =?us-ascii?Q?gAM8YcXoCgGi3KI/f014ecn+865X7OOskyB+sir9QvjW2kSNcEyVjbqvxtus?= =?us-ascii?Q?wKXD3ySLPINqeLZIjpNWMmgSnlVpAY8fRuxH2KwaGKqAsneAh7xO0oqlvf8a?= =?us-ascii?Q?zJ7lc++dZGviChLBdYaQW2UI18H+62Pvu+AJWEjjQOn3jL6iWty+iPG/tbG6?= =?us-ascii?Q?oR3ivEAr2I9ZQK8WPb8NRP1HXqyOLNy7zpiFvnTdPt+L1b6dBZmDB/xHzcYp?= =?us-ascii?Q?yygFm3dn0XbflLGO9jCHkmSjVLvRkfMTUcJlK6PHjDDFMR4S/RFLV8KWJWia?= =?us-ascii?Q?9h6xN6ClhA0mSJk5cmBGT7pK775itiIsKAZsq2IunDgOrXRdxSFL5YLPD2mP?= =?us-ascii?Q?tjc5H7OQMBawdUGX+Z1pteZlyYdBQrAnL3HSVVTbjuDxuZGXD+e/utFAciIP?= =?us-ascii?Q?uZv6QXQgRHp3WKSZ4l+SEkxz0U/BNse57lNiZMsO0HIN0l4CSZWQQReZKtg3?= =?us-ascii?Q?0mSgaGlCirvMa2IhvUu6Hsmf+NsSrxAjYK6S1C96hrLj8Co8OgthxGorO3S/?= =?us-ascii?Q?XrZsC2CFNZiVZtOPhv9XRLR902byiqfVjnlcP9JiYcRjOVOSlxV0L2HV5aFc?= =?us-ascii?Q?W8nf9YAVRnLRTTA1CeM8UZHzaQJtW6rHokplYneSxdGYFsnXd7HpVVH1UUF0?= =?us-ascii?Q?046LJ8ljDYdtgHcpXjAVuOSbrTddP8t/yOiGZVn83W97SazYMS4/HdGClAyf?= =?us-ascii?Q?oMpE9xG0YIuHJASdBu7LbiwC3TuFPMVPOJZ0a0xYBmsjqJPA4+d4gtyoOUZ0?= =?us-ascii?Q?aJa6JR03F5jeUlrDhcCRm4X+s+tCYZtvWZsp/zWjkDARUPNKAjKSKTY+BivD?= =?us-ascii?Q?u2dvJt9S64einEfP0DDbNnC3ebc6UnevdxU+L1DOsc6xSF+T5JwxhLIAlqfD?= =?us-ascii?Q?F42PwFoVK6rLRgScb+Es2K881/xJGQGHzwUlgsopYF2EABQOzvLvI3Qhg=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2358; 6:8zosx8JrEBJWBj4PP5YBQmu/In+x5Oex1c3dDGz39SCI5DHjH3MI1iMzH1uI+iSTJ/e43r23t+EbMTUNdY5R9XIaaBXNrea646MRxvxtKZj3p1b5gNYP160j9FxPTbvyo/r8STPNIbnOFWos3F0qu8Qf3knhLMhQSZISCMqOVR89i6GOo9t1ua9nPyEfbVBMtH4wLvEd+vmOhrT0a1Ej+xGwjP3te6ee6ZQX0vJodWxlilIDtoHiJNMoU4wl6K6KU7z8yu52T6wJJQI5Rcd2GPqyQEqSJYbJq2H7Q+l7+14zwY1qacn0dTrh5yKIalrLsYJDJmtDzAGnr1JOT4WnRw==; 5:APx3vBNwOwH/0+spXtVUKENi0uoxxa1D0it9kC6E0LAYpHFzBFZrOhrfvvXfehRz1ybQvBFCaSEdwxGr/6+racTe6Ga0QCSLk5s8/s7cLEy9+Eqa3p7Eb+V3vUMQkTBZsJokCDcHbzFeD/gBOYEECA==; 24:r81ErKl3J1tWxL25Zw33PGSAxHqTW3uuq/wcjk8L3MeO/H+MGQ4L2g798PtLWki/f32cUdzW0WrJnwiv9E5HpbCbhr0PcAj9L8ozYrR8txQ=; 7:b3BbB7P3jiOWUM1GAiaiIKC201Vj6tvMdeIV5MYq+gmr6UB98FiLwvzbX0/2QLlljTVbDKWkXuCiHQ7y33/rgPa360LdAMsowFztaO1h0emaHFPbXY02qqrO5KI/6KNdfQp4AAjUt8MQZ9qvo5xQihaLIxXyJycJ6jq0Ohrf8GZVzjLcab8GzfnhSH3yOvwfGNb/Tv1mrW9YuwEQkpG2HF5S1riJyBhMtITjJhMLMbE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2017 14:31:54.7851 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2358 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171005_073219_226414_CDD43948 X-CRM114-Status: GOOD ( 12.62 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, marcofrk@gmail.com, p.zabel@pengutronix.de, Marco Franchi , festevam@gmail.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Contrary to later i.MX SoCs, the parallel display interface pad groups on i.MX51 are called DISP1 and DISP2 in the Reference Manual, not DISP0 and DISP1. Fix this inconsistence by changing the DISP names in the i.mx51 dts. Signed-off-by: Marco Franchi Acked-by: Philipp Zabel Reviewed-by: Fabio Estevam --- Changes since v2: -change message log text arch/arm/boot/dts/imx51-apf51dev.dts | 4 ++-- arch/arm/boot/dts/imx51-babbage.dts | 12 ++++++------ arch/arm/boot/dts/imx51-ts4800.dts | 6 +++--- arch/arm/boot/dts/imx51.dtsi | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts index f04d0df..2f1a9d2 100644 --- a/arch/arm/boot/dts/imx51-apf51dev.dts +++ b/arch/arm/boot/dts/imx51-apf51dev.dts @@ -51,7 +51,7 @@ port { display_in: endpoint { - remote-endpoint = <&ipu_di0_disp0>; + remote-endpoint = <&ipu_di0_disp1>; }; }; }; @@ -218,6 +218,6 @@ }; }; -&ipu_di0_disp0 { +&ipu_di0_disp1 { remote-endpoint = <&display_in>; }; diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts index 297953c..668c37b 100644 --- a/arch/arm/boot/dts/imx51-babbage.dts +++ b/arch/arm/boot/dts/imx51-babbage.dts @@ -39,7 +39,7 @@ }; }; - display0: disp0 { + display1: disp1 { compatible = "fsl,imx-parallel-display"; interface-pix-fmt = "rgb24"; pinctrl-names = "default"; @@ -61,12 +61,12 @@ port { display0_in: endpoint { - remote-endpoint = <&ipu_di0_disp0>; + remote-endpoint = <&ipu_di0_disp1>; }; }; }; - display1: disp1 { + display2: disp2 { compatible = "fsl,imx-parallel-display"; interface-pix-fmt = "rgb565"; pinctrl-names = "default"; @@ -93,7 +93,7 @@ port { display1_in: endpoint { - remote-endpoint = <&ipu_di1_disp1>; + remote-endpoint = <&ipu_di1_disp2>; }; }; }; @@ -348,11 +348,11 @@ }; }; -&ipu_di0_disp0 { +&ipu_di0_disp1 { remote-endpoint = <&display0_in>; }; -&ipu_di1_disp1 { +&ipu_di1_disp2 { remote-endpoint = <&display1_in>; }; diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts index e6be869..35a1112 100644 --- a/arch/arm/boot/dts/imx51-ts4800.dts +++ b/arch/arm/boot/dts/imx51-ts4800.dts @@ -50,7 +50,7 @@ power-supply = <&backlight_reg>; }; - display0: disp0 { + display1: disp1 { compatible = "fsl,imx-parallel-display"; interface-pix-fmt = "rgb24"; pinctrl-names = "default"; @@ -73,7 +73,7 @@ port@0 { display0_in: endpoint { - remote-endpoint = <&ipu_di0_disp0>; + remote-endpoint = <&ipu_di0_disp1>; }; }; }; @@ -107,7 +107,7 @@ }; }; -&ipu_di0_disp0 { +&ipu_di0_disp1 { remote-endpoint = <&display0_in>; }; diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index 1ee1d54..378be72 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi @@ -148,14 +148,14 @@ ipu_di0: port@2 { reg = <2>; - ipu_di0_disp0: endpoint { + ipu_di0_disp1: endpoint { }; }; ipu_di1: port@3 { reg = <3>; - ipu_di1_disp1: endpoint { + ipu_di1_disp2: endpoint { }; }; };