From 06d8b1ed6ef9c290c0c5bb93fb13fec8ecd20ee5 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sat, 4 Apr 2015 09:57:52 +0000
Subject: [PATCH] Remove the extra copy of uart_fdt_get_clock and
 uart_fdt_get_shift. While here also use OF_getencprop in uart_fdt_get_clock.

Sponsored by:	The FreeBSD Foundation
---
 sys/dev/uart/uart_bus_fdt.c | 32 --------------------------------
 sys/dev/uart/uart_cpu_fdt.c |  9 ++++-----
 sys/dev/uart/uart_cpu_fdt.h |  2 ++
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index 842e2806c2f1..91a28d690117 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -63,38 +63,6 @@ static driver_t uart_fdt_driver = {
 	sizeof(struct uart_softc),
 };
 
-static int
-uart_fdt_get_clock(phandle_t node, pcell_t *cell)
-{
-	pcell_t clock;
-
-	/*
-	 * clock-frequency is a FreeBSD-specific hack. Make its presence optional.
-	 */
-	if ((OF_getprop(node, "clock-frequency", &clock,
-	    sizeof(clock))) <= 0)
-		clock = 0;
-
-	if (clock == 0)
-		/* Try to retrieve parent 'bus-frequency' */
-		/* XXX this should go to simple-bus fixup or so */
-		if ((OF_getprop(OF_parent(node), "bus-frequency", &clock,
-		    sizeof(clock))) <= 0)
-			clock = 0;
-
-	*cell = fdt32_to_cpu(clock);
-	return (0);
-}
-
-static int
-uart_fdt_get_shift(phandle_t node, pcell_t *cell)
-{
-
-	if ((OF_getencprop(node, "reg-shift", cell, sizeof(*cell))) <= 0)
-		*cell = 0;
-	return (0);
-}
-
 static uintptr_t
 uart_fdt_find_device(device_t dev)
 {
diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c
index ca90b07cc4c3..f39a8f0a1f29 100644
--- a/sys/dev/uart/uart_cpu_fdt.c
+++ b/sys/dev/uart/uart_cpu_fdt.c
@@ -58,28 +58,27 @@ __FBSDID("$FreeBSD$");
 bus_space_tag_t uart_bus_space_io;
 bus_space_tag_t uart_bus_space_mem;
 
-static int
+int
 uart_fdt_get_clock(phandle_t node, pcell_t *cell)
 {
 	pcell_t clock;
 
 	/* clock-frequency is a FreeBSD-only extention. */
-	if ((OF_getprop(node, "clock-frequency", &clock,
+	if ((OF_getencprop(node, "clock-frequency", &clock,
 	    sizeof(clock))) <= 0)
 		clock = 0;
 
 	if (clock == 0)
 		/* Try to retrieve parent 'bus-frequency' */
 		/* XXX this should go to simple-bus fixup or so */
-		if ((OF_getprop(OF_parent(node), "bus-frequency", &clock,
+		if ((OF_getencprop(OF_parent(node), "bus-frequency", &clock,
 		    sizeof(clock))) <= 0)
 			clock = 0;
 
-	*cell = fdt32_to_cpu(clock);
 	return (0);
 }
 
-static int
+int
 uart_fdt_get_shift(phandle_t node, pcell_t *cell)
 {
 
diff --git a/sys/dev/uart/uart_cpu_fdt.h b/sys/dev/uart/uart_cpu_fdt.h
index e7aaecda4323..b2f2920a6fbf 100644
--- a/sys/dev/uart/uart_cpu_fdt.h
+++ b/sys/dev/uart/uart_cpu_fdt.h
@@ -50,5 +50,7 @@ SET_DECLARE(uart_fdt_class_set, struct ofw_compat_data );
 #define UART_FDT_CLASS(data)				\
 	DATA_SET(uart_fdt_class_set, data)
 
+int uart_fdt_get_clock(phandle_t node, pcell_t *cell);
+int uart_fdt_get_shift(phandle_t node, pcell_t *cell);
 
 #endif /* _DEV_UART_CPU_FDT_H_ */