diff options
| author | Marco Franchi <marco.franchi@nxp.com> | 2018-12-05 21:10:03 +0300 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 05:03:07 +0300 |
| commit | 404c0c9314f4f204ad82ef059424ff7e0b20fcd0 (patch) | |
| tree | 7e3ce4ac7722f42620b41fe98c60fcf2b91cb518 /arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | |
| parent | 69bf2fec500b59e2011bbf528e39c4a8f1b25020 (diff) | |
| download | linux-404c0c9314f4f204ad82ef059424ff7e0b20fcd0.tar.xz | |
ARM: dts: imx6qdl: Fix memory node duplication
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>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts index ad12d76bbb89..e13acbbcdff4 100644 --- a/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts +++ b/arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts @@ -23,6 +23,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; }; |