Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / aspeed-bmc-opp-zaius.dts

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
index ccbf645ab84d13ed06ee04c61ed786fea75ab696..2c5aa90a546d7f99e811a2fbd6da567d8c757af1 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts
@@ -91,6 +91,7 @@
                compatible = "fsi-master-gpio", "fsi-master";
                #address-cells = <2>;
                #size-cells = <0>;
+               no-gpio-delays;
 
                trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>;
                enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;