d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the extra copy of uart_fdt_get_clock and uart_fdt_get_shift. While

Browse Source 
here also use OF_getencprop in uart_fdt_get_clock.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Andrew Turner 2015-04-04 09:57:52 +00:00
parent 3d2a63f5ac
commit 06d8b1ed6e
3 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/dev/uart/uart_bus_fdt.c
View File

@ -63,38 +63,6 @@ static driver_t uart_fdt_driver = {
sizeof(struct uart_softc), 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 static uintptr_t
uart_fdt_find_device(device_t dev) uart_fdt_find_device(device_t dev)
{ {

9
sys/dev/uart/uart_cpu_fdt.c
View File

@ -58,28 +58,27 @@ __FBSDID("$FreeBSD$");
bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem; bus_space_tag_t uart_bus_space_mem;
static int int
uart_fdt_get_clock(phandle_t node, pcell_t *cell) uart_fdt_get_clock(phandle_t node, pcell_t *cell)
{ {
pcell_t clock; pcell_t clock;
/* clock-frequency is a FreeBSD-only extention. */ /* clock-frequency is a FreeBSD-only extention. */
if ((OF_getprop(node, "clock-frequency", &clock, if ((OF_getencprop(node, "clock-frequency", &clock,
sizeof(clock))) <= 0) sizeof(clock))) <= 0)
clock = 0; clock = 0;
if (clock == 0) if (clock == 0)
/* Try to retrieve parent 'bus-frequency' */ /* Try to retrieve parent 'bus-frequency' */
/* XXX this should go to simple-bus fixup or so */ /* 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) sizeof(clock))) <= 0)
clock = 0; clock = 0;
*cell = fdt32_to_cpu(clock);
return (0); return (0);
} }
static int int
uart_fdt_get_shift(phandle_t node, pcell_t *cell) uart_fdt_get_shift(phandle_t node, pcell_t *cell)
{ {

2
sys/dev/uart/uart_cpu_fdt.h
View File

@ -50,5 +50,7 @@ SET_DECLARE(uart_fdt_class_set, struct ofw_compat_data );
#define UART_FDT_CLASS(data) \ #define UART_FDT_CLASS(data) \
DATA_SET(uart_fdt_class_set, 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_ */ #endif /* _DEV_UART_CPU_FDT_H_ */