mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-24 19:45:06 +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>
36 lines
687 B
Plaintext
36 lines
687 B
Plaintext
/*
|
|
* Copyright 2014 FEDEVEL, Inc.
|
|
*
|
|
* Author: Robert Nelson <robertcnelson@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
/dts-v1/;
|
|
#include "imx6q.dtsi"
|
|
#include "imx6qdl-rex.dtsi"
|
|
|
|
/ {
|
|
model = "Rex Pro i.MX6 Quad Board";
|
|
compatible = "rex,imx6q-rex-pro", "fsl,imx6q";
|
|
|
|
memory@10000000 {
|
|
device_type = "memory";
|
|
reg = <0x10000000 0x80000000>;
|
|
};
|
|
};
|
|
|
|
&ecspi3 {
|
|
flash: m25p80@0 {
|
|
compatible = "sst,sst25vf032b", "jedec,spi-nor";
|
|
spi-max-frequency = <20000000>;
|
|
reg = <0>;
|
|
};
|
|
};
|
|
|
|
&sata {
|
|
status = "okay";
|
|
};
|