Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / stm32mp157c-ev1.dts

diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index 85628e1..5c5b1dd 100644 (file)
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -90,6 +90,7 @@
        port {
                dcmi_0: endpoint {
                        remote-endpoint = <&ov5640_0>;
+                       bus-type = <5>;
                        bus-width = <8>;
                        hsync-active = <0>;
                        vsync-active = <0>;
@@ -158,14 +159,16 @@
        pinctrl-0 = <&fmc_pins_a>;
        pinctrl-1 = <&fmc_sleep_pins_a>;
        status = "okay";
-       #address-cells = <1>;
-       #size-cells = <0>;
 
-       nand@0 {
-               reg = <0>;
-               nand-on-flash-bbt;
-               #address-cells = <1>;
-               #size-cells = <1>;
+       nand-controller@4,0 {
+               status = "okay";
+
+               nand@0 {
+                       reg = <0>;
+                       nand-on-flash-bbt;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+               };
        };
 };