]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
authorFabio Estevam <festevam@gmail.com>
Wed, 5 Dec 2018 18:10:01 +0000 (16:10 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2019 08:19:56 +0000 (09:19 +0100)
[ Upstream commit 998a84c27a7f3f9133d32af64e19c05cec161a1a ]

imx53-voipac-dmm-668 has two memory nodes, but the correct representation
would be to use a single one with two reg entries - one for each RAM chip
select, so fix it accordingly.

Reported-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi

index f83a8c62ea531d144d2f7a51d5d02503714a42f1..d595034f3f1bfee6258a31d84681b00d647df025 100644 (file)
 
        memory@70000000 {
                device_type = "memory";
-               reg = <0x70000000 0x20000000>;
-       };
-
-       memory@b0000000 {
-               device_type = "memory";
-               reg = <0xb0000000 0x20000000>;
+               reg = <0x70000000 0x20000000>,
+                     <0xb0000000 0x20000000>;
        };
 
        regulators {