mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-24 03:24:55 +08:00
404c0c9314
Boards based on imx6qdl have duplicate memory nodes:
- One coming from the board device tree file: memory@
- One coming from the imx6qdl.dtsi file.
Fix the duplication by removing the memory node from
the imx6qdl.dtsi file and by adding 'device_type = "memory";'
in the board Device Tree.
Converted using the following command:
perl -p0777i -e 's/memory\@10000000 \{\n/memory\@10000000 \{\n\t\tdevice_type = \"memory\";\n/m' `find ./arch/arm/boot/dts -name "imx6*"``
Reported-by: Rob Herring <robh@kernel.org>
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
30 lines
706 B
Plaintext
30 lines
706 B
Plaintext
/*
|
|
* Copyright 2013 Sascha Hauer <s.hauer@pengutronix.de>
|
|
*
|
|
* The code contained herein is licensed under the GNU General Public
|
|
* License. You may obtain a copy of the GNU General Public License
|
|
* Version 2 or later at the following locations:
|
|
*
|
|
* http://www.opensource.org/licenses/gpl-license.html
|
|
* http://www.gnu.org/copyleft/gpl.html
|
|
*/
|
|
|
|
#ifndef __DTS_V1__
|
|
#define __DTS_V1__
|
|
/dts-v1/;
|
|
#endif
|
|
|
|
#include "imx6dl.dtsi"
|
|
#include "imx6qdl-dfi-fs700-m60.dtsi"
|
|
|
|
/ {
|
|
model = "DFI FS700-M60-6DL i.MX6dl Q7 Board";
|
|
compatible = "dfi,fs700-m60-6dl", "dfi,fs700e-m60", "fsl,imx6dl";
|
|
|
|
/* Will be filled by the bootloader */
|
|
memory@10000000 {
|
|
device_type = "memory";
|
|
reg = <0x10000000 0>;
|
|
};
|
|
};
|