diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-15 01:27:23 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-12-15 01:27:23 +0100 |
| commit | 4b4193256c8d3bc3a5397b5cd9494c2ad386317d (patch) | |
| tree | b6b070f8893384b5d563fc616018e7d5644b2ece /arch/arm/boot/dts/armada-375.dtsi | |
| parent | Input: goodix - add upside-down quirk for Teclast X98 Pro tablet (diff) | |
| parent | Input: da7280 - fix spelling mistake "sequemce" -> "sequence" (diff) | |
| download | linux-4b4193256c8d3bc3a5397b5cd9494c2ad386317d.tar.xz linux-4b4193256c8d3bc3a5397b5cd9494c2ad386317d.zip | |
Merge branch 'next' into for-linus
Prepare input updates for 5.11 merge window.
Diffstat (limited to 'arch/arm/boot/dts/armada-375.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 2932a29ae272..9805e507c695 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -236,7 +236,6 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>; - timeout-ms = <1000>; clocks = <&coreclk 0>; status = "disabled"; }; @@ -247,7 +246,6 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; - timeout-ms = <1000>; clocks = <&coreclk 0>; status = "disabled"; }; |