From patchwork Thu May 16 22:55:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 164353 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1423830ili; Thu, 16 May 2019 15:55:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqyxDuaGAKgZGGrSX2Yc40po+/0w5CqHJl1Rxl6SS8l69HphQnS2zq6SJdEDjBbA5ePJVBf4 X-Received: by 2002:a63:5211:: with SMTP id g17mr24281249pgb.405.1558047329818; Thu, 16 May 2019 15:55:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558047329; cv=none; d=google.com; s=arc-20160816; b=Qn8QOijwRe8g1q+PQrjKj3EWfdDHx2MY3NiQm0lMNdeY+hnjBY4NNMKS4D/lBlT2AV lnPfHafAS0RTaitLz47go11s3i/5LAh3ZEc0cd4LrTLMjtSv899yOHBx10A2QfdH4XC8 NlOBdI4mQbeVRUFQF+S5xSNxRtYCvOlPkMkjG8E7WDChnbK5Z7BMkrITFHz8fDysDERx 53IVxWzAcIz0BVpc1cw7wyY+CxCpT3Qp2ogX/YK38xD++BFatlO+hoREs7EdA6L5Vbg4 MMyykW/pB7JVTRRFpyPBDX3tkyfjI4jrhG6vj8TvIOwSQL3UfWYh2Fn9QNlpjmRhI5tB BCog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Wo1wvKuW2wRAeBZgH3Md7/opMqaL+d5QH7rn/Aok/6A=; b=LxbJSzXpCWeHdJihALV4FC4Zgn1uyD2oZDIwyC6dSAqBqO4j6YPjKF87Anl/tqcxJ1 b8XWwTk0B7o0EYVFCWWH5XA1afFriziMDrS1OyuQU1d0ui8IGbvDGl3oA2S5XW0BcWfD AjHu9FREahlifIoN+8o5RCTv1EV0jM6oQKHmeCp1o3hvun+lbIpTE1J7FzDrshiNuwhv b9NzNA1Ov9egZNEibgqRNwsZJj58rqcOZagtBcE5W8LZp7sobjdtz2I4X6kXY+BBqLU1 YB6R8pMwismy3vRgFD4tnlHCAidXAtlNi3LPP4IWF5GpOAnKnxEPY33U/YavoA3UKt+T 8Nqg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w188si7164184pfd.204.2019.05.16.15.55.29; Thu, 16 May 2019 15:55:29 -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; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726491AbfEPWz2 (ORCPT + 7 others); Thu, 16 May 2019 18:55:28 -0400 Received: from mail-ot1-f68.google.com ([209.85.210.68]:42778 "EHLO mail-ot1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726452AbfEPWz2 (ORCPT ); Thu, 16 May 2019 18:55:28 -0400 Received: by mail-ot1-f68.google.com with SMTP id f23so5000795otl.9 for ; Thu, 16 May 2019 15:55:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Wo1wvKuW2wRAeBZgH3Md7/opMqaL+d5QH7rn/Aok/6A=; b=r/Hzow894YMn63BzLn3udxc2iz0fp5z+8BmWOW32vkyU3d6BLdekXJIhxAVWDB8w4Y GKEZnn6LdxIBmKBj39Tt9WjUnmqbDt1vCLDNq67TdQyec2QYWml5zC/I6nJpz/TcVt60 Tbtq5MUcAZ31x9Kwg66v8EwVXuNNFecwNILJbWjilnf+TaiDgSCt0gBqq3Hikpv1I6mv hCmtI6uvmXP/AhHfkCfG+AKSzhCfTJvTtimP22sIz9b0WQW97eNSEuvKJPA3s3LCUQ3x 9Oq+tYZ9HuENLC1+Z7rEH9X+gGXKdVGJFkQCGvaAsKas/Am50dZyDqTIS03mFNKQ72lF cjPw== X-Gm-Message-State: APjAAAVNkozQ94UeQnTCqVjp/ygDk8/6J92DKbWKdw1qvo6wyeiLQl+I pNIxvdPFC2VJeDH39tQ/0w== X-Received: by 2002:a9d:5f99:: with SMTP id g25mr664810oti.10.1558047327863; Thu, 16 May 2019 15:55:27 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id x64sm2759951oia.32.2019.05.16.15.55.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 15:55:26 -0700 (PDT) From: Rob Herring To: Shawn Guo Cc: devicetree@vger.kernel.org, Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: dts: imx: Avoid colliding 'display' node and property names Date: Thu, 16 May 2019 17:55:25 -0500 Message-Id: <20190516225525.32605-1-robh@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org While properties and child nodes with the same name are valid DT, the practice is not encouraged. Furthermore, the collision is problematic for YAML encoded DT. Let's just avoid the issue and rename the nodes. Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring --- arch/arm/boot/dts/imx6ul-geam.dts | 2 +- arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts index bc77f26a2f1d..21ddd359d3ed 100644 --- a/arch/arm/boot/dts/imx6ul-geam.dts +++ b/arch/arm/boot/dts/imx6ul-geam.dts @@ -169,7 +169,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: display0 { bits-per-pixel = <16>; bus-width = <18>; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index 213e802bf35c..b26d4f57c655 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -161,7 +161,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: display0 { bits-per-pixel = <16>; bus-width = <18>;