From patchwork Tue Nov 6 15:40:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 10670743 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 912D01751 for ; Tue, 6 Nov 2018 15:41:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 801DA2A639 for ; Tue, 6 Nov 2018 15:41:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74DF52A658; Tue, 6 Nov 2018 15:41:31 +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 0204D2A656 for ; Tue, 6 Nov 2018 15:41:30 +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=snZkqYVM6nuhGuBMPfkzyCgrjcLlw4O1UJP/w/cTE0k=; b=a9JLoQ/L1DggUqULzGHhAZGicU M2iqYYBp4BeD2ML1fSbIGt5QpLpYOzanAAB0y9Hk8xcKAcqStcHl/3qhKMU9kO1lEc7jkRLsxIBu6 h8lKnu5Yt0+8BnEGaX4TNvXuIn60WpTDQ5lEQmOepIZ8uFWYGGWp0p8h4+Tp51g1wGpOzdUX7hVRs JI2r50cYHzkNbUzY0ayIkvIUbhUpsm9RTlPLZzUeiCoAgUf9tVkQOVYyMNTJVcASDSg0qBW3KdHTo vjjbmjoODhLOEnDXUnNHlhxxLoJ2ie/QgsSmpgb5uLSqHHCi0iQqfqWk//mX80Mzc1rg4UNdKFM2e wnHTEWLA==; 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 1gK3Tt-0004OR-ET; Tue, 06 Nov 2018 15:41:29 +0000 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gK3Td-0003mV-1e for linux-arm-kernel@lists.infradead.org; Tue, 06 Nov 2018 15:41:14 +0000 Received: by mail-qk1-x743.google.com with SMTP id u68so18637774qkg.9 for ; Tue, 06 Nov 2018 07:41:02 -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=2/t2aAEmO10dxp5C8b2jLfoTQgRCXQRJTJqI7eYUTE8=; b=lae9TaI+Qu0U7kDI92QE03n5Ovtj5jE6Wj4fpFikZY4qeIXC+z3tDBwv7r3eaTDiIb 69nhLG16l/TPCMkgfonEj/+SjhGJasO8QptC4HrEsFxQMRIl6g9MJIczupNp/vGPBi9l qOR/zyT8+lysCzCF23Bwhb8GHn8qEkf1qUQcRbMr8ZlOmygUqSfX0kH2LSZljpo9oDjr cPnP1DGga/4OvgfKu4S4vvme5mZ89b+yQQrhSIIKvy2A4MVolkQ5TQejCL4i0pWWoeSM sie+M1AxghtF2C3PPNGZRY4cUe1FzrwoFUszc2DAUGHHNPgPdn5T8KBdd3i0Wc3Fl7M0 +ynw== 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=2/t2aAEmO10dxp5C8b2jLfoTQgRCXQRJTJqI7eYUTE8=; b=dNqhOK/cO9oxdiMCNxvQTUWeH7eHz/XH5Yp17Z0y7DrFmf6eYBWIViU7TP/6ev//0l TJntJugk7dfUX9x3vL/i+cV+5BnS6vsBbb1/aZHxZXBukF6WsoozqzK3qhtTW1ALogpy HoJ36HI3UGm3N87olREgwV8Hrth0YDEuCVKO72scLxWV1uPNt+ZZm9742G3GyQ1tgjb1 WRFYrbTJ0f+J7XsxJBoW6ZUFA/v+xeqIsyAWyTbZpJhYlXSgntYvYsCwL1Bt2qMaSpTt uD5+xlOwDkmwJfAFGmYdlaHb+fcUUogm1Z1mXnS3vQ3w6uwzbPdEy9EhGpXH5t6QUw5v dv/Q== X-Gm-Message-State: AGRZ1gIKYv7R/qZWt1z9jCP++ubIggyLQMHalio3GgYYUvboM32tDSjQ /++Ll96YGKjNYrxZnSeQr9EeFat2 X-Google-Smtp-Source: AJdET5eU5f9oaUdjPOuZejti2S222TXwHkiqYg/5Op1DIPPLA86yL6F6P/fGNYFQkPmOyjd9q4O+pQ== X-Received: by 2002:a37:7b81:: with SMTP id w123-v6mr24312966qkc.177.1541518861844; Tue, 06 Nov 2018 07:41:01 -0800 (PST) Received: from fabio-Latitude-E5450.nxp.com ([168.227.14.242]) by smtp.gmail.com with ESMTPSA id u11sm6438757qtc.61.2018.11.06.07.40.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Nov 2018 07:41:01 -0800 (PST) From: Fabio Estevam To: shawnguo@kernel.org Subject: [PATCH 3/3] ARM: dts: imx7: Fix memory node duplicaton Date: Tue, 6 Nov 2018 13:40:47 -0200 Message-Id: <1541518847-5640-3-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541518847-5640-1-git-send-email-festevam@gmail.com> References: <1541518847-5640-1-git-send-email-festevam@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181106_074113_193871_B9F381B3 X-CRM114-Status: GOOD ( 15.25 ) 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: robh@kernel.org, devicetree@vger.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 imx7 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx7s.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/imx7d-cl-som-imx7.dts | 3 ++- arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + arch/arm/boot/dts/imx7d-colibri.dtsi | 1 + arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 + arch/arm/boot/dts/imx7d-pico.dtsi | 1 + arch/arm/boot/dts/imx7d-sdb.dts | 1 + arch/arm/boot/dts/imx7s-colibri.dtsi | 1 + arch/arm/boot/dts/imx7s-warp.dts | 1 + arch/arm/boot/dts/imx7s.dtsi | 2 -- 9 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts index 8bf365d..e615674 100644 --- a/arch/arm/boot/dts/imx7d-cl-som-imx7.dts +++ b/arch/arm/boot/dts/imx7d-cl-som-imx7.dts @@ -19,6 +19,7 @@ compatible = "compulab,cl-som-imx7", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */ }; @@ -284,4 +285,4 @@ MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */ >; }; -}; \ No newline at end of file +}; diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi index 04d24ee..898f4b8 100644 --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi @@ -8,6 +8,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; }; diff --git a/arch/arm/boot/dts/imx7d-colibri.dtsi b/arch/arm/boot/dts/imx7d-colibri.dtsi index d9f8fb6..e2e327f 100644 --- a/arch/arm/boot/dts/imx7d-colibri.dtsi +++ b/arch/arm/boot/dts/imx7d-colibri.dtsi @@ -45,6 +45,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; }; diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts index d8aac4a..4fb7e84 100644 --- a/arch/arm/boot/dts/imx7d-nitrogen7.dts +++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts @@ -12,6 +12,7 @@ compatible = "boundary,imx7d-nitrogen7", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi index 21973eb..4846df0 100644 --- a/arch/arm/boot/dts/imx7d-pico.dtsi +++ b/arch/arm/boot/dts/imx7d-pico.dtsi @@ -49,6 +49,7 @@ compatible = "technexion,imx7d-pico", "fsl,imx7d"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index f1bafda..b1b613b 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -15,6 +15,7 @@ }; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/boot/dts/imx7s-colibri.dtsi b/arch/arm/boot/dts/imx7s-colibri.dtsi index fe8344c..1fb1ec5 100644 --- a/arch/arm/boot/dts/imx7s-colibri.dtsi +++ b/arch/arm/boot/dts/imx7s-colibri.dtsi @@ -45,6 +45,7 @@ / { memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x10000000>; }; }; diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts index f7ba2c0..23431fa 100644 --- a/arch/arm/boot/dts/imx7s-warp.dts +++ b/arch/arm/boot/dts/imx7s-warp.dts @@ -14,6 +14,7 @@ compatible = "warp,imx7s-warp", "fsl,imx7s"; memory@80000000 { + device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index aa8df7d..477901c 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -17,10 +17,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 = &gpio1;