Merge remote-tracking branch 'mvebu/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / imx28-m28evk.dts

diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index b3c09ae3b92850ffe5a2c73259f06ca48d93bffc..8d04e57039bcfcc1126c03db9e9dab588682ae8b 100644 (file)
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -41,7 +41,7 @@
                                flash: m25p80@0 {
                                        #address-cells = <1>;
                                        #size-cells = <1>;
-                                       compatible = "m25p80";
+                                       compatible = "m25p80", "jedec,spi-nor";
                                        spi-max-frequency = <40000000>;
                                        reg = <0>;
                                };
@@ -81,10 +81,10 @@
                                pinctrl-names = "default";
                                pinctrl-0 = <&lcdif_24bit_pins_a
                                             &lcdif_pins_m28>;
-                               display = <&display>;
+                               display = <&display0>;
                                status = "okay";
 
-                               display: display {
+                               display0: display0 {
                                        bits-per-pixel = <16>;
                                        bus-width = <18>;