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 2c99df44600e684b9d072c0cf44c82cd9fb14398..7c5deef8083f399a2ab80cb1ca35270af8052bd9 100644 (file)
--- a/arch/arm/dts/keystone-k2g-evm.dts
+++ b/arch/arm/dts/keystone-k2g-evm.dts
@@ -18,27 +18,63 @@
        chosen {
                stdout-path = &uart0;
        };
+
+       memory@80000000 {
+               device_type = "memory";
+               reg = <0x80000000 0x80000000>;
+       };
 };
 
 &mdio {
        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>;
 };
 
+&netcp {
+       status = "okay";
+};
+
 &spi1 {
        status = "okay";
 
        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>;
@@ -59,46 +95,45 @@
 &qspi {
        status = "okay";
 
-        flash0: m25p80@0 {
-                compatible = "s25fl512s","spi-flash";
-                reg = <0>;
-                spi-tx-bus-width = <1>;
-                spi-rx-bus-width = <4>;
-                spi-max-frequency = <96000000>;
-                #address-cells = <1>;
-                #size-cells = <1>;
-                tshsl-ns = <392>;
-                tsd2d-ns = <392>;
-                tchsh-ns = <100>;
-                tslch-ns = <100>;
+       flash0: m25p80@0 {
+               compatible = "s25fl512s","jedec,spi-nor";
+               reg = <0>;
+               spi-tx-bus-width = <1>;
+               spi-rx-bus-width = <4>;
+               spi-max-frequency = <96000000>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               cdns,tshsl-ns = <392>;
+               cdns,tsd2d-ns = <392>;
+               cdns,tchsh-ns = <100>;
+               cdns,tslch-ns = <100>;
                block-size = <18>;
 
-
-                partition@0 {
-                        label = "QSPI.u-boot-spl-os";
-                        reg = <0x00000000 0x00100000>;
-                };
-                partition@1 {
-                        label = "QSPI.u-boot-env";
-                        reg = <0x00100000 0x00040000>;
-                };
-                partition@2 {
-                        label = "QSPI.skern";
-                        reg = <0x00140000 0x0040000>;
-                };
-                partition@3 {
-                        label = "QSPI.pmmc-firmware";
-                        reg = <0x00180000 0x0040000>;
-                };
-                partition@4 {
-                        label = "QSPI.kernel";
-                        reg = <0x001C0000 0x0800000>;
-                };
-                partition@5 {
-                        label = "QSPI.file-system";
-                        reg = <0x009C0000 0x3640000>;
-                };
-        };
+               partition@0 {
+                       label = "QSPI.u-boot-spl-os";
+                       reg = <0x00000000 0x00100000>;
+               };
+               partition@1 {
+                       label = "QSPI.u-boot-env";
+                       reg = <0x00100000 0x00040000>;
+               };
+               partition@2 {
+                       label = "QSPI.skern";
+                       reg = <0x00140000 0x0040000>;
+               };
+               partition@3 {
+                       label = "QSPI.pmmc-firmware";
+                       reg = <0x00180000 0x0040000>;
+               };
+               partition@4 {
+                       label = "QSPI.kernel";
+                       reg = <0x001C0000 0x0800000>;
+               };
+               partition@5 {
+                       label = "QSPI.file-system";
+                       reg = <0x009C0000 0x3640000>;
+               };
+       };
 };
 
 &mmc0 {