From patchwork Tue Nov 20 15:59:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10690847 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 CEDCD15A7 for ; Tue, 20 Nov 2018 16:54:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8CC529648 for ; Tue, 20 Nov 2018 16:54:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AA2702978E; Tue, 20 Nov 2018 16:54:02 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 643B329648 for ; Tue, 20 Nov 2018 16:54:02 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=wbYRBq55VUxEermHJiRU3lQ27wx/OVbACQxGMu31AzQ=; b=WpA ffQUlnnGFF49qIKxYFOwHAiOKcP/KB6NfcVTEW3F5czFclUx4T5UDkCaRlMI066642rLQzxccrqTN 1gQof6zClfHX8YhuNFGub1glducCiz8noPYPKJ54lQAiy1gMGowQYxih+KjHiUx1UnAFqL8dc775R XHy75nZ0QUcnS8Q9LnPYYa0+0q0JZbcSgBuO599r5iqAZ2MGd3WUAh6wE7AuZJZfuTtYdV2ccPf8V QqL9eHm9+1ByEa+0zQuZY0GTUsN93LzphR+jIiIZ+XXcoFXBeqj/Yo54aKSMNP48N78fTcW7HFVVb 2eTcXQ2h+GGuHXCv7gYMuK3A1F1aW1w==; 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 1gP9Hk-00084M-E4; Tue, 20 Nov 2018 16:54:00 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9BM-0006aa-4h for linux-arm-kernel@bombadil.infradead.org; Tue, 20 Nov 2018 16:47:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=2lJOSrvSiot7HLUszbXOS1XHa/Z68OSDlfP4i4OtiOk=; b=0pYsI1HWLlCBbrHfvZEzQqurE mgWNFatTjfW51bMl65RA4SRrAXRJZBevi+xXmQUpVGmOb3GHbSnkXl8NR2Rskt/D0+WtKEuNGqE9H t6Lmkv/w+JC7+FhIaBJF8PaDKgGMNyhbAHyiaQio66wTbl5RJzY4RN2uXbHKr+hqSVGfWrFISAKLk aCiYWuzd43QhJc03SuSMIdRBIlaw3HmD0tY7okbHLZB+FBoxnTticU9BZqyIV7IwJ9CrhUcy/mAq9 yXwG+TchxBKPP8eJu2bScdrGhlOf/cZ0egYkUY/DboyMlM5f58vYZaFVchODJYD6FtCQfu09QRxpR Rj+Z7mnGw==; Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8Si-000234-FV for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 16:01:17 +0000 Received: by mail-qt1-x842.google.com with SMTP id n32so518858qte.11 for ; Tue, 20 Nov 2018 08:01:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=2lJOSrvSiot7HLUszbXOS1XHa/Z68OSDlfP4i4OtiOk=; b=QSljJY2IvL+s3vyNNR5sNM0t8QJiTlUKUSy3b8IUAtTfV9RtuCmPXHbnCtKxl5wPfO yrZ7ujz2eC2QizHYvrJB0XZTc7+yx6Kb0jWJeDkaVR5FRvxjaX1U1ZAxZsc3A6MXKVPy ADveUy61fwFfwkR5q3ApXaFHnMrlaJO6k/n5lV5scm5X/9b9hFti1sDdftJbaf8tk5Xn VDWylCP937BntGbjj/v0M83Ql12iLkBTZ9cgz66HFuJ1wOSv5ORGWnmeyq2Zatzfk4g6 OS8j9i+FhQIErbQL0vhAwUcumAhlGqgh79sJ9TP++CrBr77YaoDjHchi5tosEMTBlIDa QruA== 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; bh=2lJOSrvSiot7HLUszbXOS1XHa/Z68OSDlfP4i4OtiOk=; b=jft0eybadeFGkXB6DsCChA5Z2FlVYsGBIl7Kvz3nLUQ6zZajoUjX9NR5Wgnar6LMl0 LLYbERVkxW6mB3SYmiDo8M9diy6pHX7bYz1RhqueK2niGHkNX0HaTCQk1W528EjAZMDw xAyHetXGvIkJS4Ft0lBd5jN1nL3hh6t4kJKqlZaRHyvoqfn/l4sIr4QepcD01csaXemU X6evhHQcbPKq22g8ObVwLMlBw6lx8UIninuZyAkcBeGcQnZYfNdT4MP/b8hQvnb+2xl+ BGYyMLFN4Ek6v3QEyum3GVLRyl7Pl5AeuOXw7DbBYr75hdVyq+3PQNBx5E31D+SqjP6O /qXA== X-Gm-Message-State: AGRZ1gJMjUCoDA3QX5WOGiQ9Bq8Vy/PV1QO0zWYkKQxKQRfZmbi8zWgK B14aP4Cb/eoj49MgNhBdVGE= X-Google-Smtp-Source: AJdET5eWyK4b4zz3WvkpUeDphDR0nRto+dh/pBhi3Oe7dfH83g2oa5ycsN4z5yVD8lPPVLzK+fsgKg== X-Received: by 2002:ac8:25d0:: with SMTP id f16mr2459379qtf.129.1542729601722; Tue, 20 Nov 2018 08:00:01 -0800 (PST) Received: from localhost.localdomain ([201.82.144.36]) by smtp.gmail.com with ESMTPSA id q38sm17458369qtj.65.2018.11.20.07.59.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 08:00:01 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 1/4] ARM: dts: imx6ul-ccimx6ulsom: Add memory node to board dts Date: Tue, 20 Nov 2018 13:59:42 -0200 Message-Id: <1542729585-9330-1-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_110116_566620_F0403147 X-CRM114-Status: GOOD ( 13.50 ) 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, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Add memory node to board dts. This is done in preparation of removing the memory node from imx6ul.dtsi. Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi index c41ecee..b5781c3 100644 --- a/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi +++ b/arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi @@ -7,6 +7,11 @@ */ / { + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0>; /* will be filled by U-Boot */ + }; + reserved-memory { #address-cells = <1>; #size-cells = <1>; From patchwork Tue Nov 20 15:59:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10690845 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 C84A813BF for ; Tue, 20 Nov 2018 16:53:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2D4A29648 for ; Tue, 20 Nov 2018 16:53:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A39B52978E; Tue, 20 Nov 2018 16:53:59 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 2C5E229648 for ; Tue, 20 Nov 2018 16:53:59 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=mf+R3qDeEFJE0o2J80y7X4Qdd6LmN4uHbRhYXWGq/OQ=; b=aYPfpMD2DMx+qsv56IebtnBUnF oWUkMLKimE+XJDu8nkq9JbaL6vUVzad7KbcLbbzTHdLQ8XPZ4sfuNc27P9eEvelKSBYcFcVuRPaF7 shE6DfLD0CgTFYaq6fJQ40LQT5zi9pIX9nEdFN0snTqWmBu00JQPs4KZEr8RJCOAVCyIuhVfJmhwG 08B5iNfXHHJKjzcIZalSLj/q8LogMQGrB1mq1nlb556lXFFTtOQ/dYfUGkBVWTLrlcSSTzKsJmnQ4 y/1kIPxpgCCVrbGyiegQag+gXotAaeM1TanDbleRbmkbWzTZ+Wup+ap5xDqy1AaB4aygdBrvVMoXn ezHiT7Eg==; 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 1gP9Ha-0007qS-Hu; Tue, 20 Nov 2018 16:53:50 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9BL-0006aa-IZ for linux-arm-kernel@bombadil.infradead.org; Tue, 20 Nov 2018 16:47:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=0T6rRwUyP2/wr+U9drmk1K3uIjUVSeW7aZHy75GP+04=; b=WyHdfM1x5KDfbohqfbYf16CSM Ad6xhyO9QoAOHP2PNoUNbu2jspBqT8weOapRbOaW5aB2/qm1WQSaKdMUA2RItUb8L4/JdKV+XjcFf 7AkV28Yg4mdxHHVC7lRC+mW+uWOmmux93v+BwnDJ07+8czk0qqGIWsZ+3HYIQ4oJEuT7dRsujluOl fMdNOBu7Eg6iJDyJ1k18SQA4Bo6+wrMBaHcrYoSMqGTOO7/MxbIdPiA7H99npS6khATdfBvHQuYVa CUJk2edQJiycY3S0PjUDMJIhiqsrwrPyLfbXhT7jVXTvUOE2VOybNPdLt1d3ntkKzPN2B0R1pWMld +HrxF+dNg==; Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8Si-000237-Kb for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 16:01:17 +0000 Received: by mail-qk1-x744.google.com with SMTP id w204so3158660qka.2 for ; Tue, 20 Nov 2018 08:01:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0T6rRwUyP2/wr+U9drmk1K3uIjUVSeW7aZHy75GP+04=; b=EfqDOiDforlRgGCm+ynsnD7OsgA/T/NkWz7jZAyO4OHpqX6w8r8lRo5LuD4+5ntWDZ vJ6MAFN/+kI+mHSMx8wC5oNFojGFNGuO0YMKarPp+rag8mw3BsVkjaykZ+qY4P15F5MM zbH3uyRaHrn/EHKV+u37Hg8ia+WUv/cDlsVY5vpatDFs7b0R7u5EBT9zswnZdbLqnhau 3uNWojjjrIYEgB/M6+v3MxjbAW4FK4epzv6SFewwv5GAzZVX3ot0ekVgdWxuUlHZkWzp rmD9W+FkIlpYcvOI4ZT3pQ9Z56CMTuMtTu0XGVGpinwRcFy7ZltpJGqW18/3fx1Ln9FC +4vA== 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:in-reply-to :references; bh=0T6rRwUyP2/wr+U9drmk1K3uIjUVSeW7aZHy75GP+04=; b=LP1J9f8hxxoBQTToh1A/lREbj+yKfq0hKiHVo3LjlZ319t+Z8fwJ1HkI8GaEwGK10n Upd/4Z9V13kXH3Hvl2dq+aSUjoY4u7FR2Tr+A99VkRbseO2889S3sdRQPuQphigyqAxd uXpqFlK1tHf4camRv8uDXO4BOQUQKsmGwLfTZHvFDNKGAvqmWSnDWaxpyU4dMqNjfc89 Z++Nu5mohLAE3/Pt8GHcy8kyx1xHRLX2XzI4e8pMLC2qaPklx3LuKv6s5iWpexJ59XQ1 5A67fh3GZ3gmM6HmS9kvSWu60TP3xJ96j1ztjtDpHCmEVMU5KfKAEAHwcAsI+Ct6siwf Y9Jg== X-Gm-Message-State: AA+aEWY2CW4zc4U3LK5ONMHdPbfnQbf3Odrg+1XX77UN+PEjFpVOGC36 L6V2eWVfesdppNvUNX64bSE= X-Google-Smtp-Source: AFSGD/XICUXzGE1P77oqDVQNN6YYI0yCRYFZmm90+vB0eBNX1CdUipmtgfny2z9hssS3UiFbpc9DGQ== X-Received: by 2002:a37:82c4:: with SMTP id e187mr2156827qkd.93.1542729604517; Tue, 20 Nov 2018 08:00:04 -0800 (PST) Received: from localhost.localdomain ([201.82.144.36]) by smtp.gmail.com with ESMTPSA id q38sm17458369qtj.65.2018.11.20.08.00.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 08:00:04 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 2/4] ARM: dts: imx6ul: Fix memory node duplicaton Date: Tue, 20 Nov 2018 13:59:43 -0200 Message-Id: <1542729585-9330-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542729585-9330-1-git-send-email-festevam@gmail.com> References: <1542729585-9330-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_110116_694276_3AE735AF X-CRM114-Status: GOOD ( 17.47 ) 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, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Boards based on imx6ul have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6ul.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 1 + arch/arm/boot/dts/imx6ul-geam.dts | 1 + arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 + arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 + arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 1 + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 + arch/arm/boot/dts/imx6ul.dtsi | 2 -- arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 + arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 + 10 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index 32a0723..8180211 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -12,6 +12,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts index e22ec5b..bc77f26 100644 --- a/arch/arm/boot/dts/imx6ul-geam.dts +++ b/arch/arm/boot/dts/imx6ul-geam.dts @@ -15,6 +15,7 @@ compatible = "engicam,imx6ul-geam", "fsl,imx6ul"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi index b1fa3f0..213e802 100644 --- a/arch/arm/boot/dts/imx6ul-isiot.dtsi +++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi @@ -10,6 +10,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi index 8f775f6..8d68932 100644 --- a/arch/arm/boot/dts/imx6ul-litesom.dtsi +++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi @@ -48,6 +48,7 @@ compatible = "grinn,imx6ul-litesom", "fsl,imx6ul"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; }; diff --git a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi index a031bee..cf7faf4 100644 --- a/arch/arm/boot/dts/imx6ul-opos6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-opos6ul.dtsi @@ -49,6 +49,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; /* will be filled by U-Boot */ }; diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts index 0c09420f..797262d 100644 --- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts +++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts @@ -53,6 +53,7 @@ /* Will be filled by the bootloader */ memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; }; diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi index 02b5ba4..bb6dbfd 100644 --- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi @@ -71,6 +71,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0>; /* will be filled by U-Boot */ }; diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index c71d2d6..99c3663 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -15,10 +15,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec1; diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi index 10ab469..fb213be 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi @@ -7,6 +7,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; }; }; diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi index 183193e..038d8c90 100644 --- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi @@ -7,6 +7,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; From patchwork Tue Nov 20 15:59:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10690877 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 1B66813AD for ; Tue, 20 Nov 2018 17:02:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03B032AC6E for ; Tue, 20 Nov 2018 17:02:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EBB6B2AC74; Tue, 20 Nov 2018 17:02:50 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 7318C2AC6E for ; Tue, 20 Nov 2018 17:02:50 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=kxT2urjkdkapUGKQ2yQvE7sOb/oz4RVFsdq4q/Y72sI=; b=N270vEMZ8xZ86lDOCMicp70HQN Sbkaz7lHRRGc/TStnzdBavMxwJA+KioW4hGb7jpsMQ2t/RxrOWgibK1uYNW+XXnaXwaOEzxPeuW5L hLmrf6hRj7yhiQ3RJXBU/ui87oMlm6cEGYS+AX00+LsF2w45kdQRmiXUJSjrbiVGcS6i3SJdBXOGp dNfLz8hYN+6ACF0gWjuxkS1ertEseP8zLRClg+1U6uLzmPwy41hHcizIIxock20IdcWynH1gerRYe qdAra3lmvquEPK6LrIWQSfNMdil9GVeon3qIDoxImUS+nk5EhfJfp5Z+A8ooWHtreM6d5CUjvr3E3 jLLFyfIw==; 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 1gP9QB-0005pL-Tq; Tue, 20 Nov 2018 17:02:43 +0000 Received: from merlin.infradead.org ([205.233.59.134]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP9BK-0006aa-VT for linux-arm-kernel@bombadil.infradead.org; Tue, 20 Nov 2018 16:47:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=3WoMeeO9pFjOG6xmLRdqPDPWoFt+1ipYglSycc+tYT0=; b=v4G9NrqQe4FdsWXF7geMKO9Ph GNPV/TEshsTitI8XFyCida66CiwI8tbPk5WCqfD0a/OLADDcF8LozuUO23i61MvxJqYkmlm//mS7H HUBOo52+dmVoQscPWQ6BdLwsFw4MQwoD6PTRpU1hWaEJUxFdCxAvb5onzc+vFy2ZOFtxAPfdRyz1g jfY1Ayr57dGuTTUOzzCVrBR5KRC+OGzpeeNV90NvnV156DnYiRiQiN6x7d1FIgstbrBRbm2i9b4nS FD0/eOGD67eDfe5uEuwSJbaeEwveU/RTnjd782ulVg58hwoAXWPw4Xug7082zPgaQH7FFpHBUsMzv 2MOEzUK1g==; Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8Sl-000238-KI for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 16:01:25 +0000 Received: by mail-qk1-x743.google.com with SMTP id 189so3111766qkj.8 for ; Tue, 20 Nov 2018 08:01:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3WoMeeO9pFjOG6xmLRdqPDPWoFt+1ipYglSycc+tYT0=; b=l/5VyGLNMIf1jkG7ic7G3wOU+TfY6WotfUfu7w7z8RxZn2ydGvkhnjU2vsBvj9csnU QHuac1KDQIJPIuRCOU1yHs7a5kMUuIRPsCBb0/9zYyXwqM/fgpxhFeni9fu0gG4JnJ3/ PsrSw97CTgmmdtQSt8IBkD5FTUaEf6Vq7QBshKIBlMMaceaXq0/T3ndY+qN11pKe5oPi SvPCpsDWpH48E/EVZEjhYucdXQkUF6OQ818dpPhK74+94+MJOCtqT1CBQjVmkUOpWrIR qYhxOdhs5fFccMY7IbrhGTwbs4nyDYJrfLIQX3N+V21st906k8oFtUPIQw5ASLNO+Fs4 f8qw== 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:in-reply-to :references; bh=3WoMeeO9pFjOG6xmLRdqPDPWoFt+1ipYglSycc+tYT0=; b=Rkfnr4pQsK7OCFqKTc1K5aSEsE2vZcUUOiQM0hXqSe98p4t+ijSwukw5+VZshQcJra kUGNbrZOrF5geT+tEcoQW28hqeHOA47OpLBpslYoiE4As5BkHU//gE7aHsSTiVv0T6Bc VeBvLk0Y+aC15O11XdGQ1mYmumI3x7aro51rMUH7nr2lVZojCpvjvUSQIgSk1sBGl1xR qiikHxf2w5yxyoc4og22HYrQgKQohohAhwg17BAfUQh4jCmjckeGXLQ665C+1/TzaaOy Xlc512qJQvAcodqqifiVH6talIngvkpApjj5Tz6amo9KRDukN2ttE1LB5MSmmO/mm/22 yVGw== X-Gm-Message-State: AA+aEWYsxFnqYVo3T7SaasIysionkcVhPIu0eyfSNGcrulsogA9bsBgT gd0p5NtwpK+VQMvKPtHo2CP1gmi2 X-Google-Smtp-Source: AFSGD/UvSmrpsrHgPQZvdtntp1iQFFPIWGg0UmrI27CWFobxGx0zXqw40vZgaQqYI0h+L6UNEviEeg== X-Received: by 2002:a37:c241:: with SMTP id j1mr2207323qkm.227.1542729607562; Tue, 20 Nov 2018 08:00:07 -0800 (PST) Received: from localhost.localdomain ([201.82.144.36]) by smtp.gmail.com with ESMTPSA id q38sm17458369qtj.65.2018.11.20.08.00.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 08:00:07 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 3/4] ARM: dts: imx6sx: Fix memory node duplicaton Date: Tue, 20 Nov 2018 13:59:44 -0200 Message-Id: <1542729585-9330-3-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542729585-9330-1-git-send-email-festevam@gmail.com> References: <1542729585-9330-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_110119_678499_DB5AC48F X-CRM114-Status: GOOD ( 17.21 ) 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, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Boards based on imx6sx have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6sx.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 + arch/arm/boot/dts/imx6sx-sabreauto.dts | 1 + arch/arm/boot/dts/imx6sx-sdb.dtsi | 1 + arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 + arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 + arch/arm/boot/dts/imx6sx.dtsi | 2 -- 8 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts index adb5cc7..832b5c5 100644 --- a/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts +++ b/arch/arm/boot/dts/imx6sx-nitrogen6sx.dts @@ -12,6 +12,7 @@ compatible = "boundary,imx6sx-nitrogen6sx", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/imx6sx-sabreauto.dts b/arch/arm/boot/dts/imx6sx-sabreauto.dts index 841a27f..48aede5 100644 --- a/arch/arm/boot/dts/imx6sx-sabreauto.dts +++ b/arch/arm/boot/dts/imx6sx-sabreauto.dts @@ -11,6 +11,7 @@ compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi index 7d7d679..a6ec816 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi @@ -21,6 +21,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts index 252175b..2bc5162 100644 --- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts +++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts @@ -21,6 +21,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts index 40ccdf4..db0feb9 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts @@ -49,6 +49,7 @@ compatible = "udoo,neobasic", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; }; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts index 42bfc8f..5c7a2bb 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts @@ -49,6 +49,7 @@ compatible = "udoo,neoextended", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; }; diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts index c84c877..13dfe2a 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts +++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts @@ -49,6 +49,7 @@ compatible = "udoo,neofull", "fsl,imx6sx"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; }; diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index b79b6c4..2cdcf3e 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -15,10 +15,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { can0 = &flexcan1; From patchwork Tue Nov 20 15:59:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10690723 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 4EF5D5A4 for ; Tue, 20 Nov 2018 16:21:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 39C732A97A for ; Tue, 20 Nov 2018 16:21:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A0FD2A980; Tue, 20 Nov 2018 16:21:42 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW 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 C5A0B2A97A for ; Tue, 20 Nov 2018 16:21:41 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=HPjDsqECzqcSqS+Szv7O6moi8EvyXHB9I+lyYNrpN5M=; b=W1N5LZQ/JZHClu0pS0m5afy6WK Sq1+H9JV3pSnzBN3UaBn80cT0a/5QtTnh37PiIkYLlLwjJ5ocjOb55lhiv3yXOKF5U8Riwf3FOzLH iBPRMdVfx3hE9rkTnhLPauUrrlk31+AlUTFj3gzjGVgFzZLqW7Le/obh6xE7MgcVi0bxIswG2t5tR CHPmaZdwr1c3hbFAGDwhUHO1sdltnc9jTSk3MUohtZ1c+ImTggVObYpAgyZqLJTBOyZu5m5I//4Dj qjuXuPNndOkP/yvxp3vtyWuW8LM4Dd7tEuPfZBKJ/FuXYY716s/hp5DWYNpaggBCTk+oUdMvp9IPG YWX2pDAg==; 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 1gP8mQ-0007De-Uh; Tue, 20 Nov 2018 16:21:38 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8iV-0000U5-Vt for linux-arm-kernel@bombadil.infradead.org; Tue, 20 Nov 2018 16:17:35 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=a20qhXHi26VLKdLbFkwHStbw3gYmKMcNWWxik4JHhEo=; b=CZ6e1ZV4GdkaotJHMr7Dd9u6J iL7/wbjwzGiZP6YpTMfJ/OU9gvm/WuhV6TUy8JjCHaNQqbvp+6jCmRuji8XWQNSPMsThEpCjG+X6R V9jWMG3/1mHQEgikEEXlKjT8lLxX6WS6iiQhUVWOYF2RASEgROTHcy6UMnFdZ/4046Rh7A1YIT+Ln wv8DMgGg6F15aFkm1Ti3Bp/jfqpLTzjrRREmH4wc+TwU790aUrgFF/UHQucjeG3n1PtWCsMJTigxg HtuyLlEg6kFvhTyukE2Fy2XEXEIjdyQF7N63ZJ5HctkjYR0kquwaDzOQ40WQS6++idlDbJMcN/M4R 3dyj73FKw==; Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gP8Sp-0006dn-Fx for linux-arm-kernel@lists.infradead.org; Tue, 20 Nov 2018 16:01:28 +0000 Received: by mail-qk1-x742.google.com with SMTP id q1so3072549qkf.13 for ; Tue, 20 Nov 2018 08:01:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=a20qhXHi26VLKdLbFkwHStbw3gYmKMcNWWxik4JHhEo=; b=IpBDDVN5Hb33bnnIFat5ODwHndoosjK81Yhbs+6+p8+B+dr29uC0KrBRwjW6bBFEMc RY+VpdQ4CHYxEhIyOO3yqEiF1O+wyzkcMBLQ5mwOu13WeKR4P0HEMKmegD/BJ5XeO11r Gw9iBuFylMmzdGD5dsdSLGV1UwOhSQMmqC8pon281DUgkdvS8rmwgIL02UCkUPxikwnT gG1VAnEZYfeYjgM/PTCK1ecVfsOp+yPucZIsnulFsyTVynhYKkKhXQkj4ieUyRD8E1dO jEckcAhMaGda9Z8zsp+lLLCg2rRBkfupoUUEtMlgayfhyr9acjhJ+quRMq9QFtczFYz2 FVOg== 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:in-reply-to :references; bh=a20qhXHi26VLKdLbFkwHStbw3gYmKMcNWWxik4JHhEo=; b=LpXK0shLgJqygiCyQ//1LWkmu+YPIuqwrrt5r/nxFuRSBB3KrvfGbiSjIqLOKvB9UB y++TYVbrE3f5057y2OjsFzgVGp4NBrvnzVI/1EWzNuXEc4colKJI2rotGYvmtt7JE9GG 1Y/p8uD9M1y643Ipc0NPcCKUtPOie7Uqs6YgFgqQ1vqAEv2td7bcD5mBmEB6eXY4kSYr 8oNCgMJI0oRGmE5o5aIgXTDxwMrQG0VIuAhNnmgyINUqnczXbdUpNw05bKz3z9NKvR+c D4CkD/0Y9vHpawDHoRubr+TUN+qtj7cQ/W4Yis7Hm0im81FqcEgiNegKCV+wZLMg8Dec EJ2A== X-Gm-Message-State: AA+aEWZTgrjPbMacAMaLDmNGs/AkdjApLQNdkk5SjoyFbseVJZbO4Tx2 IuKAHtU+a3p+o+k5lr6+JhY= X-Google-Smtp-Source: AFSGD/Uzaq0WAKlFW+Pnppe7xlGHTIDs7nq7DahuQ4PS571lhLaqbKX/dPBAVUK5T6ZP91KhC9evrQ== X-Received: by 2002:a37:310e:: with SMTP id x14mr2346253qkx.78.1542729610721; Tue, 20 Nov 2018 08:00:10 -0800 (PST) Received: from localhost.localdomain ([201.82.144.36]) by smtp.gmail.com with ESMTPSA id q38sm17458369qtj.65.2018.11.20.08.00.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 Nov 2018 08:00:10 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 4/4] ARM: dts: imx6sl: Fix memory node duplicaton Date: Tue, 20 Nov 2018 13:59:45 -0200 Message-Id: <1542729585-9330-4-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542729585-9330-1-git-send-email-festevam@gmail.com> References: <1542729585-9330-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_160123_849149_DEAE5B2B X-CRM114-Status: GOOD ( 18.75 ) 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, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, Fabio Estevam , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 Boards based on imx6sl have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx6sl.dtsi file. Fix the duplication by removing the memory node from the dtsi file and by adding 'device_type = "memory";' in the board dts. Reported-by: Rob Herring Signed-off-by: Fabio Estevam --- arch/arm/boot/dts/imx6sl-evk.dts | 1 + arch/arm/boot/dts/imx6sl-warp.dts | 1 + arch/arm/boot/dts/imx6sl.dtsi | 2 -- arch/arm/boot/dts/imx6sll-evk.dts | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts index 679b448..f7a48e4 100644 --- a/arch/arm/boot/dts/imx6sl-evk.dts +++ b/arch/arm/boot/dts/imx6sl-evk.dts @@ -17,6 +17,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/imx6sl-warp.dts b/arch/arm/boot/dts/imx6sl-warp.dts index 404e602..408da70 100644 --- a/arch/arm/boot/dts/imx6sl-warp.dts +++ b/arch/arm/boot/dts/imx6sl-warp.dts @@ -55,6 +55,7 @@ compatible = "warp,imx6sl-warp", "fsl,imx6sl"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 557d3fd..be66148 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi @@ -13,10 +13,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec; diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts index c8e1155..0c2406a 100644 --- a/arch/arm/boot/dts/imx6sll-evk.dts +++ b/arch/arm/boot/dts/imx6sll-evk.dts @@ -20,6 +20,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; };