Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / uniphier-pxs2-gentil.dts

diff --git a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
index 373818ace0864a47e77528300625cbb5d13447f1..cccc86658d2027001d6ceb7f978ff513312135e0 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
+++ b/arch/arm/boot/dts/uniphier-pxs2-gentil.dts
@@ -51,11 +51,6 @@
        compatible = "socionext,uniphier-pxs2-gentil",
                     "socionext,uniphier-pxs2";
 
-       memory {
-               device_type = "memory";
-               reg = <0x80000000 0x80000000>;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -70,6 +65,11 @@
                i2c5 = &i2c5;
                i2c6 = &i2c6;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &serial2 {
@@ -82,6 +82,7 @@
        eeprom@54 {
                compatible = "st,24c64";
                reg = <0x54>;
+               pagesize = <32>;
        };
 };