diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-07 17:02:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-07 17:02:35 +0200 |
| commit | 5c74f27bf6ca9e2b30ba5d7ae11831f89c41b37a (patch) | |
| tree | 940838336352c14370ec7f1ae00a36c816d80da2 /arch | |
| parent | a59f95c7a2c35031264eafc62e684df07f5f2a8f (diff) | |
| parent | 9f4a8a2d7f9d71093f41c4bb0ef8707e8145bad3 (diff) | |
| download | linux-stable-5c74f27bf6ca9e2b30ba5d7ae11831f89c41b37a.tar.gz linux-stable-5c74f27bf6ca9e2b30ba5d7ae11831f89c41b37a.tar.bz2 linux-stable-5c74f27bf6ca9e2b30ba5d7ae11831f89c41b37a.zip | |
Merge tag 'fsi-updates-2018-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi into char-misc-next
Ben writes:
FSI updates and sbefifo driver
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 389f5f83bef9..0b9b37d4d6ef 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -52,6 +52,7 @@ compatible = "fsi-master-gpio", "fsi-master"; #address-cells = <2>; #size-cells = <0>; + no-gpio-delays; clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 78a511e6e482..656036106001 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -153,6 +153,7 @@ compatible = "fsi-master-gpio", "fsi-master"; #address-cells = <2>; #size-cells = <0>; + no-gpio-delays; clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index ccbf645ab84d..2c5aa90a546d 100644 --- 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>; |