From patchwork Mon Nov 26 12:08:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10698081 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 390651869 for ; Mon, 26 Nov 2018 12:09:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28126299B6 for ; Mon, 26 Nov 2018 12:09:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C67B299F8; Mon, 26 Nov 2018 12:09:51 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 A86BE299B6 for ; Mon, 26 Nov 2018 12:09: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: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=h3bM4VhDVLDyxR8QEZ/MuE2obHs+Cg34vHu0reYi8Ok=; b=Bdf VKDD9T6dA4tsTJdb8p6luw8DWFTRejQ37CUSAS3AVjhYg1m6KIOasErNWBl3BcpCg2DnrCIJRO1Nu 97schE1xynWSTwUX9nLiuxDjsPGdKE4mGGpc4g3iHAdbcC5xr2IbxGOBVJNretaR92Rp9vIICrb9Y nGeoQezXNNkFS1wHxgFIlQ5eACIZxwj/05YetyCf9FAtLBOitibsLDKT8qaQT2Jg2Xqaf1TjdYNt+ iA68g+0J5pqMheMEEON2XXmLfOdQcNleUSbFQ5tgA8FJGnDkf8gCQQBHkBQu0lSzip37De7SZvEBy 58hflBAdKhsSLJnfntO5K1ePvLE0aKA==; 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 1gRFi0-00064R-5j; Mon, 26 Nov 2018 12:09:48 +0000 Received: from mail-yw1-xc42.google.com ([2607:f8b0:4864:20::c42]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRFhw-000630-Qc for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2018 12:09:46 +0000 Received: by mail-yw1-xc42.google.com with SMTP id h193so6190204ywc.4 for ; Mon, 26 Nov 2018 04:09:33 -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=J+VYh5AORbv8iDOJ7zpAsjjotWDhfpu6LLp0d+lahSE=; b=mXRbjRUKnptOjT6RfV6bWWIh7icYWcke+T/n7OZMdH+NCsPBK7gZjgHNpOsA6vUZOH 4EJoxN9H2p5JH5zs2FWxPWVHfCzxlBeQQdefmAXneFpRlqkgcttyJfCs1cD9EwV20VlA GZpELf05OGdZr5yJMJ48f6WVdOX62uumHTfWkIdtODqhQX+CKcGvsSzQs1omzo2TPg4Z 0XsTAeIn8EfXj4enJsuQpj2LVAfkRoUSz3n8OVSACcRJCt1w8Ra26J9FIWFb6UwqMqnp 9FDh63aJxOT1bb/FYPzPTsxG/Y6C+yjDOYdnG+tT+iZhMqseeB41cV+bdb3Fo96OCrba FsQg== 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=J+VYh5AORbv8iDOJ7zpAsjjotWDhfpu6LLp0d+lahSE=; b=OSj0fIttxSOlQAgtdCp6PugxLjovIYCUvy3pjLfDvJK7GuU7I8gGZ3YcX+OeWX60uF HbPVplu6y0WRoj6d/R3GZhZ0/HmyCfhqqyHydEzLdrdtySDODJBgOIgVm9k8SPzRo+Nm 9ayxKWZ1Nxx0iWtCinidn2fumlcZWdaCVKnxJ7qE6+Wm8C/jf6yeMkV11/B9GonXATwT LLVvRXXyUMuP3wJR46HNsyHhU6NPgY/UW3F2qdcsGuqXCzEjS/k3El9Ove2YyaG9X4JM e3iih29z9dvU8Zijqss8AYRqHXvefvU8BI18OADsK0/QyAKhx+c8vF/ELHdPvCRDWXPd 2rGA== X-Gm-Message-State: AGRZ1gKKrm7FSYji9ZwmSWQ/DyHtjzQE68scpVmtytb1i7qYCGsZh8/p YBm53jvFrvXmdHvsii4+qck= X-Google-Smtp-Source: AJdET5c4VGtS48/8VHMduM7zLKP4mygTg3oocIeNfdjZfhyLm6l1yJKzyD8iq7lcXJbDHcoEUjR7Zw== X-Received: by 2002:a81:4ac4:: with SMTP id x187-v6mr28234870ywa.249.1543234172156; Mon, 26 Nov 2018 04:09:32 -0800 (PST) Received: from fabio-Latitude-E5450.nxp.com ([177.221.114.206]) by smtp.gmail.com with ESMTPSA id e189sm50738ywc.101.2018.11.26.04.09.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Nov 2018 04:09:31 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 1/2] ARM: dts: imx23: Fix memory node duplicaton Date: Mon, 26 Nov 2018 10:08:55 -0200 Message-Id: <1543234136-6824-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-20181126_040944_888903_FAE3A5C9 X-CRM114-Status: GOOD ( 13.57 ) 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, 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 imx23 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx23.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/imx23-evk.dts | 1 + arch/arm/boot/dts/imx23-olinuxino.dts | 1 + arch/arm/boot/dts/imx23-sansa.dts | 1 + arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 + arch/arm/boot/dts/imx23-xfi3.dts | 1 + arch/arm/boot/dts/imx23.dtsi | 2 -- 6 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index 98efe1a..0b2701c 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts @@ -10,6 +10,7 @@ compatible = "fsl,imx23-evk", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index 31b1e35..e2bac4d 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -20,6 +20,7 @@ compatible = "olimex,imx23-olinuxino", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts index faf701b..46057d9 100644 --- a/arch/arm/boot/dts/imx23-sansa.dts +++ b/arch/arm/boot/dts/imx23-sansa.dts @@ -50,6 +50,7 @@ compatible = "sandisk,sansa_fuze_plus", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts index 2ff6cdf..df2a9e6 100644 --- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts +++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts @@ -17,6 +17,7 @@ compatible = "fsl,stmp378x-devb", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts index db53089..a6213c5 100644 --- a/arch/arm/boot/dts/imx23-xfi3.dts +++ b/arch/arm/boot/dts/imx23-xfi3.dts @@ -49,6 +49,7 @@ compatible = "creative,x-fi3", "fsl,imx23"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index ea25992..8257630 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.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 { gpio0 = &gpio0; From patchwork Mon Nov 26 12:08:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10698085 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 349FB15A8 for ; Mon, 26 Nov 2018 12:24:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 237FB2882F for ; Mon, 26 Nov 2018 12:24:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17798292F5; Mon, 26 Nov 2018 12:24:20 +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_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,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 3DBFF2882F for ; Mon, 26 Nov 2018 12:24:19 +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=Tme8mkI5nsotyKjsTgPSQP44aKOgKmoLH0mIFtRtx18=; b=rcNclEUYCGmBSnWO+at+px7Jl8 GThvG3sPD7OapAK9WSFYNK8CREQrkaScGLhcR9KkKxgV6Cx91W+VXAdKLUkSOvPUiAfBMPg6X7unt KjLj5pxQ3zkOs6vsurcrg9TPOY/MrDbA8A1UXScyZ9/hopzElcqjDA7sCzfInUyZYLC1XeFyqm8D0 Ok+li88W0Pig3YEbcgeEGK2TLstTp+xx293b0gDiAGl+MMP3LeyBwk+TtJ7PWJwya4PIilCWi/pqY LuhppT7D6z8RkyNmdYmK4VTY2r27lqjfNhPPfpdAoFXhVqRTIOHwFQ9cnkemIlONhPh0h3tiqD8aZ cF6FgqDg==; 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 1gRFw2-0003k3-Ar; Mon, 26 Nov 2018 12:24:18 +0000 Received: from mail-yb1-xb43.google.com ([2607:f8b0:4864:20::b43]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gRFhy-000639-4v for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2018 12:09:47 +0000 Received: by mail-yb1-xb43.google.com with SMTP id d18-v6so7356480yba.4 for ; Mon, 26 Nov 2018 04:09:35 -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=gmLoFB9py3fKGstWPvYnxy+IfuqVJKiWXujDuEsSvVI=; b=nGm3OGelfXodKYX0ILSIH00DJ3H1Y60nfkEOMZEwGy8rQthiK2irZnzynPedO8Ed+l 1x0S9ol7vo1tCptGEJPK3OAMtAE4BjH+Z+dy30TWViGbl/YG2Ngrs+jDuCAzNrj1GA7p DjG+hv73/oEGnOMYR/ZurPFHKaa6PDPNPxXwQ30GTHcbeUe3Gfq7sNp2ypsE9hFFFHBt gn4BP+YD9zg6iDRJg8SPVGZoeiNm7BlVlliCnA7U3Cv2KBWt41uK/PBmNKINgIHBFwc0 ac8vN0f8OjiaNS9CrX2TLoA+wAuXh3a0kKTTtiPGG98bu0z0UKSHEGDq357BWLWs/g08 uu0Q== 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=gmLoFB9py3fKGstWPvYnxy+IfuqVJKiWXujDuEsSvVI=; b=ISWk6a/GJVdpv3uC1/70DSzcGDWzmNxO9lJA9xW9G35NAkGEsNli2GVmP1rw4zDknJ +4BUZBmMnl6wxecTRLJpfeeoRZSjasPhiVuJ8hS9ZnXCN6FbvFgSApgmW0IFYFHNKD4O M0pSoaUs8RZtAYkzE/t9qxdQH3OyCG9mwPF5n0xtAgwNoO+Frqt0jN/AAI/g1TNZne36 UQ+vrESWGh/NGvoZGRM5qz6Ho5fdI5lgqQHLJPSRs56qAX0Vbvc5jTEI3jmbKfPziMa9 zVHsl6BnYuWoouZ1gfWuOUGR4aOinrN5VY3qc694yoVITFEFBI+oVku71T1PS/32jGD1 3XDA== X-Gm-Message-State: AGRZ1gL4dQPaHdA3x9Q7phyrzKL522qSSAtynHhbjBwFhP7JC33FsDsL 8scFXDtoW3cqSroPl7N7zG0= X-Google-Smtp-Source: AFSGD/XHpBzdZN9EkkIg+vVEt9+KoxmS9TPC5Zf7ypuk0Ex649wOPC8kbR8qynLDROUZLBM3ktcGRw== X-Received: by 2002:a25:4017:: with SMTP id n23-v6mr28173446yba.244.1543234174683; Mon, 26 Nov 2018 04:09:34 -0800 (PST) Received: from fabio-Latitude-E5450.nxp.com ([177.221.114.206]) by smtp.gmail.com with ESMTPSA id e189sm50738ywc.101.2018.11.26.04.09.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 26 Nov 2018 04:09:34 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 2/2] ARM: dts: imx28: Fix memory node duplicaton Date: Mon, 26 Nov 2018 10:08:56 -0200 Message-Id: <1543234136-6824-2-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543234136-6824-1-git-send-email-festevam@gmail.com> References: <1543234136-6824-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181126_040946_191375_99B88588 X-CRM114-Status: GOOD ( 15.69 ) 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, 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 imx28 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx28.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/imx28-apf28.dts | 1 + arch/arm/boot/dts/imx28-apx4devkit.dts | 1 + arch/arm/boot/dts/imx28-cfa10036.dts | 1 + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 1 + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 1 + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 1 + arch/arm/boot/dts/imx28-duckbill-2.dts | 1 + arch/arm/boot/dts/imx28-duckbill.dts | 1 + arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 1 + arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 1 + arch/arm/boot/dts/imx28-evk.dts | 1 + arch/arm/boot/dts/imx28-m28.dtsi | 1 + arch/arm/boot/dts/imx28-m28cu3.dts | 1 + arch/arm/boot/dts/imx28-m28evk.dts | 1 + arch/arm/boot/dts/imx28-sps1.dts | 1 + arch/arm/boot/dts/imx28-ts4600.dts | 1 + arch/arm/boot/dts/imx28-tx28.dts | 1 + arch/arm/boot/dts/imx28.dtsi | 2 -- 18 files changed, 17 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts index bab7834..b6976fb 100644 --- a/arch/arm/boot/dts/imx28-apf28.dts +++ b/arch/arm/boot/dts/imx28-apf28.dts @@ -17,6 +17,7 @@ compatible = "armadeus,imx28-apf28", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-apx4devkit.dts b/arch/arm/boot/dts/imx28-apx4devkit.dts index 6c9b498..3a184d1 100644 --- a/arch/arm/boot/dts/imx28-apx4devkit.dts +++ b/arch/arm/boot/dts/imx28-apx4devkit.dts @@ -7,6 +7,7 @@ compatible = "bluegiga,apx4devkit", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts index 8337ca2..d3e3622 100644 --- a/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/arch/arm/boot/dts/imx28-cfa10036.dts @@ -17,6 +17,7 @@ compatible = "crystalfontz,cfa10036", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-duckbill-2-485.dts b/arch/arm/boot/dts/imx28-duckbill-2-485.dts index f4f2b3d..19957c2 100644 --- a/arch/arm/boot/dts/imx28-duckbill-2-485.dts +++ b/arch/arm/boot/dts/imx28-duckbill-2-485.dts @@ -20,6 +20,7 @@ compatible = "i2se,duckbill-2-485", "i2se,duckbill-2", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts index 71d0fcb..4982131 100644 --- a/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts +++ b/arch/arm/boot/dts/imx28-duckbill-2-enocean.dts @@ -21,6 +21,7 @@ compatible = "i2se,duckbill-2-enocean", "i2se,duckbill-2", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts index 6580ec6..d38d35b 100644 --- a/arch/arm/boot/dts/imx28-duckbill-2-spi.dts +++ b/arch/arm/boot/dts/imx28-duckbill-2-spi.dts @@ -24,6 +24,7 @@ }; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-duckbill-2.dts b/arch/arm/boot/dts/imx28-duckbill-2.dts index 693634e..38160fb 100644 --- a/arch/arm/boot/dts/imx28-duckbill-2.dts +++ b/arch/arm/boot/dts/imx28-duckbill-2.dts @@ -20,6 +20,7 @@ compatible = "i2se,duckbill-2", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-duckbill.dts b/arch/arm/boot/dts/imx28-duckbill.dts index 16f5244..7139c07 100644 --- a/arch/arm/boot/dts/imx28-duckbill.dts +++ b/arch/arm/boot/dts/imx28-duckbill.dts @@ -19,6 +19,7 @@ compatible = "i2se,duckbill", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts index b70f334..28dab6d 100644 --- a/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts +++ b/arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts @@ -24,6 +24,7 @@ compatible = "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x04000000>; }; }; diff --git a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts index 65efb78..7c3d552 100644 --- a/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts +++ b/arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts @@ -23,6 +23,7 @@ compatible = "eukrea,mbmx287lc", "eukrea,mbmx283lc", "eukrea,mbmx28lc", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; }; diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 5778300..96c1d10 100644 --- a/arch/arm/boot/dts/imx28-evk.dts +++ b/arch/arm/boot/dts/imx28-evk.dts @@ -10,6 +10,7 @@ compatible = "fsl,imx28-evk", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-m28.dtsi b/arch/arm/boot/dts/imx28-m28.dtsi index 0ec415e..298ad28 100644 --- a/arch/arm/boot/dts/imx28-m28.dtsi +++ b/arch/arm/boot/dts/imx28-m28.dtsi @@ -16,6 +16,7 @@ compatible = "aries,m28", "denx,m28", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts index 8883d36..ece3310 100644 --- a/arch/arm/boot/dts/imx28-m28cu3.dts +++ b/arch/arm/boot/dts/imx28-m28cu3.dts @@ -17,6 +17,7 @@ compatible = "msr,m28cu3", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts index 893886d..7d64301 100644 --- a/arch/arm/boot/dts/imx28-m28evk.dts +++ b/arch/arm/boot/dts/imx28-m28evk.dts @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Marek Vasut * * The code contained herein is licensed under the GNU General Public diff --git a/arch/arm/boot/dts/imx28-sps1.dts b/arch/arm/boot/dts/imx28-sps1.dts index ea9212f..42c88a6 100644 --- a/arch/arm/boot/dts/imx28-sps1.dts +++ b/arch/arm/boot/dts/imx28-sps1.dts @@ -17,6 +17,7 @@ compatible = "schulercontrol,imx28-sps1", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x08000000>; }; diff --git a/arch/arm/boot/dts/imx28-ts4600.dts b/arch/arm/boot/dts/imx28-ts4600.dts index dccdd6b..e3fd411 100644 --- a/arch/arm/boot/dts/imx28-ts4600.dts +++ b/arch/arm/boot/dts/imx28-ts4600.dts @@ -20,6 +20,7 @@ compatible = "technologic,imx28-ts4600", "fsl,imx28"; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0x10000000>; /* 256MB */ }; diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index b8f4643..164254c 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts @@ -66,6 +66,7 @@ }; memory@40000000 { + device_type = "memory"; reg = <0x40000000 0>; /* will be filled in by U-Boot */ }; diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 2b7efb6..e14d8ef 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -14,10 +14,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 = &mac0;