Module Name: src
Committed By: skrll
Date: Sun Mar 14 08:16:57 UTC 2021
Modified Files:
src/sys/arch/arm/samsung: exynos_combiner.c exynos_dwcmmc.c
exynos_ehci.c exynos_i2c.c exynos_ohci.c exynos_uart.c mct.c
Log Message:
Use fdtbus_intr_establish_xname
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/samsung/exynos_combiner.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/samsung/exynos_dwcmmc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/samsung/exynos_ehci.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/samsung/exynos_ohci.c \
src/sys/arch/arm/samsung/exynos_uart.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/samsung/mct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/samsung/exynos_combiner.c
diff -u src/sys/arch/arm/samsung/exynos_combiner.c:1.13 src/sys/arch/arm/samsung/exynos_combiner.c:1.14
--- src/sys/arch/arm/samsung/exynos_combiner.c:1.13 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_combiner.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_combiner.c,v 1.13 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_combiner.c,v 1.14 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.13 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.14 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -254,12 +254,13 @@ exynos_combiner_establish(device_t dev,
if (!groupp) {
groupp = exynos_combiner_new_group(sc, group);
if (arg == NULL) {
- groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
- group, ipl /* XXX */, flags, func, NULL);
+ groupp->irq_ih = fdtbus_intr_establish_xname(
+ sc->sc_phandle, group, ipl /* XXX */, flags, func, NULL,
+ device_xname(dev));
} else {
- groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
- group, ipl /* XXX */, FDT_INTR_MPSAFE,
- exynos_combiner_irq, groupp);
+ groupp->irq_ih = fdtbus_intr_establish_xname(
+ sc->sc_phandle, group, ipl /* XXX */, FDT_INTR_MPSAFE,
+ exynos_combiner_irq, groupp, device_xname(dev));
}
KASSERT(groupp->irq_ih != NULL);
groupp->irq_ipl = ipl;
Index: src/sys/arch/arm/samsung/exynos_dwcmmc.c
diff -u src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.14 src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.15
--- src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.14 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_dwcmmc.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_dwcmmc.c,v 1.14 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_dwcmmc.c,v 1.15 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.14 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.15 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -165,8 +165,8 @@ exynos_dwcmmc_attach(device_t parent, de
if (dwc_mmc_init(sc) != 0)
return;
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0,
- dwc_mmc_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0,
+ dwc_mmc_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/samsung/exynos_ehci.c
diff -u src/sys/arch/arm/samsung/exynos_ehci.c:1.5 src/sys/arch/arm/samsung/exynos_ehci.c:1.6
--- src/sys/arch/arm/samsung/exynos_ehci.c:1.5 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_ehci.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ehci.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_ehci.c,v 1.6 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_ehci.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_ehci.c,v 1.6 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -126,8 +126,8 @@ exynos_ehci_attach(device_t parent, devi
return;
}
- ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
- ehci_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
+ ehci_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/samsung/exynos_i2c.c
diff -u src/sys/arch/arm/samsung/exynos_i2c.c:1.21 src/sys/arch/arm/samsung/exynos_i2c.c:1.22
--- src/sys/arch/arm/samsung/exynos_i2c.c:1.21 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_i2c.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_i2c.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $ */
/*
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_arm_debug.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.21 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.22 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -159,8 +159,8 @@ exynos_i2c_attach(device_t parent, devic
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM,
- FDT_INTR_MPSAFE, exynos_i2c_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, exynos_i2c_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/samsung/exynos_ohci.c
diff -u src/sys/arch/arm/samsung/exynos_ohci.c:1.4 src/sys/arch/arm/samsung/exynos_ohci.c:1.5
--- src/sys/arch/arm/samsung/exynos_ohci.c:1.4 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_ohci.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_ohci.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_ohci.c,v 1.5 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_ohci.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_ohci.c,v 1.5 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -122,8 +122,8 @@ exynos_ohci_attach(device_t parent, devi
return;
}
- ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
- ohci_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
+ ohci_intr, sc, device_xname(self));
if (ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/samsung/exynos_uart.c
diff -u src/sys/arch/arm/samsung/exynos_uart.c:1.4 src/sys/arch/arm/samsung/exynos_uart.c:1.5
--- src/sys/arch/arm/samsung/exynos_uart.c:1.4 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/exynos_uart.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_uart.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: exynos_uart.c,v 1.5 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2013-2018 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.4 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.5 2021/03/14 08:16:57 skrll Exp $");
#define cn_trap() \
do { \
@@ -199,8 +199,8 @@ exynos_uart_attach(device_t parent, devi
}
sc->sc_freq = clk_get_rate(clk_uart_baud0);
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL,
- 0, exynos_uart_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL,
+ 0, exynos_uart_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error(": failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/samsung/mct.c
diff -u src/sys/arch/arm/samsung/mct.c:1.17 src/sys/arch/arm/samsung/mct.c:1.18
--- src/sys/arch/arm/samsung/mct.c:1.17 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/samsung/mct.c Sun Mar 14 08:16:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mct.c,v 1.17 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: mct.c,v 1.18 2021/03/14 08:16:57 skrll Exp $ */
/*-
* Copyright (c) 2014-2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.17 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.18 2021/03/14 08:16:57 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -193,8 +193,8 @@ mct_cpu_initclocks(void)
if (!fdtbus_intr_str(sc->sc_phandle, 0, intrstr, sizeof(intrstr)))
panic("%s: failed to decode interrupt", __func__);
- sc->sc_global_ih = fdtbus_intr_establish(sc->sc_phandle, 0, IPL_CLOCK,
- FDT_INTR_MPSAFE, mct_intr, NULL);
+ sc->sc_global_ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, IPL_CLOCK,
+ FDT_INTR_MPSAFE, mct_intr, NULL, device_xname(sc->sc_dev));
if (sc->sc_global_ih == NULL)
panic("%s: failed to establish timer interrupt on %s", __func__, intrstr);
