From 037f452a8190528bb7a34379252a39c3f5e167fd Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 20 Jul 2018 05:37:06 +0000 Subject: [PATCH] match on marvell,armada-38x-uart linux >= 4.18-rc1 changed the compat string from snps,dw-apb-uart in b7639b0b15ddd1a4686b0142e70dfb122eefc88f ok patrick@ --- sys/dev/fdt/com_fdt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/fdt/com_fdt.c b/sys/dev/fdt/com_fdt.c index 5ab6077672c..17db61f311f 100644 --- a/sys/dev/fdt/com_fdt.c +++ b/sys/dev/fdt/com_fdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: com_fdt.c,v 1.1 2018/05/31 20:03:18 kettenis Exp $ */ +/* $OpenBSD: com_fdt.c,v 1.2 2018/07/20 05:37:06 jsg Exp $ */ /* * Copyright (c) 2016 Patrick Wildt * @@ -56,6 +56,7 @@ com_fdt_init_cons(void) if ((node = fdt_find_cons("brcm,bcm2835-aux-uart")) == NULL && (node = fdt_find_cons("snps,dw-apb-uart")) == NULL && + (node = fdt_find_cons("marvell,armada-38x-uart")) == NULL && (node = fdt_find_cons("ti,omap3-uart")) == NULL && (node = fdt_find_cons("ti,omap4-uart")) == NULL) return; @@ -87,6 +88,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, "snps,dw-apb-uart") || + OF_is_compatible(faa->fa_node, "marvell,armada-38x-uart") || OF_is_compatible(faa->fa_node, "ti,omap3-uart") || OF_is_compatible(faa->fa_node, "ti,omap4-uart")); } @@ -121,7 +123,8 @@ com_fdt_attach(struct device *parent, struct device *self, void *aux) sc->sc_reg_width = OF_getpropint(faa->fa_node, "reg-io-width", 4); sc->sc_reg_shift = OF_getpropint(faa->fa_node, "reg-shift", 2); - if (OF_is_compatible(faa->fa_node, "snps,dw-apb-uart")) + if (OF_is_compatible(faa->fa_node, "snps,dw-apb-uart") || + OF_is_compatible(faa->fa_node, "marvell,armada-38x-uart")) intr = com_fdt_intr_designware; if (OF_is_compatible(faa->fa_node, "ti,omap3-uart") || -- 2.20.1