Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / stm32mp15xx-dhcor-u-boot.dtsi

diff --git a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
index aa81ed83930a32dda138b78ac54404a91297c090..bd4c2adc3589887961fec1bf4f6fe99bf3998a9b 100644 (file)
--- a/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15xx-dhcor-u-boot.dtsi
@@ -9,15 +9,27 @@
 
 #include <dt-bindings/clock/stm32mp1-clksrc.h>
 #include "stm32mp15-u-boot.dtsi"
-#include "stm32mp15-ddr3-2x4Gb-1066-binG.dtsi"
+#include "stm32mp15-ddr3-dhsom-2x1Gb-1066-binG.dtsi"
+#include "stm32mp15-ddr3-dhsom-2x2Gb-1066-binG.dtsi"
+#include "stm32mp15-ddr3-dhsom-2x4Gb-1066-binG.dtsi"
 
 / {
        u-boot,dm-pre-reloc;
        config {
+               dh,ddr3-coding-gpios = <&gpiog 0 0>, <&gpiog 1 0>;
                dh,som-coding-gpios = <&gpioz 7 0>, <&gpiof 3 0>;
        };
 };
 
+&gpiof {
+       snor-nwp {
+               gpio-hog;
+               gpios = <7 0>;
+               output-high;
+               line-name = "spi-nor-nwp";
+       };
+};
+
 &i2c4 {
        u-boot,dm-pre-reloc;
 };