Merge tag 'pstore-v4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91-nattis-2-natte-2.dts

diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
index 3ea1d26..af9f384 100644 (file)
--- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@ -109,7 +109,32 @@
 
                port {
                        panel_input: endpoint {
-                               remote-endpoint = <&hlcdc_panel_output>;
+                               remote-endpoint = <&lvds_encoder_output>;
+                       };
+               };
+       };
+
+       lvds-encoder {
+               compatible = "lvds-encoder";
+
+               ports {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       port@0 {
+                               reg = <0>;
+
+                               lvds_encoder_input: endpoint {
+                                       remote-endpoint = <&hlcdc_output>;
+                               };
+                       };
+
+                       port@1 {
+                               reg = <1>;
+
+                               lvds_encoder_output: endpoint {
+                                       remote-endpoint = <&panel_input>;
+                               };
                        };
                };
        };
@@ -146,7 +171,7 @@
        };
 
        eeprom@50 {
-               compatible = "nxp,24c02";
+               compatible = "nxp,se97b", "atmel,24c02";
                reg = <0x50>;
                pagesize = <16>;
        };
@@ -176,8 +201,8 @@
                             &pinctrl_lcd_hipow0>;
 
                port@0 {
-                       hlcdc_panel_output: endpoint {
-                               remote-endpoint = <&panel_input>;
+                       hlcdc_output: endpoint {
+                               remote-endpoint = <&lvds_encoder_input>;
                        };
                };
        };
@@ -216,29 +241,34 @@
                        reg = <0x0 0x40000>;
                };
 
-               bootloader@40000 {
-                       label = "bootloader";
-                       reg = <0x40000 0x80000>;
+               barebox@40000 {
+                       label = "barebox";
+                       reg = <0x40000 0x60000>;
+               };
+
+               bareboxenv@c0000 {
+                       label = "bareboxenv";
+                       reg = <0xc0000 0x40000>;
                };
 
-               bootloaderenv@c0000 {
-                       label = "bootloader env";
-                       reg = <0xc0000 0xc0000>;
+               bareboxenv2@100000 {
+                       label = "bareboxenv2";
+                       reg = <0x100000 0x40000>;
                };
 
-               dtb@180000 {
-                       label = "device tree";
-                       reg = <0x180000 0x80000>;
+               oftree@180000 {
+                       label = "oftree";
+                       reg = <0x180000 0x20000>;
                };
 
                kernel@200000 {
                        label = "kernel";
-                       reg = <0x200000 0x600000>;
+                       reg = <0x200000 0x500000>;
                };
 
                rootfs@800000 {
                        label = "rootfs";
-                       reg = <0x800000 0x0f800000>;
+                       reg = <0x800000 0x1f800000>;
                };
        };
 };