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;