D47069.diff
No OneTemporary
Actions

Size

587 B

Referenced Files

None

Subscribers

None

D47069.diff
View Options

	diff --git a/sys/dev/uart/uart_core.c b/sys/dev/uart/uart_core.c
	--- a/sys/dev/uart/uart_core.c
	+++ b/sys/dev/uart/uart_core.c
	@@ -559,8 +559,14 @@
	uart_cpu_eqres(&sc->sc_bas, &sysdev->bas)) {
	/* XXX check if ops matches class. */
	sc->sc_sysdev = sysdev;
	- sysdev->bas.rclk = sc->sc_bas.rclk;
	- }
	+ if (sysdev->bas.rclk != 0) {
	+ /* Let the boot sequence control */
	+ sc->sc_bas.rclk = sysdev->bas.rclk;
	+ } else {
	+ /* Boot didn't set it, use use class */
	+ sysdev->bas.rclk = sc->sc_bas.rclk;
	+ }
	+ }
	}

	error = UART_PROBE(sc);