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

[oweals/u-boot.git] / arch / arm / dts / da850-evm-u-boot.dtsi

diff --git a/arch/arm/dts/da850-evm-u-boot.dtsi b/arch/arm/dts/da850-evm-u-boot.dtsi
index ab9368b9d3a6a0b0c125d243d62b9dd4f1b26a88..d9afc5edf45a5385b0a107432b2a71dbab89b449 100644 (file)
--- a/arch/arm/dts/da850-evm-u-boot.dtsi
+++ b/arch/arm/dts/da850-evm-u-boot.dtsi
@@ -10,10 +10,22 @@
        soc@1c00000 {
                u-boot,dm-spl;
        };
+
+       nand {
+               compatible = "ti,davinci-nand";
+       };
+
+       panel {
+               u-boot,dm-pre-reloc;
+       };
+};
+
+&eth0 {
+       pinctrl-0 = <&mii_pins>, <&mdio_pins>;
 };
 
 &flash {
-       compatible = "m25p64", "spi-flash";
+       compatible = "m25p64", "jedec,spi-nor";
 };
 
 &mmc0 {