ARM: dts: rockchip: Add regulators for rk3288-vyasa

[oweals/u-boot.git] / arch / arm / dts / imx6ull-14x14-evk.dts

diff --git a/arch/arm/dts/imx6ull-14x14-evk.dts b/arch/arm/dts/imx6ull-14x14-evk.dts
index 375bd4ea3190cbf5c06df463ecb8fc98404551be..8a1b67d6bbf441b9b154a525d849477e4f1f7c3e 100644 (file)
--- a/arch/arm/dts/imx6ull-14x14-evk.dts
+++ b/arch/arm/dts/imx6ull-14x14-evk.dts
@@ -8,7 +8,6 @@
 
 /dts-v1/;
 
-#include <dt-bindings/input/input.h>
 #include "imx6ull.dtsi"
 
 / {
@@ -67,7 +66,7 @@
                };
        };
 
-       spi4 {
+       spi5 {
                compatible = "spi-gpio";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_spi4>;
@@ -455,7 +454,8 @@
        flash0: n25q256a@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "micron,n25q256a";
+               /* compatible = "micron,n25q256a"; */
+               compatible = "spi-flash";
                spi-max-frequency = <29000000>;
                spi-nor,ddr-quad-read-dummy = <6>;
                reg = <0>;