Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / arch / arm / dts / stm32mp15-ddr.dtsi

diff --git a/arch/arm/dts/stm32mp15-ddr.dtsi b/arch/arm/dts/stm32mp15-ddr.dtsi
index 479b700c868696dd9e7489210cf82b8e2eae1251..8b20b5e17357f33cd6396e6922661db06e3c88af 100644 (file)
--- a/arch/arm/dts/stm32mp15-ddr.dtsi
+++ b/arch/arm/dts/stm32mp15-ddr.dtsi
@@ -5,7 +5,7 @@
 
 / {
        soc {
-               ddr: ddr@5A003000 {
+               ddr: ddr@5a003000 {
                        u-boot,dm-pre-reloc;
 
                        compatible = "st,stm32mp1-ddr";
@@ -133,6 +133,7 @@
                                DDR_MR3
                        >;
 
+#ifdef DDR_PHY_CAL_SKIP
                        st,phy-cal = <
                                DDR_DX0DLLCR
                                DDR_DX0DQTR
@@ -148,6 +149,8 @@
                                DDR_DX3DQSTR
                        >;
 
+#endif
+
                        status = "okay";
                };
        };