Merge tag 'u-boot-imx-20190415' of git://git.denx.de/u-boot-imx

[oweals/u-boot.git] / arch / arm / dts / keystone-k2g-evm.dts

diff --git a/arch/arm/dts/keystone-k2g-evm.dts b/arch/arm/dts/keystone-k2g-evm.dts
index ad746c731106a8d60a0144bb28258148adca6f53..7c5deef8083f399a2ab80cb1ca35270af8052bd9 100644 (file)
--- a/arch/arm/dts/keystone-k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -29,10 +29,37 @@
        status = "okay";
        ethphy0: ethernet-phy@0 {
                reg = <0>;
-               phy-mode = "rgmii-id";
        };
 };
 
+&keystone_usb0 {
+       status = "okay";
+};
+
+&usb0_phy {
+       status = "okay";
+       compatible = "nop-phy";
+};
+
+&usb0 {
+       dr_mode = "host";
+       status = "okay";
+};
+
+&keystone_usb1 {
+       status = "okay";
+};
+
+&usb1_phy {
+       compatible = "nop-phy";
+       status = "okay";
+};
+
+&usb1 {
+       dr_mode = "peripheral";
+       status = "okay";
+};
+
 &gbe0 {
        phy-handle = <&ethphy0>;
 };
@@ -47,7 +74,7 @@
        spi_nor: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
-               compatible = "spi-flash";
+               compatible = "jedec,spi-nor";
                spi-max-frequency = <50000000>;
                m25p,fast-read;
                reg = <0>;
@@ -69,7 +96,7 @@
        status = "okay";
 
        flash0: m25p80@0 {
-               compatible = "s25fl512s","spi-flash";
+               compatible = "s25fl512s","jedec,spi-nor";
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;