From patchwork Thu Oct 5 12:43:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Franchi X-Patchwork-Id: 9987027 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 5B23960291 for ; Thu, 5 Oct 2017 12:44:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C5BC2015F for ; Thu, 5 Oct 2017 12:44:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 40B2A28C71; Thu, 5 Oct 2017 12:44:38 +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 B7B392015F for ; Thu, 5 Oct 2017 12:44:37 +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=B4yiwgUb74JUP/E/fmxfzVxpj0EbAMOjgjtXqsOINxk=; b=XYM0DOBVDTv1UM n9CCPLMR7JEzhKe2J6y7i4mOHP78nBj+MK11xwYpbBkOqqrFWRHiuW/DR0amR4YyAoEVFysSM4dFT +CjtFpynDfI17ruLYBP8j6vdKTSsv7PZLeTk7oMtM0SEf6jNqEu3dQHCsR5VDvUvYgarlLW7i8io/ O10MdGlHAcKhM1HcfZHeTCzp2CwML8Ip7HN5zudmgFf6xL87V6R7csEdDccGHqtz5LJINEKvRAukt 12DOHeObULra1+oWWHz/EZPLhZtSYXlV6G82WNbvI4DeKn6fR37/ynhyY9aWsqxE9SnyaUEfbPV4f EKgunsgaARQ7fXzhyUCQ==; 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 1e05Vt-00044P-UM; Thu, 05 Oct 2017 12:44:29 +0000 Received: from mail-dm3nam03on0055.outbound.protection.outlook.com ([104.47.41.55] helo=NAM03-DM3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e05Vq-00041F-26 for linux-arm-kernel@lists.infradead.org; Thu, 05 Oct 2017 12:44:28 +0000 Received: from BN6PR03CA0055.namprd03.prod.outlook.com (10.173.137.17) by DM5PR03MB2698.namprd03.prod.outlook.com (10.168.197.136) 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 12:44:02 +0000 Received: from BY2FFO11FD016.protection.gbl (2a01:111:f400:7c0c::154) by BN6PR03CA0055.outlook.office365.com (2603:10b6:404:4c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Thu, 5 Oct 2017 12:44:02 +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 BY2FFO11FD016.mail.protection.outlook.com (10.1.14.148) 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 12:44:01 +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 v95Chvq6018384; Thu, 5 Oct 2017 05:44:00 -0700 From: Marco Franchi To: Subject: [PATCH v2 2/2] ARM: dts: imx51: Fix inconsistent display port names Date: Thu, 5 Oct 2017 09:43:47 -0300 Message-ID: <1507207427-32424-2-git-send-email-marco.franchi@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507207427-32424-1-git-send-email-marco.franchi@nxp.com> References: <1507207427-32424-1-git-send-email-marco.franchi@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131516810419963315; (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)(7966004)(336005)(346002)(39860400002)(376002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(5660300001)(50226002)(36756003)(8676002)(81156014)(81166006)(33646002)(4326008)(6666003)(106466001)(53936002)(16586007)(105606002)(54906003)(2950100002)(356003)(6916009)(305945005)(68736007)(2351001)(5003940100001)(316002)(8936002)(189998001)(47776003)(498600001)(104016004)(48376002)(97736004)(8656003)(76176999)(50986999)(85426001)(2906002)(77096006)(39060400002)(50466002)(575784001)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2698; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD016; 1:BWwQc5qvM5T6RRQYJCdfrBTy2Pi3bS/BgrqWRfciF6MHtEZfX6QU2+3GOg7ALNXrYqRwu25YKrzWHjUcU6pOcHbcbu41lVQs+dMxgXthDrut+YdyMop3u+1jcHCnmJlI MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 57b44634-d7dd-4da9-a452-08d50beec187 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:DM5PR03MB2698; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 3:xoz/sWZJF+/cTFsH7eEC+PQXtnQQwFniWVGogilcNCXuFIyhSH2b9Hu1IhA7GF7vud94jskNvpx57R4lL3Icox5pLFlaDJGDa2O/JGVhqXJvgibMiQ452fJ5G7kNhYoHCY4XTRYeSjPsejVqzcbwZc9BBq5lQoQf4eFGBn40yjoF9IN5ROkDsoA+vUzfcijfTtMsLuyzTQ3QBH6kUMCDq/uvqQdgdBTuYbo98a0kpwiz/pLmXV9Nh07TT5M2GSpONq3cm/U13ksgZ0zy14OChUny7L0kFa+cMUcsFkCNG2iv0UeWanhC/0KdvwNoGjhLju6hD8x9lHw7+Bsx7S947yFe8t9EgVSZo9VcmR67BrI=; 25:qtZm/0z+315EfHw4+vGJ5/MGhUJiwf40HMrkRY0E51ZPX5s4Wr2nHzq+CH+W+h12YwwGAAIM/6JDXTOWs1bOCvnoPTDJOxPdb9fbHSjF3FullSdJHAqCL7NLVVHFOgS1pCRWvonrr8o7RXuaup7N7PUovv5cQmhR3fDItOSNna4MGjupesmZO3odCfhCUfQ2RZ/nhzv3LZhNIhaKqN4FHV4M4oirIqH357ybdiXnj4sIyps480j9vu3+q+B6Qr4Y5EW36O8A0XJEF0Ptv22sZ4YEMG/h+tqu3rV06jxJyHge3tfavrZllUM/0cf3QsZqP1U8VPm0ouFILs1s9wuiQg== X-MS-TrafficTypeDiagnostic: DM5PR03MB2698: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 31:P8A0sASNttzqJFHIHaiAu1imcvo+g6QZ0jhlRau48N9MSuLmQGLhORozc2hIaZridmsl+e+OHLulWJ4zw7GUvGZ9Xoxw3HkuNZ+014jYpOuS8em6JLqoJZrOjufubIpA6WUSPN97Sx0gSMAV/iRQ7GewtCXo9pUe9IM/HCwcAAj+jl9L2oSl9i/wdGGJonpv1bKfG53oHNxKYInJreBtcYnWwH3bMEvuLFSR22+hQNM=; 4:sgVbw3SjWgPYw/zBopyJm0wgwasSlj95bb1v0o5rWTRE3GzHLy7cJdmEMEGEQ9zrTjTHydoFdtz/oyehDCeAgMSbjbBJrenKusUVOWWR00VSeyU4cyY3FNTxyihtpWs+4I15Srigro+df0eSFxIDbYKYFmFXomDOqyQ5MuvCFOuG11+NZCwB5Gp4slHtS4nuKXKZAmjEi/ux/t6xwqwuW54TrSRrxZCIpIzpNdxQ5ct9fzVV18eUUe8ZMz1GljmDaoDu5cxgky5LYFQRK4KXbMfFhklvmY24/hge90xmIpo= 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)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6055026)(6096035)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(20161123559100)(20161123563025)(20161123556025)(20161123561025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR03MB2698; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR03MB2698; X-Forefront-PRVS: 04519BA941 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2698; 23:nk9ct5vXu/62DBytqUMxsqESf5a4134lE/OvWADgE?= =?us-ascii?Q?0GzR3MVvDnTFspd80ohRFVWtAVm8aB0OkAVM1bLRu77ob7OElArRTMh9c65B?= =?us-ascii?Q?yfqZj1Hr+QTRLu4vpXWHKn+AtXlpoAeBTYZAQcRUCtd2ZhsIRrJwXwh11Wm3?= =?us-ascii?Q?gL156Rmg1GL0XTL6ehklC67JB25BF5XGw8DkAgHrQiA0krnnxl00mcs0NbEz?= =?us-ascii?Q?ys2x3rNiUgUyInxp13JvAkrdYnJBhSoL8J2ePPOcglapCKpHFRohoS6pDOat?= =?us-ascii?Q?8Cs5t1LvkfpPWARk4V6wsYPfOLBGQSVRAHqQYQnhmodbX57Asod9wc9bmzie?= =?us-ascii?Q?mAYVTgeQXfD9r6QNP9X5vImLWQCGKEYjp/uj2fdAy+2rWZFWt+H1b5UOjxRW?= =?us-ascii?Q?xzxm7TqMwPqK0kgTRE7LWejO+iDmyGMTYLXtfuP/dMxJVbM+GHIZ0HmnjhP1?= =?us-ascii?Q?g5GlJxFQiXh0jYdITHhjp74D7JbNrm0qzW+4gL276ENe8p4zn7vWQYKczPvO?= =?us-ascii?Q?8u9wJQwamKuvy9LWoISigA2VMVJT7KQfUGQDnOWoVqfO2p1GboB75CfowV+U?= =?us-ascii?Q?AK6nfR/f35h+rDMerLqdwI9eT9v3n9pf/5nMLV/qmsgAewF+PrbF4nEBRYO+?= =?us-ascii?Q?HlpsN6oxiRaNWKRdiQv38EnSBjK+KLXoif8+VWca9wa+f/1UFeNKpm/n7SvD?= =?us-ascii?Q?62TR1NWWSVjmzIzEcqpEAPHwe/p4/t+ZUkooaveiQYN2trbQwl43f4rgpO18?= =?us-ascii?Q?BBa35bnQMHPyWhyPgXhudYIEfBM8mphL+3IUmx/4m5/Ssk5rJWhOYJURtfLp?= =?us-ascii?Q?CPH+CTlKwP4DlHpROG3t3MCVKYUp1uYin3p5FfGiGvgXqZ1M89y5v/yFHUAN?= =?us-ascii?Q?i7/pcRZgAu/6xTfKCper3zblr7lzn8vJHEcbnsHgyJM4r+qSUfZxcv3auWBW?= =?us-ascii?Q?YdiICm3R/vTBtLYrw+wOGd72yL7yaGKXwgURr0U/xRkiBPwBxTCDryBCmG0Z?= =?us-ascii?Q?toF7NiG9xvTqvbwQh4uZTt3uGN7SK2WzVqi3XDBt3JZ7Y9tYC16W5ewqQnuQ?= =?us-ascii?Q?fBMjMNJG09QCSrl2kryF13r9aJQTQQMT0ifE4Bi0hjRfdDNYwKN27BzK4EDD?= =?us-ascii?Q?QVRP1UJm1rIaZssiIlWIwC0z7uxUfsvOX5GlmRrSGVTkf9EBy9Tzl/HkLKbM?= =?us-ascii?Q?ERqunFzWjbxToRgcXtfeP4RP5tqPE2uy/iVw4n54le2EYZv3DljqM1k0g=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 6:h1YVqDCKsmjt059knpoW9qM+uOKMPHAA4QxkHc3Ymh2keLW9FnmqPxkliFUKEXLm2TGmNIQxqPX1wGvsTdG0pZVu3vTDzp6xN+bnIdZcxa0GwnEmu6M/LqX/tmY+xJYJYXS8Lvu4wvmJci6lucHu6e2hpkgVQOsLbjYyaTHTf0KUc0jZSQIshfHVxDrISMcUaraRm91yfxykX84Fi7ZK7Ub1OXm6R+zj/VhEqzrX/M8FjVdgon/S0IMvcowJsP2wt2cN0w8TKHoP371QE0JfXMENxWJieCQ02wZXMde878IxHZsz2LdwZ+j2JDWXeMRyGCNmYs7VO8o7Oro4aEHs8g==; 5:Oj7BDy0+WEQY+YaOVkxvUFVvARb3sWCmKEwJmQ8kdyCz1wRAKrNo4a22UQCQUjx/c9mqIxjuKbMDaD9dsIpaWxpDIlSbXDIPDapgUPVWWcLRyYF/DlBsX4iFssVt5vBZdN2d1IBx/syUNePjJsYQ/A==; 24:aSWOM31/56grb9WxLkW1/SXqjCdE3p3+LKlrR2heoGwW9Wa7v3PElWXrNZl0nMFdrJElwkFFiUAFjBld4xfLkSzBvnbKGjDpbLCNUdN3OPY=; 7:mMYPSD/AuUZI4+zezk+9CPDFvHlm5i/a6UulilsRoPJGodVh7pIZlVWKyBioxofAE4YvTtbLw5R9oJQYKJzM8eAzw8kmkCfNAbnXL0A3fvBEpIrimLNBwBMbyRihPHwueKLC0x2Bj1UiMLoLbLsc/ZzWhP+DSCj8tSS3E3Ry26DQDSyXg0t1cEN3M6LNdz/FzwRz5bORlzMCjE2InYEqz6pBB5BEzAHirwzyhP/P3zY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Oct 2017 12:44:01.7935 (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: DM5PR03MB2698 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171005_054426_209358_D50E1F10 X-CRM114-Status: GOOD ( 12.74 ) 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 The parallel display interface pad groups are called DISP0 and DISP1 in the reference manuals, but in the i.MX51 dts files they are called DISP1 and DISP2. Fix this inconsistence by changing the DISP names in the i.mx51 dts. Signed-off-by: Marco Franchi Acked-by: Philipp Zabel --- Changes since v1: -newly introduced in this series 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 { }; }; };