From patchwork Thu May 16 22:56:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 10947127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0BDEC76 for ; Thu, 16 May 2019 22:56:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA1A81FE8E for ; Thu, 16 May 2019 22:56:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBE381FEBD; Thu, 16 May 2019 22:56:22 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 78A241FE8E for ; Thu, 16 May 2019 22:56:21 +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: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:In-Reply-To:References: List-Owner; bh=2YMQJuucMSP2uoQSkE48QF6x20AijUaDNfAiqEZUKCs=; b=gkFv9ADjQxkzmP gZpRwKwqMJb79bN9cYc6+xsFhrMUXwVzkkWgChc83g0bVuJCm8UYC8SvCep4j0VacVwifcxU5HZum ziiwlr7zkbaY1x7meomGqoXHQsbADB/2RmcoUR245S36TnqkgPrG66Qtw7V0q2qpBWUw5TfY0icbq 4rItHhJ8fyUj5XzxJrpHeKE/tskt1nsYQMbhevYumvpHlK7XObbiUVhyIC7h/YElbXQ4LChjSHiMA CIbJzMKOYeltflZnjoOaXrq1D06ZRyfUC5DYAZH/2erzSiBhmmAowZpqPFpDkwoXDSJKZ8bo3vs/i 9gCM5BoE6wiG1dA6Pqlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hRPIS-0001cN-Fa; Thu, 16 May 2019 22:56:20 +0000 Received: from mail-oi1-f196.google.com ([209.85.167.196]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hRPIP-0001bZ-3s for linux-arm-kernel@lists.infradead.org; Thu, 16 May 2019 22:56:18 +0000 Received: by mail-oi1-f196.google.com with SMTP id v2so3812211oie.6 for ; Thu, 16 May 2019 15:56:16 -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=Gk+wQtnm4tRRfZYtvlk4b2pxbAfDQTPWkdKNCH7e3p0=; b=QznsbBKhfct6anP3CPbENYNbp2+i9irXoL0VsdtODovWN6Yg2KJLVwS3p5y2Z9d0NA CiEWwroTI2uIaEQOSmH1Xiwlx6LiNXSpcvfWK9vokfS3BGh37AWgBzcpe0ioPCkxKv/3 6auRSt4zswQaq1i8ypOyN1SSNxBkkPZ631gu5lAU+UOuCbNpkzP5AvWs0PTBDdOf2GG1 II2hmCkdDoSvQelUwnHFNYpOVXl93EvKvRf0klGz08cdOchq2Er4LfDgFcc2RwtESV9F CrKvALLwSNBvb4CiEfGIfG5G0iZhlgo6deyI7yzPH+//2OXif2dQ17iQycfxeWqUnq82 K/vA== X-Gm-Message-State: APjAAAVX1Ta+rEqyiQXv/6VQOws+XXMeUsEQusXEI2ykMnmHvtOnUt0Z C0Bts1vcYMnD8QujmwAFWA== X-Google-Smtp-Source: APXvYqzs8xJQ2Ok1f2GqXZC31v0mN+vwM2xYsnNgq7aDavrzbs8JsIB4fqpJDYPvQ3pHPsDDOLkP+w== X-Received: by 2002:aca:72c5:: with SMTP id p188mr11344090oic.116.1558047375964; Thu, 16 May 2019 15:56:15 -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 h2sm2195347otk.25.2019.05.16.15.56.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 15:56:15 -0700 (PDT) From: Rob Herring To: Nicolas Ferre , Alexandre Belloni Subject: [PATCH] ARM: dts: at91: Avoid colliding 'display' node and property names Date: Thu, 16 May 2019 17:56:14 -0500 Message-Id: <20190516225614.1458-1-robh@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190516_155617_163911_C89CA057 X-CRM114-Status: GOOD ( 11.76 ) 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, Ludovic Desroches , 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 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: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Rob Herring Acked-by: Nicolas Ferre Acked-by: Alexandre Belloni --- arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/at91sam9263ek.dts | 2 +- arch/arm/boot/dts/at91sam9m10g45ek.dts | 2 +- arch/arm/boot/dts/at91sam9rlek.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts index f681cd727010..02b116b48c3b 100644 --- a/arch/arm/boot/dts/at91sam9261ek.dts +++ b/arch/arm/boot/dts/at91sam9261ek.dts @@ -49,7 +49,7 @@ atmel,power-control-gpio = <&pioA 12 GPIO_ACTIVE_LOW>; status = "okay"; - display0: display { + display0: panel { bits-per-pixel = <16>; atmel,lcdcon-backlight; atmel,dmacon = <0x1>; diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts index 13d415c22a69..924fe563f6fa 100644 --- a/arch/arm/boot/dts/at91sam9263ek.dts +++ b/arch/arm/boot/dts/at91sam9263ek.dts @@ -111,7 +111,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: panel { bits-per-pixel = <16>; atmel,lcdcon-backlight; atmel,dmacon = <0x1>; diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 46107c2f1ab9..5226e952a729 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -236,7 +236,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: panel { bits-per-pixel = <32>; atmel,lcdcon-backlight; atmel,dmacon = <0x1>; diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts index 27d8a1f44233..a000a459f17b 100644 --- a/arch/arm/boot/dts/at91sam9rlek.dts +++ b/arch/arm/boot/dts/at91sam9rlek.dts @@ -37,7 +37,7 @@ display = <&display0>; status = "okay"; - display0: display { + display0: panel { bits-per-pixel = <16>; atmel,lcdcon-backlight; atmel,dmacon = <0x1>;