Received: by 2002:a17:90a:88:0:0:0:0 with SMTP id a8csp4558927pja; Thu, 21 Nov 2019 21:51:09 -0800 (PST) X-Google-Smtp-Source: APXvYqxJMPOVZm1Vqi4oXhUfWmbJU35q/qsXW4i7pLcWOTFc8vgBKys+MssssPQUxOkg1JjWv71g X-Received: by 2002:a17:906:6b01:: with SMTP id q1mr19548301ejr.162.1574401869004; Thu, 21 Nov 2019 21:51:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574401868; cv=none; d=google.com; s=arc-20160816; b=vEZPgWpu6kyEfp9FsjiuOXEyGnExVCm5H1A8IB+ftz7eNcdjVWsNDud1sFWw00a2a9 RgjZvAfMuRunDyPe70A/0IlXWhxBJCwIstEXJds99gf8y4k1arWXwpKh8tKalPdKo2Zg sRlJ6S5CcY8S6OVEbVlFS+iaRlAYokTPVFjR+Q2mPeIWOSja/lS/gXmlv+RLDfVh0wfP 5ge8fGVwqU2ynP/Yve65+6UJCfon7Zj0HmTE4sU7h7ok7nRbbloSIrwbltI2Z2++L4uz al757d+pavUT5C6I7yBW9RZuLVC0yyYLiO1tPUeljVagzghRMWc+eU8IKFLKjM8YMqeq dG5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7OtNj3Xre2e3dGowoM6Emdqxs+6/pCuPZlyhTH8ShZw=; b=xE/NW3I/is6ST7lv+GmCxDzVWczL6PkTpM/3UntJqUM8CxtfpfrDgufzikcH8/t8r4 WU7jBLr274LdmJkGxfL4VwN8CUpWX0KmNm2aRRYbjJA6O13jEYn7ep8WWFdlcu1udIYl KIe4dpPwOnH14diwhqovNyFgtU+H3pocl7zNOz4c+20FRXcAq+jN5e3pQGO//8VTSMgp dCjSI7I3Y4xUcbcl/yz4WB0bYRdu/Fr7NOOkBGbTRhitNjPYJyMp4uNyCxRVq244zw35 mldlWECvkWQ0sEjM+SwTefwHqF0adylmvG4LZ0W3ME01zBs7aef1oDsaaFWMC+JKZg3l We7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iGwU6KzE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p6si3913797eds.70.2019.11.21.21.50.44; Thu, 21 Nov 2019 21:51:08 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iGwU6KzE; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727020AbfKVFt3 (ORCPT + 99 others); Fri, 22 Nov 2019 00:49:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:53384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726895AbfKVFtX (ORCPT ); Fri, 22 Nov 2019 00:49:23 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 38E2320708; Fri, 22 Nov 2019 05:49:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574401762; bh=PdKlgkUbmjtGXd4lr35779+IJqQhfvMEQr7fvNa42pU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iGwU6KzEBtIfh4UPPgMShh7qa4TgU1xvdBs0iCpBfyqxauU/CEx1lajFlxlolVEW4 q6HBN004Quy7nOf+jakLFGczyurchpZo4ieOeG8Iznsl8DDi0xQF9HU1Ygo8hmdZR3 ZbPX/z4JgvzqOkhvvPzyWu8ueq6urD/Ye04JY114= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fabio Estevam , Rob Herring , Shawn Guo , Sasha Levin , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 014/219] ARM: dts: imx6sx: Fix memory node duplication Date: Fri, 22 Nov 2019 00:45:46 -0500 Message-Id: <20191122054911.1750-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122054911.1750-1-sashal@kernel.org> References: <20191122054911.1750-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Fabio Estevam [ Upstream commit 216f35fedd8688c8b654ebfbad18c6e64713fad7 ] 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 Signed-off-by: Shawn Guo Signed-off-by: Sasha Levin --- 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 adb5cc7d8ce2f..832b5c5d7441a 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 841a27f3198ff..48aede543612b 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 f8f31872fa144..7f5ede5ca4c30 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 252175b592475..2bc51623a8060 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 40ccdf43dffc5..db0feb9b9f5d7 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 42bfc8f8f7f6b..5c7a2bb9141cb 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 c84c877f09d49..13dfe2afaba56 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 7b62e6fb47ebe..ae0728df542e9 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; -- 2.20.1