SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-02-01 02:39:06 +00:00
parent fe0bbab526
commit 6d4aa64db6
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
32 changed files with 551 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sys/dev/fdt/com_fdt.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: com_fdt.c,v 1.8 2023/08/15 07:56:27 miod Exp $ */
/* $OpenBSD: com_fdt.c,v 1.9 2024/01/31 01:01:10 hastings Exp $ */
/*
* Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
*
@ -55,6 +55,7 @@ com_fdt_init_cons(void)
if ((node = fdt_find_cons("brcm,bcm2835-aux-uart")) == NULL &&
(node = fdt_find_cons("marvell,armada-38x-uart")) == NULL &&
(node = fdt_find_cons("mediatek,mt6577-uart")) == NULL &&
(node = fdt_find_cons("ns16550a")) == NULL &&
(node = fdt_find_cons("snps,dw-apb-uart")) == NULL &&
(node = fdt_find_cons("ti,omap3-uart")) == NULL &&
@ -96,6 +97,7 @@ com_fdt_match(struct device *parent, void *match, void *aux)
return (OF_is_compatible(faa->fa_node, "brcm,bcm2835-aux-uart") ||
OF_is_compatible(faa->fa_node, "marvell,armada-38x-uart") ||
OF_is_compatible(faa->fa_node, "mediatek,mt6577-uart") ||
OF_is_compatible(faa->fa_node, "ns16550a") ||
OF_is_compatible(faa->fa_node, "snps,dw-apb-uart") ||
OF_is_compatible(faa->fa_node, "ti,omap3-uart") ||
@ -141,6 +143,9 @@ com_fdt_attach(struct device *parent, struct device *self, void *aux)
sc->sc_reg_width = OF_getpropint(faa->fa_node, "reg-io-width", width);
sc->sc_reg_shift = OF_getpropint(faa->fa_node, "reg-shift", shift);
if (OF_is_compatible(faa->fa_node, "mediatek,mt6577-uart"))
sc->sc_uarttype = COM_UART_16550A;
if (OF_is_compatible(faa->fa_node, "snps,dw-apb-uart") ||
OF_is_compatible(faa->fa_node, "marvell,armada-38x-uart")) {
sc->sc_uarttype = COM_UART_DW_APB;