Module Name: src
Committed By: jmcneill
Date: Fri Jan 15 22:47:33 UTC 2021
Modified Files:
src/sys/arch/arm/sunxi: sun4i_dma.c sun4i_emac.c sun4i_spi.c
sun6i_dma.c sun8i_codec.c sun8i_crypto.c sunxi_can.c sunxi_emac.c
sunxi_gmac.c sunxi_gpio.c sunxi_hstimer.c sunxi_lcdc.c
sunxi_lradc.c sunxi_mmc.c sunxi_musb.c sunxi_nand.c sunxi_nmi.c
sunxi_rsb.c sunxi_sata.c sunxi_thermal.c sunxi_timer.c sunxi_ts.c
sunxi_twi.c
Log Message:
use fdtbus_intr_establish_xname
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sun4i_dma.c \
src/sys/arch/arm/sunxi/sunxi_can.c src/sys/arch/arm/sunxi/sunxi_ts.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/sunxi/sun4i_emac.c \
src/sys/arch/arm/sunxi/sunxi_twi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sun4i_spi.c \
src/sys/arch/arm/sunxi/sunxi_musb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sunxi/sun6i_dma.c \
src/sys/arch/arm/sunxi/sunxi_rsb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sun8i_codec.c \
src/sys/arch/arm/sunxi/sunxi_gmac.c src/sys/arch/arm/sunxi/sunxi_lcdc.c \
src/sys/arch/arm/sunxi/sunxi_timer.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sunxi/sun8i_crypto.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/sunxi/sunxi_emac.c \
src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_hstimer.c \
src/sys/arch/arm/sunxi/sunxi_sata.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_lradc.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/sunxi/sunxi_mmc.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/sunxi/sunxi_nand.c \
src/sys/arch/arm/sunxi/sunxi_thermal.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sunxi_nmi.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/sunxi/sun4i_dma.c
diff -u src/sys/arch/arm/sunxi/sun4i_dma.c:1.3 src/sys/arch/arm/sunxi/sun4i_dma.c:1.4
--- src/sys/arch/arm/sunxi/sun4i_dma.c:1.3 Fri Apr 20 18:04:12 2018
+++ src/sys/arch/arm/sunxi/sun4i_dma.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_dma.c,v 1.3 2018/04/20 18:04:12 bouyer Exp $ */
+/* $NetBSD: sun4i_dma.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.3 2018/04/20 18:04:12 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_dma.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -408,8 +408,8 @@ sun4idma_attach(device_t parent, device_
}
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SCHED,
- FDT_INTR_MPSAFE, sun4idma_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SCHED,
+ FDT_INTR_MPSAFE, sun4idma_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"couldn't establish interrupt on %s\n", intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_can.c
diff -u src/sys/arch/arm/sunxi/sunxi_can.c:1.3 src/sys/arch/arm/sunxi/sunxi_can.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_can.c:1.3 Wed Jan 29 06:05:31 2020
+++ src/sys/arch/arm/sunxi/sunxi_can.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_can.c,v 1.3 2020/01/29 06:05:31 thorpej Exp $ */
+/* $NetBSD: sunxi_can.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.3 2020/01/29 06:05:31 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -202,8 +202,8 @@ sunxi_can_attach(device_t parent, device
sunxi_can_write(sc, SUNXI_CAN_INT_REG,
sunxi_can_read(sc, SUNXI_CAN_INT_REG));
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_NET, 0,
- sunxi_can_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_NET, 0,
+ sunxi_can_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_ts.c
diff -u src/sys/arch/arm/sunxi/sunxi_ts.c:1.3 src/sys/arch/arm/sunxi/sunxi_ts.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_ts.c:1.3 Tue Jun 4 03:03:34 2019
+++ src/sys/arch/arm/sunxi/sunxi_ts.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $ */
+/* $NetBSD: sunxi_ts.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.3 2019/06/04 03:03:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_ts.c,v 1.4 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -388,7 +388,8 @@ sunxi_ts_attach(device_t parent, device_
sunxi_ts_init(sc);
- ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, sunxi_ts_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0, sunxi_ts_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/sunxi/sun4i_emac.c
diff -u src/sys/arch/arm/sunxi/sun4i_emac.c:1.12 src/sys/arch/arm/sunxi/sun4i_emac.c:1.13
--- src/sys/arch/arm/sunxi/sun4i_emac.c:1.12 Wed Jan 29 06:05:31 2020
+++ src/sys/arch/arm/sunxi/sun4i_emac.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_emac.c,v 1.12 2020/01/29 06:05:31 thorpej Exp $ */
+/* $NetBSD: sun4i_emac.c,v 1.13 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2013-2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.12 2020/01/29 06:05:31 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun4i_emac.c,v 1.13 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -299,8 +299,8 @@ sun4i_emac_attach(device_t parent, devic
sun4i_emac_write(sc, EMAC_INT_STA_REG,
sun4i_emac_read(sc, EMAC_INT_STA_REG));
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_NET, 0,
- sun4i_emac_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_NET, 0,
+ sun4i_emac_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_twi.c
diff -u src/sys/arch/arm/sunxi/sunxi_twi.c:1.12 src/sys/arch/arm/sunxi/sunxi_twi.c:1.13
--- src/sys/arch/arm/sunxi/sunxi_twi.c:1.12 Wed Dec 23 16:02:12 2020
+++ src/sys/arch/arm/sunxi/sunxi_twi.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_twi.c,v 1.12 2020/12/23 16:02:12 thorpej Exp $ */
+/* $NetBSD: sunxi_twi.c,v 1.13 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.12 2020/12/23 16:02:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_twi.c,v 1.13 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -174,7 +174,8 @@ sunxi_twi_attach(device_t parent, device
if (clk != NULL)
sunxi_twi_set_clock(sc, clk_get_rate(clk), 100000);
- ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, gttwsi_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0, gttwsi_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/sunxi/sun4i_spi.c
diff -u src/sys/arch/arm/sunxi/sun4i_spi.c:1.5 src/sys/arch/arm/sunxi/sun4i_spi.c:1.6
--- src/sys/arch/arm/sunxi/sun4i_spi.c:1.5 Wed Sep 11 15:03:52 2019
+++ src/sys/arch/arm/sunxi/sun4i_spi.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_spi.c,v 1.5 2019/09/11 15:03:52 bouyer Exp $ */
+/* $NetBSD: sun4i_spi.c,v 1.6 2021/01/15 22:47:32 jmcneill Exp $ */
/*
* Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.5 2019/09/11 15:03:52 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.6 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -149,7 +149,8 @@ sun4ispi_attach(device_t parent, device_
return;
}
- sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, sun4ispi_intr, sc);
+ sc->sc_intrh = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0,
+ sun4ispi_intr, sc, device_xname(self));
if (sc->sc_intrh == NULL) {
aprint_error(": unable to establish interrupt\n");
return;
Index: src/sys/arch/arm/sunxi/sunxi_musb.c
diff -u src/sys/arch/arm/sunxi/sunxi_musb.c:1.5 src/sys/arch/arm/sunxi/sunxi_musb.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_musb.c:1.5 Mon Apr 9 16:21:09 2018
+++ src/sys/arch/arm/sunxi/sunxi_musb.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_musb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $ */
+/* $NetBSD: sunxi_musb.c,v 1.6 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.5 2018/04/09 16:21:09 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_musb.c,v 1.6 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -381,8 +381,8 @@ sunxi_musb_attach(device_t parent, devic
return;
}
- ih = fdtbus_intr_establish(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
- sunxi_musb_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_USB, FDT_INTR_MPSAFE,
+ sunxi_musb_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/sunxi/sun6i_dma.c
diff -u src/sys/arch/arm/sunxi/sun6i_dma.c:1.9 src/sys/arch/arm/sunxi/sun6i_dma.c:1.10
--- src/sys/arch/arm/sunxi/sun6i_dma.c:1.9 Wed Mar 6 19:16:53 2019
+++ src/sys/arch/arm/sunxi/sun6i_dma.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun6i_dma.c,v 1.9 2019/03/06 19:16:53 jakllsch Exp $ */
+/* $NetBSD: sun6i_dma.c,v 1.10 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun6i_dma.c,v 1.9 2019/03/06 19:16:53 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun6i_dma.c,v 1.10 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -507,8 +507,8 @@ sun6idma_attach(device_t parent, device_
if (conf->autogate)
DMA_WRITE(sc, conf->autogate_reg, conf->autogate_mask);
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SCHED, FDT_INTR_MPSAFE,
- sun6idma_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SCHED,
+ FDT_INTR_MPSAFE, sun6idma_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"couldn't establish interrupt on %s\n", intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_rsb.c
diff -u src/sys/arch/arm/sunxi/sunxi_rsb.c:1.9 src/sys/arch/arm/sunxi/sunxi_rsb.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_rsb.c:1.9 Wed Dec 23 16:02:12 2020
+++ src/sys/arch/arm/sunxi/sunxi_rsb.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rsb.c,v 1.9 2020/12/23 16:02:12 thorpej Exp $ */
+/* $NetBSD: sunxi_rsb.c,v 1.10 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.9 2020/12/23 16:02:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.10 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -169,8 +169,8 @@ sunxi_rsb_attach(device_t parent, device
aprint_naive("\n");
aprint_normal(": %s\n", sc->sc_type == SUNXI_P2WI ? "P2WI" : "RSB");
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0,
- sunxi_rsb_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0,
+ sunxi_rsb_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/sunxi/sun8i_codec.c
diff -u src/sys/arch/arm/sunxi/sun8i_codec.c:1.7 src/sys/arch/arm/sunxi/sun8i_codec.c:1.8
--- src/sys/arch/arm/sunxi/sun8i_codec.c:1.7 Thu Jun 6 23:19:07 2019
+++ src/sys/arch/arm/sunxi/sun8i_codec.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_codec.c,v 1.7 2019/06/06 23:19:07 jmcneill Exp $ */
+/* $NetBSD: sun8i_codec.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun8i_codec.c,v 1.7 2019/06/06 23:19:07 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun8i_codec.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -456,8 +456,8 @@ sun8i_codec_attach(device_t parent, devi
/* Schedule initial jack detect task */
workqueue_enqueue(sc->sc_workq, &sc->sc_work, NULL);
- ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- sun8i_codec_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
+ sun8i_codec_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/sunxi/sunxi_gmac.c
diff -u src/sys/arch/arm/sunxi/sunxi_gmac.c:1.7 src/sys/arch/arm/sunxi/sunxi_gmac.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_gmac.c:1.7 Fri Nov 1 13:30:02 2019
+++ src/sys/arch/arm/sunxi/sunxi_gmac.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gmac.c,v 1.7 2019/11/01 13:30:02 bad Exp $ */
+/* $NetBSD: sunxi_gmac.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.7 2019/11/01 13:30:02 bad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gmac.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -200,8 +200,9 @@ sunxi_gmac_attach(device_t parent, devic
aprint_naive("\n");
aprint_normal(": GMAC\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE,
- sunxi_gmac_intr, sc) == NULL) {
+ if (fdtbus_intr_establish_xname(phandle, 0, IPL_NET,
+ DWCGMAC_FDT_INTR_MPSAFE, sunxi_gmac_intr, sc,
+ device_xname(self)) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/sunxi/sunxi_lcdc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.7 src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_lcdc.c:1.7 Sat Nov 23 20:28:04 2019
+++ src/sys/arch/arm/sunxi/sunxi_lcdc.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lcdc.c,v 1.7 2019/11/23 20:28:04 jmcneill Exp $ */
+/* $NetBSD: sunxi_lcdc.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.7 2019/11/23 20:28:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lcdc.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -530,8 +530,8 @@ sunxi_lcdc_attach(device_t parent, devic
sc->sc_ports.dp_ep_get_data = sunxi_lcdc_ep_get_data;
fdt_ports_register(&sc->sc_ports, self, phandle, EP_DRM_ENCODER);
- ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- sunxi_lcdc_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
+ sunxi_lcdc_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/sunxi/sunxi_timer.c
diff -u src/sys/arch/arm/sunxi/sunxi_timer.c:1.7 src/sys/arch/arm/sunxi/sunxi_timer.c:1.8
--- src/sys/arch/arm/sunxi/sunxi_timer.c:1.7 Fri Jun 14 21:48:43 2019
+++ src/sys/arch/arm/sunxi/sunxi_timer.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_timer.c,v 1.7 2019/06/14 21:48:43 tnn Exp $ */
+/* $NetBSD: sunxi_timer.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_timer.c,v 1.7 2019/06/14 21:48:43 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_timer.c,v 1.8 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -144,8 +144,8 @@ sunxi_timer_cpu_initclocks(void)
if (!fdtbus_intr_str(sc->sc_phandle, 0, intrstr, sizeof(intrstr)))
panic("%s: failed to decode interrupt", __func__);
- ih = fdtbus_intr_establish(sc->sc_phandle, 0, IPL_CLOCK,
- FDT_INTR_MPSAFE, sunxi_timer_intr, NULL);
+ ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, IPL_CLOCK,
+ FDT_INTR_MPSAFE, sunxi_timer_intr, NULL, device_xname(sc->sc_dev));
if (ih == NULL)
panic("%s: failed to establish timer interrupt", __func__);
Index: src/sys/arch/arm/sunxi/sun8i_crypto.c
diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.18 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.19
--- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.18 Sun Jun 14 16:29:47 2020
+++ src/sys/arch/arm/sunxi/sun8i_crypto.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_crypto.c,v 1.18 2020/06/14 16:29:47 ad Exp $ */
+/* $NetBSD: sun8i_crypto.c,v 1.19 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.18 2020/06/14 16:29:47 ad Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.19 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -416,8 +416,8 @@ sun8i_crypto_attach(device_t parent, dev
sun8i_crypto_write(sc, SUN8I_CRYPTO_ISR, 0);
/* Establish an interrupt handler. */
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- &sun8i_crypto_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, &sun8i_crypto_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_emac.c
diff -u src/sys/arch/arm/sunxi/sunxi_emac.c:1.29 src/sys/arch/arm/sunxi/sunxi_emac.c:1.30
--- src/sys/arch/arm/sunxi/sunxi_emac.c:1.29 Wed Jan 29 06:05:31 2020
+++ src/sys/arch/arm/sunxi/sunxi_emac.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_emac.c,v 1.29 2020/01/29 06:05:31 thorpej Exp $ */
+/* $NetBSD: sunxi_emac.c,v 1.30 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.29 2020/01/29 06:05:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_emac.c,v 1.30 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1414,8 +1414,8 @@ sunxi_emac_attach(device_t parent, devic
}
/* Install interrupt handler */
- sc->ih = fdtbus_intr_establish(phandle, 0, IPL_NET,
- FDT_INTR_FLAGS, sunxi_emac_intr, sc);
+ sc->ih = fdtbus_intr_establish_xname(phandle, 0, IPL_NET,
+ FDT_INTR_FLAGS, sunxi_emac_intr, sc, device_xname(self));
if (sc->ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.29 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.30
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.29 Fri Jan 15 00:38:23 2021
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.29 2021/01/15 00:38:23 jmcneill Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.30 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.29 2021/01/15 00:38:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.30 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1038,8 +1038,8 @@ sunxi_gpio_attach(device_t parent, devic
aprint_error_dev(self, "failed to decode interrupt\n");
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- sunxi_gpio_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, sunxi_gpio_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_hstimer.c
diff -u src/sys/arch/arm/sunxi/sunxi_hstimer.c:1.2 src/sys/arch/arm/sunxi/sunxi_hstimer.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_hstimer.c:1.2 Fri Jun 14 21:48:43 2019
+++ src/sys/arch/arm/sunxi/sunxi_hstimer.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_hstimer.c,v 1.2 2019/06/14 21:48:43 tnn Exp $ */
+/* $NetBSD: sunxi_hstimer.c,v 1.3 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Tobias Nygren <[email protected]>
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_hstimer.c,v 1.2 2019/06/14 21:48:43 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_hstimer.c,v 1.3 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/bus.h>
#include <sys/device.h>
@@ -186,8 +186,8 @@ sunxi_hstimer_attach(device_t parent, de
aprint_error_dev(self, "failed to decode interrupt\n");
return;
}
- sc->sc_ih = fdtbus_intr_establish(sc->sc_phandle, 0, IPL_CLOCK,
- FDT_INTR_MPSAFE, sunxi_hstimer_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, IPL_CLOCK,
+ FDT_INTR_MPSAFE, sunxi_hstimer_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_sata.c
diff -u src/sys/arch/arm/sunxi/sunxi_sata.c:1.2 src/sys/arch/arm/sunxi/sunxi_sata.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_sata.c:1.2 Mon May 13 16:55:17 2019
+++ src/sys/arch/arm/sunxi/sunxi_sata.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_sata.c,v 1.2 2019/05/13 16:55:17 bouyer Exp $ */
+/* $NetBSD: sunxi_sata.c,v 1.3 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_sata.c,v 1.2 2019/05/13 16:55:17 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_sata.c,v 1.3 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -112,7 +112,8 @@ sunxi_sata_attach(device_t parent, devic
aprint_naive("\n");
aprint_normal(": SATA\n");
- if (fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, ahci_intr, sc) == NULL) {
+ if (fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0, ahci_intr,
+ sc, device_xname(self)) == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr);
return;
}
Index: src/sys/arch/arm/sunxi/sunxi_lradc.c
diff -u src/sys/arch/arm/sunxi/sunxi_lradc.c:1.1 src/sys/arch/arm/sunxi/sunxi_lradc.c:1.2
--- src/sys/arch/arm/sunxi/sunxi_lradc.c:1.1 Wed Mar 7 20:55:31 2018
+++ src/sys/arch/arm/sunxi/sunxi_lradc.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_lradc.c,v 1.1 2018/03/07 20:55:31 bouyer Exp $ */
+/* $NetBSD: sunxi_lradc.c,v 1.2 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2016, 2018 Manuel Bouyer
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_lradc.c,v 1.1 2018/03/07 20:55:31 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_lradc.c,v 1.2 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -183,24 +183,24 @@ sunxi_lradc_attach(device_t parent, devi
if (sc->sc_chans == 1 || sc->sc_chans == 2) {
sunxi_lradc_print_levels(sc, 1);
}
-
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM,
- FDT_INTR_MPSAFE, sunxi_lradc_intr, sc);
+
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, sunxi_lradc_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt on %s\n",
intrstr);
return;
}
- aprint_normal_dev(self, ": interrupting on %s\n", intrstr);
+ aprint_normal_dev(self, "interrupting on %s\n", intrstr);
if (sc->sc_chans == 0 || sc->sc_chans == 2) {
if (!sunxi_lradc_register_switches(sc, 0)) {
- aprint_error_dev(self, ": can't register switches\n");
+ aprint_error_dev(self, "can't register switches\n");
return;
}
}
if (sc->sc_chans == 1 || sc->sc_chans == 2) {
if (!sunxi_lradc_register_switches(sc, 1)) {
- aprint_error_dev(self, ": can't register switches\n");
+ aprint_error_dev(self, "can't register switches\n");
return;
}
}
@@ -211,7 +211,7 @@ sunxi_lradc_attach(device_t parent, devi
*/
bus_space_write_4(sc->sc_bst, sc->sc_bsh, AWIN_LRADC_CTRL_REG,
(2 << AWIN_LRADC_CTRL_FIRSTCONV_SHIFT) |
- (1 << AWIN_LRADC_CTRL_LV_A_B_CNT_SHIFT) |
+ (1 << AWIN_LRADC_CTRL_LV_A_B_CNT_SHIFT) |
AWIN_LRADC_CTRL_HOLD_EN |
AWIN_LRADC_CTRL_RATE_250 |
(sc->sc_chans << AWIN_LRADC_CTRL_CHAN_SHIFT) |
Index: src/sys/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.41 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.42
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.41 Sat Mar 7 00:51:10 2020
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.41 2020/03/07 00:51:10 macallan Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.42 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.41 2020/03/07 00:51:10 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.42 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -396,8 +396,8 @@ sunxi_mmc_attach(device_t parent, device
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, FDT_INTR_MPSAFE,
- sunxi_mmc_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO,
+ FDT_INTR_MPSAFE, sunxi_mmc_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt on %s\n",
intrstr);
Index: src/sys/arch/arm/sunxi/sunxi_nand.c
diff -u src/sys/arch/arm/sunxi/sunxi_nand.c:1.8 src/sys/arch/arm/sunxi/sunxi_nand.c:1.9
--- src/sys/arch/arm/sunxi/sunxi_nand.c:1.8 Mon Aug 24 07:42:02 2020
+++ src/sys/arch/arm/sunxi/sunxi_nand.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_nand.c,v 1.8 2020/08/24 07:42:02 skrll Exp $ */
+/* $NetBSD: sunxi_nand.c,v 1.9 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_nand.c,v 1.8 2020/08/24 07:42:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_nand.c,v 1.9 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -667,8 +667,8 @@ sunxi_nand_attach(device_t parent, devic
aprint_naive("\n");
aprint_normal(": NAND Flash Controller\n");
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- sunxi_nand_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, sunxi_nand_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/sunxi/sunxi_thermal.c
diff -u src/sys/arch/arm/sunxi/sunxi_thermal.c:1.8 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.9
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.8 Wed Jan 1 22:57:16 2020
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.8 2020/01/01 22:57:16 thorpej Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.9 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2016-2017 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.8 2020/01/01 22:57:16 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.9 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -589,8 +589,8 @@ sunxi_thermal_attach(device_t parent, de
aprint_naive("\n");
aprint_normal(": Thermal sensor controller\n");
- ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- sunxi_thermal_intr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
+ sunxi_thermal_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/sunxi/sunxi_nmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_nmi.c:1.6 src/sys/arch/arm/sunxi/sunxi_nmi.c:1.7
--- src/sys/arch/arm/sunxi/sunxi_nmi.c:1.6 Fri Jan 15 00:38:23 2021
+++ src/sys/arch/arm/sunxi/sunxi_nmi.c Fri Jan 15 22:47:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_nmi.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $ */
+/* $NetBSD: sunxi_nmi.c,v 1.7 2021/01/15 22:47:32 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.7 2021/01/15 22:47:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -230,8 +230,8 @@ sunxi_nmi_fdt_establish(device_t dev, u_
mutex_exit(&sc->sc_intr_lock);
- sc->sc_ih = fdtbus_intr_establish(sc->sc_phandle, 0, ipl, flags,
- sunxi_nmi_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(sc->sc_phandle, 0, ipl, flags,
+ sunxi_nmi_intr, sc, device_xname(dev));
mutex_enter(&sc->sc_intr_lock);
sunxi_nmi_irq_set_type(sc, irq_type);
