Merge tag 'md/4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[deliverable/linux.git] / arch / arm / boot / dts / am57xx-beagle-x15.dts

diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 592e65c3a4e0cd4c2116537c84afc0cabe79cd61..0a5fc5d02ce2ba9893ac30b6f9997df08d04eb65 100644 (file)
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -24,7 +24,7 @@
 
        memory {
                device_type = "memory";
-               reg = <0x80000000 0x80000000>;
+               reg = <0x0 0x80000000 0x0 0x80000000>;
        };
 
        vdd_3v3: fixedregulator-vdd_3v3 {
@@ -592,6 +592,11 @@
                DRVDD-supply = <&vdd_3v3>;
                DVDD-supply = <&aic_dvdd>;
        };
+
+       eeprom: eeprom@50 {
+               compatible = "at,24c32";
+               reg = <0x50>;
+       };
 };
 
 &i2c3 {