ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
Subsystems (3)
PATCH v2 1/3 ARM: dts: imx53-voipac-dmm-668: Fix memory node duplication
From: Fabio Estevam <[email protected]>
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 <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
Signed-off-by Marco Franchi <[email protected]>
---
Changes since v1:
- Newly introduced in this version
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi +2 -6
@@ -17,12 +17,8 @@ memory@70000000 { device_type = "memory"; - reg = <0x70000000 0x20000000>; - }; - - memory@b0000000 { - device_type = "memory"; - reg = <0xb0000000 0x20000000>; + reg = <0x70000000 0x20000000>, + <0xb0000000 0x20000000>; }; regulators {
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/3 ARM: dts: imx6dl-mamoj: Add a memory node
From: Fabio Estevam <[email protected]>
Add a memory node, with an empty memory size, which will be filled by the bootloader.
This is done in preparation for removing the memory node from imx6qdl.dtsi.
Reported-by Marco Franchi <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
Signed-off-by Marco Franchi <[email protected]>
---
Changes since v1:
- Newly introduced in this version
arch/arm/boot/dts/imx6dl-mamoj.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/imx6dl-mamoj.dts +6 -0
@@ -13,6 +13,12 @@ model = "BTicino i.MX6DL Mamoj board"; compatible = "bticino,imx6dl-mamoj", "fsl,imx6dl"; + /* Will be filled by the bootloader */ + memory@10000000 { + device_type = "memory"; + reg = <0x10000000 0>; + }; + backlight_lcd: backlight-lcd { compatible = "pwm-backlight"; pwms = <&pwm3 0 25000>; /* 25000ns -> 40kHz */
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/3 ARM: dts: imx6qdl: Fix memory node duplication
In reply to [email protected]From: Marco Franchi <[email protected]>
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 <[email protected]>
Signed-off-by Marco Franchi <[email protected]>
---
Changes since v1:
- Removed comment from imx6qdl.dtsi
arch/arm/boot/dts/imx6dl-apf6dev.dts | 1 + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 1 + arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 1 + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 1 + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 1 + arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 1 + arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 1 + arch/arm/boot/dts/imx6dl-rex-basic.dts | 1 + arch/arm/boot/dts/imx6dl-riotboard.dts | 1 + arch/arm/boot/dts/imx6dl-ts4900.dts | 1 + arch/arm/boot/dts/imx6dl-ts7970.dts | 1 + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 1 + arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 1 + arch/arm/boot/dts/imx6dl-wandboard.dts | 1 + arch/arm/boot/dts/imx6q-apf6dev.dts | 1 + arch/arm/boot/dts/imx6q-arm2.dts | 1 + arch/arm/boot/dts/imx6q-ba16.dtsi | 1 + arch/arm/boot/dts/imx6q-cm-fx6.dts | 1 + arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 1 + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 1 + arch/arm/boot/dts/imx6q-display5.dtsi | 1 + arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 + arch/arm/boot/dts/imx6q-evi.dts | 1 + arch/arm/boot/dts/imx6q-gk802.dts | 1 + arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 + arch/arm/boot/dts/imx6q-h100.dts | 1 + arch/arm/boot/dts/imx6q-kp-tpc.dts | 1 + arch/arm/boot/dts/imx6q-marsboard.dts | 1 + arch/arm/boot/dts/imx6q-mccmon6.dts | 1 + arch/arm/boot/dts/imx6q-novena.dts | 1 + arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 1 + arch/arm/boot/dts/imx6q-pistachio.dts | 1 + arch/arm/boot/dts/imx6q-rex-pro.dts | 1 + arch/arm/boot/dts/imx6q-sbc6x.dts | 1 + arch/arm/boot/dts/imx6q-tbs2910.dts | 1 + arch/arm/boot/dts/imx6q-ts4900.dts | 1 + arch/arm/boot/dts/imx6q-ts7970.dts | 1 + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 1 + arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 1 + arch/arm/boot/dts/imx6q-wandboard.dts | 1 + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 1 + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 1 + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 1 + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 1 + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 1 + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 1 + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 + arch/arm/boot/dts/imx6qdl-icore.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 1 + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 1 + arch/arm/boot/dts/imx6qdl.dtsi | 2 -- arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 1 + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 1 + 73 files changed, 72 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6dl-apf6dev.dts +1 -0
@@ -55,6 +55,7 @@ compatible = "armadeus,imx6dl-apf6dev", "armadeus,imx6dl-apf6", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; }; };
arch/arm/boot/dts/imx6dl-aristainetos2_4.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6dl-aristainetos2_7.dts +1 -0
@@ -49,6 +49,7 @@ compatible = "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6dl-aristainetos_4.dts +1 -0
@@ -28,6 +28,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6dl-aristainetos_7.dts +1 -0
@@ -17,6 +17,7 @@ compatible = "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +1 -0
@@ -55,6 +55,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts +1 -0
@@ -23,6 +23,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "phytec,imx6dl-pfla02", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; }; };
arch/arm/boot/dts/imx6dl-rex-basic.dts +1 -0
@@ -17,6 +17,7 @@ compatible = "rex,imx6dl-rex-basic", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; }; };
arch/arm/boot/dts/imx6dl-riotboard.dts +1 -0
@@ -16,6 +16,7 @@ compatible = "riot,imx6s-riotboard", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6dl-ts4900.dts +1 -0
@@ -49,6 +49,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6dl-ts7970.dts +1 -0
@@ -50,6 +50,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6dl-wandboard-revb1.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; };
arch/arm/boot/dts/imx6dl-wandboard-revd1.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; };
arch/arm/boot/dts/imx6dl-wandboard.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6dl-wandboard", "fsl,imx6dl"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; };
arch/arm/boot/dts/imx6q-apf6dev.dts +1 -0
@@ -55,6 +55,7 @@ compatible = "armadeus,imx6q-apf6dev", "armadeus,imx6q-apf6", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; };
arch/arm/boot/dts/imx6q-arm2.dts +1 -0
@@ -19,6 +19,7 @@ compatible = "fsl,imx6q-arm2", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-ba16.dtsi +1 -0
@@ -47,6 +47,7 @@ / { memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-cm-fx6.dts +1 -0
@@ -51,6 +51,7 @@ compatible = "compulab,cm-fx6", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts +1 -0
@@ -23,6 +23,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6q-dhcom-som.dtsi +1 -0
@@ -19,6 +19,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-display5.dtsi +1 -0
@@ -48,6 +48,7 @@ compatible = "lwn,display5", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts +1 -0
@@ -30,6 +30,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-evi.dts +1 -0
@@ -51,6 +51,7 @@ compatible = "uniwest,imx6q-evi", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-gk802.dts +1 -0
@@ -20,6 +20,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-gw5400-a.dts +1 -0
@@ -61,6 +61,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-h100.dts +1 -0
@@ -51,6 +51,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6q-kp-tpc.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "kiebackpeter,imx6q-tpc", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; }; };
arch/arm/boot/dts/imx6q-marsboard.dts +1 -0
@@ -48,6 +48,7 @@ compatible = "embest,imx6q-marsboard", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6q-mccmon6.dts +1 -0
@@ -20,6 +20,7 @@ compatible = "lwn,mccmon6", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-novena.dts +1 -0
@@ -57,6 +57,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi +1 -0
@@ -17,6 +17,7 @@ compatible = "phytec,imx6q-pfla02", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-pistachio.dts +1 -0
@@ -57,6 +57,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-rex-pro.dts +1 -0
@@ -17,6 +17,7 @@ compatible = "rex,imx6q-rex-pro", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-sbc6x.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "microsys,sbc6x", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-tbs2910.dts +1 -0
@@ -60,6 +60,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6q-ts4900.dts +1 -0
@@ -49,6 +49,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6q-ts7970.dts +1 -0
@@ -50,6 +50,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6q-wandboard-revb1.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6q-wandboard", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-wandboard-revd1.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6q-wandboard", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-wandboard.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6q-wandboard", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6q-zii-rdu2.dts +1 -0
@@ -50,6 +50,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
arch/arm/boot/dts/imx6qdl-apalis.dtsi +1 -0
@@ -49,6 +49,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6qdl-cubox-i.dtsi +1 -0
@@ -44,6 +44,7 @@ / { /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6qdl-emcon.dtsi +1 -0
@@ -24,6 +24,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +1 -0
@@ -45,6 +45,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +1 -0
@@ -60,6 +60,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +1 -0
@@ -60,6 +60,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +1 -0
@@ -60,6 +60,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-gw551x.dtsi +1 -0
@@ -75,6 +75,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-gw552x.dtsi +1 -0
@@ -52,6 +52,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-gw553x.dtsi +1 -0
@@ -81,6 +81,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-gw560x.dtsi +1 -0
@@ -114,6 +114,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-gw5903.dtsi +1 -0
@@ -84,6 +84,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-gw5904.dtsi +1 -0
@@ -94,6 +94,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +1 -0
@@ -43,6 +43,7 @@ / { /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi +1 -0
@@ -43,6 +43,7 @@ / { /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; };
arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +1 -0
@@ -10,6 +10,7 @@ / { memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6qdl-icore.dtsi +1 -0
@@ -10,6 +10,7 @@ / { memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi +1 -0
@@ -11,6 +11,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x20000000>; };
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi +1 -0
@@ -11,6 +11,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0xF0000000>; };
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi +1 -0
@@ -11,6 +11,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi +1 -0
@@ -13,6 +13,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +1 -0
@@ -16,6 +16,7 @@ compatible = "phytec,imx6q-pfla02", "fsl,imx6q"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi +1 -0
@@ -12,6 +12,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; };
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi +1 -0
@@ -50,6 +50,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +1 -0
@@ -13,6 +13,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-tx6.dtsi +1 -0
@@ -62,6 +62,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; /* will be filled by U-Boot */ };
arch/arm/boot/dts/imx6qdl-udoo.dtsi +1 -0
@@ -32,6 +32,7 @@ }; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl-var-dart.dtsi +1 -0
@@ -11,6 +11,7 @@ / { memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x40000000>; };
arch/arm/boot/dts/imx6qdl.dtsi +0 -2
@@ -13,10 +13,8 @@ * The decompressor and also some bootloaders rely on a * pre-existing /chosen node to be available to insert the * command line and merge other ATAGS info. - * Also for U-Boot there must be a pre-existing /memory node. */ chosen {}; - memory { device_type = "memory"; }; aliases { ethernet0 = &fec;
arch/arm/boot/dts/imx6qp-wandboard-revd1.dts +1 -0
@@ -13,6 +13,7 @@ compatible = "wand,imx6qp-wandboard", "fsl,imx6qp"; memory@10000000 { + device_type = "memory"; reg = <0x10000000 0x80000000>; }; };
arch/arm/boot/dts/imx6qp-zii-rdu2.dts +1 -0
@@ -50,6 +50,7 @@ /* Will be filled by the bootloader */ memory@10000000 { + device_type = "memory"; reg = <0x10000000 0>; }; };
Signature · 7 lines
2.17.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 3/3] ARM: dts: imx6qdl: Fix memory node duplication
Quoted 11 lines · On Wed, Dec 5, 2018 at 4:10 PM <[email protected]> wrote:
From: Marco Franchi <[email protected]>
Boards based on imx6qdl have duplicate memory nodes:
- One coming from the board device tree file: memory@
- One coming from theimx6qdl.dtsifile.Fix the duplication by removing the memory node from the
imx6qdl.dtsifile and by adding 'device_type= "memory";' in the board Device Tree.
Quoted 5 lines
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 <[email protected]>Signed-off-by Marco Franchi <[email protected]>
Reviewed-by Fabio Estevam <[email protected]>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Shawn Guo
AppliedQuoted 9 lines · On Wed, Dec 05, 2018 at 04:10:01PM -0200, [email protected] wrote:
From: Fabio Estevam <[email protected]>
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 <[email protected]>Signed-off-by Fabio Estevam <[email protected]>Signed-off-by Marco Franchi <[email protected]>
Applied all, thanks.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel