Module Name: src Committed By: ryo Date: Fri Jan 15 18:42:41 UTC 2021
Modified Files: src/sys/arch/arm/amlogic: meson_dwmac.c meson_sdhc.c meson_sdio.c meson_uart.c mesongx_mmc.c src/sys/arch/arm/fdt: a9ptmr_fdt.c a9tmr_fdt.c aaci_fdt.c gtmr_fdt.c plcom_fdt.c plkmi_fdt.c plmmc_fdt.c pmu_fdt.c smsh_fdt.c src/sys/arch/arm/rockchip: rk_gmac.c rk_i2s.c rk_spi.c rk_tsadc.c Log Message: use fdtbus_intr_establish_xname To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/amlogic/meson_dwmac.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/meson_sdhc.c \ src/sys/arch/arm/amlogic/meson_sdio.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/meson_uart.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/amlogic/mesongx_mmc.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/a9ptmr_fdt.c \ src/sys/arch/arm/fdt/aaci_fdt.c src/sys/arch/arm/fdt/plkmi_fdt.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/fdt/a9tmr_fdt.c \ src/sys/arch/arm/fdt/plcom_fdt.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/fdt/gtmr_fdt.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/fdt/plmmc_fdt.c \ src/sys/arch/arm/fdt/smsh_fdt.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/fdt/pmu_fdt.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/rockchip/rk_gmac.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/rockchip/rk_i2s.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rk_spi.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/rk_tsadc.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/amlogic/meson_dwmac.c diff -u src/sys/arch/arm/amlogic/meson_dwmac.c:1.9 src/sys/arch/arm/amlogic/meson_dwmac.c:1.10 --- src/sys/arch/arm/amlogic/meson_dwmac.c:1.9 Fri Jan 1 07:18:23 2021 +++ src/sys/arch/arm/amlogic/meson_dwmac.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: meson_dwmac.c,v 1.9 2021/01/01 07:18:23 ryo Exp $ */ +/* $NetBSD: meson_dwmac.c,v 1.10 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.9 2021/01/01 07:18:23 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: meson_dwmac.c,v 1.10 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -229,8 +229,9 @@ meson_dwmac_attach(device_t parent, devi aprint_naive("\n"); aprint_normal(": Gigabit Ethernet Controller\n"); - if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE, - meson_dwmac_intr, sc) == NULL) { + if (fdtbus_intr_establish_xname(phandle, 0, IPL_NET, + DWCGMAC_FDT_INTR_MPSAFE, meson_dwmac_intr, sc, + device_xname(sc->sc_dev)) == NULL) { aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr); return; } Index: src/sys/arch/arm/amlogic/meson_sdhc.c diff -u src/sys/arch/arm/amlogic/meson_sdhc.c:1.1 src/sys/arch/arm/amlogic/meson_sdhc.c:1.2 --- src/sys/arch/arm/amlogic/meson_sdhc.c:1.1 Sun Jan 20 00:44:01 2019 +++ src/sys/arch/arm/amlogic/meson_sdhc.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: meson_sdhc.c,v 1.1 2019/01/20 00:44:01 jmcneill Exp $ */ +/* $NetBSD: meson_sdhc.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2015-2019 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.1 2019/01/20 00:44:01 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: meson_sdhc.c,v 1.2 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -244,8 +244,8 @@ meson_sdhc_attach(device_t parent, devic sc->sc_non_removable = of_hasprop(sc->sc_slot_phandle, "non-removable"); sc->sc_broken_cd = of_hasprop(sc->sc_slot_phandle, "broken-cd"); - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, - meson_sdhc_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0, + meson_sdhc_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/amlogic/meson_sdio.c diff -u src/sys/arch/arm/amlogic/meson_sdio.c:1.1 src/sys/arch/arm/amlogic/meson_sdio.c:1.2 --- src/sys/arch/arm/amlogic/meson_sdio.c:1.1 Sat Jan 19 20:56:03 2019 +++ src/sys/arch/arm/amlogic/meson_sdio.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: meson_sdio.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ */ +/* $NetBSD: meson_sdio.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2015-2019 Jared D. McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.1 2019/01/19 20:56:03 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: meson_sdio.c,v 1.2 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -224,7 +224,8 @@ meson_sdio_attach(device_t parent, devic sc->sc_non_removable = of_hasprop(sc->sc_slot_phandle, "non-removable"); sc->sc_broken_cd = of_hasprop(sc->sc_slot_phandle, "broken-cd"); - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, meson_sdio_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0, + meson_sdio_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/amlogic/meson_uart.c diff -u src/sys/arch/arm/amlogic/meson_uart.c:1.3 src/sys/arch/arm/amlogic/meson_uart.c:1.4 --- src/sys/arch/arm/amlogic/meson_uart.c:1.3 Tue May 28 05:08:47 2019 +++ src/sys/arch/arm/amlogic/meson_uart.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: meson_uart.c,v 1.3 2019/05/28 05:08:47 ryo Exp $ */ +/* $NetBSD: meson_uart.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(1, "$NetBSD: meson_uart.c,v 1.3 2019/05/28 05:08:47 ryo Exp $"); +__KERNEL_RCSID(1, "$NetBSD: meson_uart.c,v 1.4 2021/01/15 18:42:40 ryo Exp $"); #define cn_trap() \ do { \ @@ -187,8 +187,8 @@ meson_uart_attach(device_t parent, devic } mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_SERIAL); - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL, - FDT_INTR_MPSAFE, meson_uart_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL, + FDT_INTR_MPSAFE, meson_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/amlogic/mesongx_mmc.c diff -u src/sys/arch/arm/amlogic/mesongx_mmc.c:1.8 src/sys/arch/arm/amlogic/mesongx_mmc.c:1.9 --- src/sys/arch/arm/amlogic/mesongx_mmc.c:1.8 Fri Jan 1 11:58:21 2021 +++ src/sys/arch/arm/amlogic/mesongx_mmc.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $ */ +/* $NetBSD: mesongx_mmc.c,v 1.9 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.8 2021/01/01 11:58:21 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.9 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -375,8 +375,8 @@ mesongx_mmc_attach(device_t parent, devi return; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, FDT_INTR_MPSAFE, - mesongx_mmc_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, + FDT_INTR_MPSAFE, mesongx_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/fdt/a9ptmr_fdt.c diff -u src/sys/arch/arm/fdt/a9ptmr_fdt.c:1.1 src/sys/arch/arm/fdt/a9ptmr_fdt.c:1.2 --- src/sys/arch/arm/fdt/a9ptmr_fdt.c:1.1 Sat Aug 10 17:03:59 2019 +++ src/sys/arch/arm/fdt/a9ptmr_fdt.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: a9ptmr_fdt.c,v 1.1 2019/08/10 17:03:59 skrll Exp $ */ +/* $NetBSD: a9ptmr_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: a9ptmr_fdt.c,v 1.1 2019/08/10 17:03:59 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: a9ptmr_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -102,8 +102,8 @@ a9ptmr_fdt_attach(device_t parent, devic aprint_naive("\n"); aprint_normal("\n"); - void *ih = fdtbus_intr_establish(phandle, 0, IPL_CLOCK, - FDT_INTR_MPSAFE, a9ptmr_intr, NULL); + void *ih = fdtbus_intr_establish_xname(phandle, 0, IPL_CLOCK, + FDT_INTR_MPSAFE, a9ptmr_intr, NULL, device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/aaci_fdt.c diff -u src/sys/arch/arm/fdt/aaci_fdt.c:1.1 src/sys/arch/arm/fdt/aaci_fdt.c:1.2 --- src/sys/arch/arm/fdt/aaci_fdt.c:1.1 Thu Jun 8 10:03:59 2017 +++ src/sys/arch/arm/fdt/aaci_fdt.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: aaci_fdt.c,v 1.1 2017/06/08 10:03:59 jmcneill Exp $ */ +/* $NetBSD: aaci_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: aaci_fdt.c,v 1.1 2017/06/08 10:03:59 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: aaci_fdt.c,v 1.2 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -93,8 +93,8 @@ aaci_fdt_attach(device_t parent, device_ return; } - ih = fdtbus_intr_establish(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE, - aaci_intr, sc); + ih = fdtbus_intr_establish_xname(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE, + aaci_intr, sc, device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/plkmi_fdt.c diff -u src/sys/arch/arm/fdt/plkmi_fdt.c:1.1 src/sys/arch/arm/fdt/plkmi_fdt.c:1.2 --- src/sys/arch/arm/fdt/plkmi_fdt.c:1.1 Sat Jun 3 17:05:23 2017 +++ src/sys/arch/arm/fdt/plkmi_fdt.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plkmi_fdt.c,v 1.1 2017/06/03 17:05:23 jmcneill Exp $ */ +/* $NetBSD: plkmi_fdt.c,v 1.2 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plkmi_fdt.c,v 1.1 2017/06/03 17:05:23 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plkmi_fdt.c,v 1.2 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -96,7 +96,8 @@ plkmi_fdt_attach(device_t parent, device plkmi_attach(sc); - ih = fdtbus_intr_establish(phandle, 0, IPL_TTY, 0, plkmi_intr, sc); + ih = fdtbus_intr_establish_xname(phandle, 0, IPL_TTY, 0, plkmi_intr, sc, + device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/a9tmr_fdt.c diff -u src/sys/arch/arm/fdt/a9tmr_fdt.c:1.3 src/sys/arch/arm/fdt/a9tmr_fdt.c:1.4 --- src/sys/arch/arm/fdt/a9tmr_fdt.c:1.3 Tue Jan 22 15:17:33 2019 +++ src/sys/arch/arm/fdt/a9tmr_fdt.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: a9tmr_fdt.c,v 1.3 2019/01/22 15:17:33 jmcneill Exp $ */ +/* $NetBSD: a9tmr_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: a9tmr_fdt.c,v 1.3 2019/01/22 15:17:33 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: a9tmr_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -103,8 +103,8 @@ a9tmr_fdt_attach(device_t parent, device aprint_naive("\n"); aprint_normal("\n"); - void *ih = fdtbus_intr_establish(phandle, 0, IPL_CLOCK, - FDT_INTR_MPSAFE, a9tmr_intr, NULL); + void *ih = fdtbus_intr_establish_xname(phandle, 0, IPL_CLOCK, + FDT_INTR_MPSAFE, a9tmr_intr, NULL, device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/plcom_fdt.c diff -u src/sys/arch/arm/fdt/plcom_fdt.c:1.3 src/sys/arch/arm/fdt/plcom_fdt.c:1.4 --- src/sys/arch/arm/fdt/plcom_fdt.c:1.3 Tue Oct 23 09:15:35 2018 +++ src/sys/arch/arm/fdt/plcom_fdt.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $ */ +/* $NetBSD: plcom_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.3 2018/10/23 09:15:35 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plcom_fdt.c,v 1.4 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -110,8 +110,8 @@ plcom_fdt_attach(device_t parent, device aprint_normal_dev(self, "interrupting on %s\n", intrstr); - ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE, - plcomintr, sc); + ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE, + plcomintr, sc, device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/gtmr_fdt.c diff -u src/sys/arch/arm/fdt/gtmr_fdt.c:1.7 src/sys/arch/arm/fdt/gtmr_fdt.c:1.8 --- src/sys/arch/arm/fdt/gtmr_fdt.c:1.7 Thu Nov 30 14:51:01 2017 +++ src/sys/arch/arm/fdt/gtmr_fdt.c Fri Jan 15 18:42:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $ */ +/* $NetBSD: gtmr_fdt.c,v 1.8 2021/01/15 18:42:40 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.7 2017/11/30 14:51:01 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmr_fdt.c,v 1.8 2021/01/15 18:42:40 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -86,8 +86,8 @@ gtmr_fdt_attach(device_t parent, device_ return; } - void *ih = fdtbus_intr_establish(phandle, GTMR_VTIMER, IPL_CLOCK, - FDT_INTR_MPSAFE, gtmr_intr, NULL); + void *ih = fdtbus_intr_establish_xname(phandle, GTMR_VTIMER, IPL_CLOCK, + FDT_INTR_MPSAFE, gtmr_intr, NULL, device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/plmmc_fdt.c diff -u src/sys/arch/arm/fdt/plmmc_fdt.c:1.2 src/sys/arch/arm/fdt/plmmc_fdt.c:1.3 --- src/sys/arch/arm/fdt/plmmc_fdt.c:1.2 Wed Jun 12 10:19:27 2019 +++ src/sys/arch/arm/fdt/plmmc_fdt.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: plmmc_fdt.c,v 1.2 2019/06/12 10:19:27 skrll Exp $ */ +/* $NetBSD: plmmc_fdt.c,v 1.3 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: plmmc_fdt.c,v 1.2 2019/06/12 10:19:27 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: plmmc_fdt.c,v 1.3 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -105,7 +105,8 @@ plmmc_fdt_attach(device_t parent, device aprint_naive("\n"); aprint_normal("\n"); - ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, plmmc_intr, sc); + ih = fdtbus_intr_establish_xname(phandle, 0, IPL_BIO, 0, plmmc_intr, sc, + device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); return; Index: src/sys/arch/arm/fdt/smsh_fdt.c diff -u src/sys/arch/arm/fdt/smsh_fdt.c:1.2 src/sys/arch/arm/fdt/smsh_fdt.c:1.3 --- src/sys/arch/arm/fdt/smsh_fdt.c:1.2 Sun Nov 3 12:06:32 2019 +++ src/sys/arch/arm/fdt/smsh_fdt.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: smsh_fdt.c,v 1.2 2019/11/03 12:06:32 jmcneill Exp $ */ +/* $NetBSD: smsh_fdt.c,v 1.3 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smsh_fdt.c,v 1.2 2019/11/03 12:06:32 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smsh_fdt.c,v 1.3 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -112,7 +112,8 @@ smsh_fdt_attach(device_t parent, device_ if (lan9118_attach(sc) != 0) goto unmap; - ih = fdtbus_intr_establish(phandle, 0, IPL_NET, 0, lan9118_intr, sc); + ih = fdtbus_intr_establish_xname(phandle, 0, IPL_NET, 0, lan9118_intr, sc, + device_xname(self)); if (ih == NULL) { aprint_error_dev(self, "couldn't install interrupt handler\n"); goto unmap; Index: src/sys/arch/arm/fdt/pmu_fdt.c diff -u src/sys/arch/arm/fdt/pmu_fdt.c:1.6 src/sys/arch/arm/fdt/pmu_fdt.c:1.7 --- src/sys/arch/arm/fdt/pmu_fdt.c:1.6 Sat Jun 29 12:53:05 2019 +++ src/sys/arch/arm/fdt/pmu_fdt.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pmu_fdt.c,v 1.6 2019/06/29 12:53:05 jmcneill Exp $ */ +/* $NetBSD: pmu_fdt.c,v 1.7 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.6 2019/06/29 12:53:05 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.7 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -147,8 +147,8 @@ pmu_fdt_init(device_t self) ih = kmem_zalloc(sizeof(void *) * ncpu, KM_SLEEP); for (n = 0; n < ncpu; n++) { - ih[n] = fdtbus_intr_establish(phandle, n, IPL_HIGH, - FDT_INTR_MPSAFE, arm_pmu_intr, NULL); + ih[n] = fdtbus_intr_establish_xname(phandle, n, IPL_HIGH, + FDT_INTR_MPSAFE, arm_pmu_intr, NULL, device_xname(self)); if (ih[n] == NULL) break; if (!fdtbus_intr_str(phandle, n, intrstr, sizeof(intrstr))) { Index: src/sys/arch/arm/rockchip/rk_gmac.c diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.15 src/sys/arch/arm/rockchip/rk_gmac.c:1.16 --- src/sys/arch/arm/rockchip/rk_gmac.c:1.15 Sat Nov 9 17:21:48 2019 +++ src/sys/arch/arm/rockchip/rk_gmac.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_gmac.c,v 1.15 2019/11/09 17:21:48 tnn Exp $ */ +/* $NetBSD: rk_gmac.c,v 1.16 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -28,7 +28,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.15 2019/11/09 17:21:48 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.16 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -445,8 +445,9 @@ rk_gmac_attach(device_t parent, device_t if (dwc_gmac_attach(sc, MII_PHY_ANY, GMAC_MII_CLK_150_250M_DIV102) != 0) return; - if (fdtbus_intr_establish(phandle, 0, IPL_NET, DWCGMAC_FDT_INTR_MPSAFE, - rk_gmac_intr, sc) == NULL) { + if (fdtbus_intr_establish_xname(phandle, 0, IPL_NET, + DWCGMAC_FDT_INTR_MPSAFE, rk_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/rockchip/rk_i2s.c diff -u src/sys/arch/arm/rockchip/rk_i2s.c:1.6 src/sys/arch/arm/rockchip/rk_i2s.c:1.7 --- src/sys/arch/arm/rockchip/rk_i2s.c:1.6 Fri Jan 1 11:44:41 2021 +++ src/sys/arch/arm/rockchip/rk_i2s.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_i2s.c,v 1.6 2021/01/01 11:44:41 jmcneill Exp $ */ +/* $NetBSD: rk_i2s.c,v 1.7 2021/01/15 18:42:41 ryo Exp $ */ /*- * Copyright (c) 2019 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.6 2021/01/01 11:44:41 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_i2s.c,v 1.7 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -606,7 +606,8 @@ rk_i2s_attach(device_t parent, device_t aprint_naive("\n"); aprint_normal(": I2S/PCM controller\n"); - if (fdtbus_intr_establish(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE, rk_i2s_intr, sc) == NULL) { + if (fdtbus_intr_establish_xname(phandle, 0, IPL_AUDIO, FDT_INTR_MPSAFE, + rk_i2s_intr, sc, device_xname(self)) == NULL) { aprint_error_dev(self, "couldn't establish interrupt on %s\n", intrstr); return; } Index: src/sys/arch/arm/rockchip/rk_spi.c diff -u src/sys/arch/arm/rockchip/rk_spi.c:1.4 src/sys/arch/arm/rockchip/rk_spi.c:1.5 --- src/sys/arch/arm/rockchip/rk_spi.c:1.4 Wed Apr 1 20:37:32 2020 +++ src/sys/arch/arm/rockchip/rk_spi.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_spi.c,v 1.4 2020/04/01 20:37:32 tnn Exp $ */ +/* $NetBSD: rk_spi.c,v 1.5 2021/01/15 18:42:41 ryo Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.4 2020/04/01 20:37:32 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.5 2021/01/15 18:42:41 ryo Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -250,7 +250,8 @@ rk_spi_attach(device_t parent, device_t return; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, rk_spi_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0, + rk_spi_intr, sc, device_xname(self)); if (sc->sc_ih == NULL) { aprint_error(": unable to establish interrupt\n"); return; Index: src/sys/arch/arm/rockchip/rk_tsadc.c diff -u src/sys/arch/arm/rockchip/rk_tsadc.c:1.7 src/sys/arch/arm/rockchip/rk_tsadc.c:1.8 --- src/sys/arch/arm/rockchip/rk_tsadc.c:1.7 Wed Jul 3 20:55:21 2019 +++ src/sys/arch/arm/rockchip/rk_tsadc.c Fri Jan 15 18:42:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_tsadc.c,v 1.7 2019/07/03 20:55:21 jmcneill Exp $ */ +/* $NetBSD: rk_tsadc.c,v 1.8 2021/01/15 18:42:41 ryo Exp $ */ /* * Copyright (c) 2019 Matthew R. Green @@ -30,7 +30,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.7 2019/07/03 20:55:21 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.8 2021/01/15 18:42:41 ryo Exp $"); /* * Driver for the TSADC temperature sensor monitor in RK3328 and RK3399. @@ -501,8 +501,8 @@ rk_tsadc_attach(device_t parent, device_ goto fail; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE, - rk_tsadc_intr, sc); + sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE, + rk_tsadc_intr, sc, device_xname(self)); if (sc->sc_ih == NULL) { aprint_error_dev(self, "couldn't establish interrupt on %s\n", intrstr);