Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / mt7629-rfb.dts

diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts
index 95d10aa6d324fa37266f5e8c562d6ca2cd37e1ae..bf84f76344047df96af0e9e474d76b3aed4c3634 100644 (file)
--- a/arch/arm/dts/mt7629-rfb.dts
+++ b/arch/arm/dts/mt7629-rfb.dts
@@ -7,18 +7,18 @@
 
 /dts-v1/;
 #include "mt7629.dtsi"
+#include "mt7629-rfb-u-boot.dtsi"
 
 / {
        model = "MediaTek MT7629 RFB";
        compatible = "mediatek,mt7629-rfb", "mediatek,mt7629";
 
        aliases {
-               spi0 = &qspi;
+               spi0 = &snfi;
        };
 
        chosen {
                stdout-path = &uart0;
-               tick-timer = &timer0;
        };
 };
 
@@ -34,7 +34,14 @@
 };
 
 &pinctrl {
-       qspi_pins: qspi-pins {
+       snfi_pins: snfi-pins {
+               mux {
+                       function = "flash";
+                       groups = "snfi";
+               };
+       };
+
+       snor_pins: snor-pins {
                mux {
                        function = "flash";
                        groups = "spi_nor";
@@ -56,13 +63,14 @@
        };
 };
 
-&qspi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&qspi_pins>;
+&snfi {
+       pinctrl-names = "default", "snfi";
+       pinctrl-0 = <&snor_pins>;
+       pinctrl-1 = <&snfi_pins>;
        status = "okay";
 
        spi-flash@0{
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                reg = <0>;
                u-boot,dm-pre-reloc;
        };
@@ -74,6 +82,14 @@
        status = "okay";
 };
 
+&xhci {
+       status = "okay";
+};
+
+&u3phy {
+       status = "okay";
+};
+
 &watchdog {
        pinctrl-names = "default";
        pinctrl-0 = <&watchdog_pins>;