diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 10:06:26 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 10:06:26 -0500 |
commit | 3ab6dd0416a9ca5b3d32d0dca1b2e85bfbb9f9a0 (patch) | |
tree | 3a60a404742b44364538dac8771769a8e91b5b1d | |
parent | b4eebd88c2234a644132568eeaf7691d5b07c01a (diff) | |
parent | 965f94c77552d80f824229a6a68f7ca92a59e5ff (diff) |
Merge tag 'actions-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt
Pull "Actions Semi ARM64 based SoC DT for v4.15" from Andreas Färber:
This updates the Bubblegum-96 DT with a clock node for the debug UART.
* tag 'actions-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
arm64: dts: actions: s900-bubblegum-96: Add fake uart5 clock
-rw-r--r-- | arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts index a0c3484dbd12..21ca80f9941c 100644 --- a/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts +++ b/arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | |||
@@ -24,6 +24,12 @@ | |||
24 | device_type = "memory"; | 24 | device_type = "memory"; |
25 | reg = <0x0 0x0 0x0 0x80000000>; | 25 | reg = <0x0 0x0 0x0 0x80000000>; |
26 | }; | 26 | }; |
27 | |||
28 | uart5_clk: uart5-clk { | ||
29 | compatible = "fixed-clock"; | ||
30 | clock-frequency = <921600>; | ||
31 | #clock-cells = <0>; | ||
32 | }; | ||
27 | }; | 33 | }; |
28 | 34 | ||
29 | &timer { | 35 | &timer { |
@@ -32,4 +38,5 @@ | |||
32 | 38 | ||
33 | &uart5 { | 39 | &uart5 { |
34 | status = "okay"; | 40 | status = "okay"; |
41 | clocks = <&uart5_clk>; | ||
35 | }; | 42 | }; |