From patchwork Tue Aug 29 20:08:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 9928221 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 2EDCA60380 for ; Tue, 29 Aug 2017 20:11:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21B4028634 for ; Tue, 29 Aug 2017 20:11:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 167C428A55; Tue, 29 Aug 2017 20:11:35 +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=-1.8 required=2.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_SIGNED,DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=no 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 2567828634 for ; Tue, 29 Aug 2017 20:11:33 +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:To:MIME-Version:Subject:From:References :In-Reply-To:Message-Id:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=9Ai80Xj1STnoXf1ZIlx1HJbegYwiB03kp1XgqrFpEzg=; b=t8uFLu93iyckx1 ONUgHlpARlMaeLyBKe4wAeAjRwsmHX+j8Rm11oHRLaf46JTrTUCHAxxexpNbSFcSnzcIGoGGELzVY nASiHGaBm93yQErP7+erhp5uZre6XQXu6i9fXAlLE3pJg1kz3d0k+6nqPGUiojgU/CN64iyU+Auxc skpcE2FEVzUdFs0EwD5+9yfnLVjGu6UBs6/aNBZL1VceAgplxeP+NZRd34LY9pSsZ5SR/Dp7jdEgU yYQ36030nGyjACzxlhRnL4LpYNcFJibSekOvpXVsT+Z4mdWJc6fcKtc8e5bIkotf2Xz/fz1d4Xqck WBdcY4qf9iv1K025OuNw==; 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 1dmmr9-00074H-BH; Tue, 29 Aug 2017 20:11:27 +0000 Received: from 78-11-180-123.static.ip.netia.com.pl ([78.11.180.123] helo=rere.qmqm.pl) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dmmr5-0004jf-Nf for linux-arm-kernel@lists.infradead.org; Tue, 29 Aug 2017 20:11:25 +0000 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 3xhfpt3Xk4z2x; Tue, 29 Aug 2017 22:08:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1504037334; bh=YLYUB93CUCyscR7isLxqllIr/E6kjMDjnyVb+OsTYt0=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=gMkZjsGxDUcLZd7XOGf1Q7DfFaTku5mh/DNGQN93e7Wh13rqOOHBEiSNXpiICkM/T E7bLk5sjD+2Ap9QSobASNxH7Ux4aPD29Hi4VuMyxklp5y1MoIjyRRh64Iaw7pNi0vi jlb4D2ay3OK2P6qdKE+S4i8NgkSfq1/8muC2MqQSK5MnaS5e1TwOjhdwIFW8+K9x/y HQYTBMoAFOto0Vq/UtcKGyxKMyn08AzAuOKB5R/s+DXvwOsYQz/0cDD3VniIlaBwXp QpDSOIIja6N1Qwu917wnGJPAOpOis/4X+MxWbsxHgcPnrGOZMNrtBnv+B9S56p4ZxH mriQE28n8iEnA== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.99.2 at rere Date: Tue, 29 Aug 2017 22:08:54 +0200 Message-Id: <910fee2eb99b2d95e59fa6b997645b498f167022.1504037038.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Subject: [PATCH 2/2] arm: AT91: fix DT duplicate node name MIME-Version: 1.0 To: Nicolas Ferre , Alexandre Belloni , Russell King X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170829_131124_118043_C8BBF644 X-CRM114-Status: UNSURE ( 6.48 ) X-CRM114-Notice: Please train this message. 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: 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 Fix following warning at bootup: device-tree: Duplicate name in fb@0x00500000, renamed to "display#1" Signed-off-by: Michał Mirosław --- arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 9cf1f5163fbd..272af5867403 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -223,30 +223,6 @@ fb0: fb@0x00500000 { display = <&display0>; status = "okay"; - - display0: display { - bits-per-pixel = <32>; - atmel,lcdcon-backlight; - atmel,dmacon = <0x1>; - atmel,lcdcon2 = <0x80008002>; - atmel,guard-time = <9>; - atmel,lcd-wiring-mode = "RGB"; - - display-timings { - native-mode = <&timing0>; - timing0: timing0 { - clock-frequency = <9000000>; - hactive = <480>; - vactive = <272>; - hback-porch = <1>; - hfront-porch = <1>; - vback-porch = <40>; - vfront-porch = <1>; - hsync-len = <45>; - vsync-len = <1>; - }; - }; - }; }; nand0: nand@40000000 { @@ -293,6 +269,30 @@ }; }; + display0: display { + bits-per-pixel = <32>; + atmel,lcdcon-backlight; + atmel,dmacon = <0x1>; + atmel,lcdcon2 = <0x80008002>; + atmel,guard-time = <9>; + atmel,lcd-wiring-mode = "RGB"; + + display-timings { + native-mode = <&timing0>; + timing0: 480x272 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hback-porch = <1>; + hfront-porch = <1>; + vback-porch = <40>; + vfront-porch = <1>; + hsync-len = <45>; + vsync-len = <1>; + }; + }; + }; + pwmleds { compatible = "pwm-leds";