diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-16 02:33:42 +0100 |
| commit | 57957fb519449803df30d10da433c27aaad17fa5 (patch) | |
| tree | b7cf0ca9f4f8f630128afbc29de34cab93e50fa5 /arch/arm/boot/dts/aspeed-g4.dtsi | |
| parent | a9445e47d897054876b8f43e46dc5a3eca2b844d (diff) | |
| parent | ed4bbf7910b28ce3c691aef28d245585eaabda06 (diff) | |
Merge branch 'timers/urgent' into timers/core, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/aspeed-g4.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/aspeed-g4.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index 45d815a86d42..de08d9045cb8 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -219,7 +219,7 @@ compatible = "aspeed,ast2400-vuart"; reg = <0x1e787000 0x40>; reg-shift = <2>; - interrupts = <10>; + interrupts = <8>; clocks = <&clk_uart>; no-loopback-test; status = "disabled"; |