Merge git://git.denx.de/u-boot-sh

[u-boot] / arch / arm / dts / omap5-u-boot.dtsi

diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi
index 6305f570c500db5860efbf7fbf33489e51e6d1e0..17602909a61d09f670f9dfb71abb4c7f034ec8bc 100644 (file)
--- a/arch/arm/dts/omap5-u-boot.dtsi
+++ b/arch/arm/dts/omap5-u-boot.dtsi
@@ -9,42 +9,54 @@
 
 /{
        ocp {
-               u-boot,dm-pre-reloc;
+               u-boot,dm-spl;
+
+               ocp2scp@4a090000 {
+                       compatible = "ti,omap-ocp2scp", "simple-bus";
+               };
        };
 };
 
 &uart1 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &uart3 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &mmc1 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &mmc2 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &l4_cfg {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &scm {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &scm_conf {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 };
 
 &qspi {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
 
        m25p80@0 {
-               u-boot,dm-pre-reloc;
+               u-boot,dm-spl;
        };
 };
+
+&gpio2 {
+       u-boot,dm-spl;
+};
+
+&gpio7 {
+       u-boot,dm-spl;
+};