Merge origin/master into drm-misc-fixes

[karo-tx-linux.git] / arch / arm / boot / dts / efm32gg-dk3750.dts

diff --git a/arch/arm/boot/dts/efm32gg-dk3750.dts b/arch/arm/boot/dts/efm32gg-dk3750.dts
index 504cf45d3cb8f5238d023ed7f3f0d982eda9a670..98fc667d22c736ae52b9caa79fbe788871ef338e 100644 (file)
--- a/arch/arm/boot/dts/efm32gg-dk3750.dts
+++ b/arch/arm/boot/dts/efm32gg-dk3750.dts
@@ -16,7 +16,8 @@
                bootargs = "console=ttyefm4,115200 init=/linuxrc ignore_loglevel ihash_entries=64 dhash_entries=64 earlyprintk uclinux.physaddr=0x8c400000 root=/dev/mtdblock0";
        };
 
-       memory {
+       memory@88000000 {
+               device_type = "memory";
                reg = <0x88000000 0x400000>;
        };
 
@@ -74,7 +75,7 @@
                        status = "ok";
                };
 
-               boardfpga: boardfpga {
+               boardfpga: boardfpga@80000000 {
                        compatible = "efm32board";
                        reg = <0x80000000 0x400>;
                        irq-gpios = <&gpio 64 1>;