6bc1e695b4
[ Upstream commit 013d37e4707e24c7b9bc3fc55aeda55ce9c2b262 ] Boards based on imx31 have duplicate memory nodes: - One coming from the board dts file: memory@ - One coming from the imx31.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 <robh@kernel.org> Signed-off-by: Fabio Estevam <festevam@gmail.com> Reviewed-by: Vladimir Zapolskiy <vz@mleia.com> Tested-by: Vladimir Zapolskiy <vz@mleia.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
29 lines
623 B
Plaintext
29 lines
623 B
Plaintext
/*
|
|
* Copyright 2012 Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
/dts-v1/;
|
|
#include "imx31.dtsi"
|
|
|
|
/ {
|
|
model = "Buglabs i.MX31 Bug 1.x";
|
|
compatible = "buglabs,imx31-bug", "fsl,imx31";
|
|
|
|
memory@80000000 {
|
|
device_type = "memory";
|
|
reg = <0x80000000 0x8000000>; /* 128M */
|
|
};
|
|
};
|
|
|
|
&uart5 {
|
|
uart-has-rtscts;
|
|
status = "okay";
|
|
};
|