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

[oweals/u-boot.git] / 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 92473143b956dab2d548d8b527456af3396fd779..fdaa69297cc4fba736706b4f20e69e7c880d4029 100644 (file)
--- a/arch/arm/dts/omap5-u-boot.dtsi
+++ b/arch/arm/dts/omap5-u-boot.dtsi
@@ -8,8 +8,12 @@
  */
 
 /{
+       chosen {
+               tick-timer = &timer2;
+       };
+
        ocp {
-               u-boot,dm-pre-reloc;
+               u-boot,dm-spl;
 
                ocp2scp@4a090000 {
                        compatible = "ti,omap-ocp2scp", "simple-bus";
@@ -18,37 +22,68 @@
 };
 
 &uart1 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
+       reg-shift = <2>;
 };
 
 &uart3 {
-       u-boot,dm-pre-reloc;
+       u-boot,dm-spl;
+       reg-shift = <2>;
 };
 
 &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;
+               compatible = "spi-flash";
+               u-boot,dm-spl;
        };
 };
+
+&gpio1 {
+       u-boot,dm-spl;
+};
+
+&gpio2 {
+       u-boot,dm-spl;
+};
+
+&gpio3 {
+       u-boot,dm-spl;
+};
+
+&gpio4 {
+       u-boot,dm-spl;
+};
+
+&gpio5 {
+       u-boot,dm-spl;
+};
+
+&gpio6 {
+       u-boot,dm-spl;
+};
+
+&gpio7 {
+       u-boot,dm-spl;
+};