These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / imx6q-gw5400-a.dts

diff --git a/kernel/arch/arm/boot/dts/imx6q-gw5400-a.dts b/kernel/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 822ffb2..a51834e 100644 (file)
--- a/kernel/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/kernel/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -145,7 +145,7 @@
        status = "okay";
 
        flash: m25p80@0 {
-               compatible = "sst,w25q256";
+               compatible = "sst,w25q256", "jedec,spi-nor";
                spi-max-frequency = <30000000>;
                reg = <0>;
        };
@@ -154,7 +154,7 @@
 &fec {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet>;
-       phy-mode = "rgmii";
+       phy-mode = "rgmii-id";
        phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };