Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ab6dd04 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'actions-arm64-dt-for-4.15' of...

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
parents b4eebd88 965f94c7
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@
		device_type = "memory";
		reg = <0x0 0x0 0x0 0x80000000>;
	};

	uart5_clk: uart5-clk {
		compatible = "fixed-clock";
		clock-frequency = <921600>;
		#clock-cells = <0>;
	};
};

&timer {
@@ -32,4 +38,5 @@

&uart5 {
	status = "okay";
	clocks = <&uart5_clk>;
};