constify struct cfattach

381 files changed, 767 insertions, 767 deletions

diff --git a/sys/arch/arm64/dev/acpiiort.c b/sys/arch/arm64/dev/acpiiort.c
index 93626c915c0..f00f6e11262 100644
--- a/sys/arch/arm64/dev/acpiiort.c
+++ b/sys/arch/arm64/dev/acpiiort.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiiort.c,v 1.5 2021/11/26 15:21:26 patrick Exp $ */
+/* $OpenBSD: acpiiort.c,v 1.6 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -31,7 +31,7 @@ SIMPLEQ_HEAD(, acpiiort_smmu) acpiiort_smmu_list =
 int acpiiort_match(struct device *, void *, void *);
 void acpiiort_attach(struct device *, struct device *, void *);
 
-struct cfattach acpiiort_ca = {
+const struct cfattach acpiiort_ca = {
 	sizeof(struct device), acpiiort_match, acpiiort_attach
 };
 
diff --git a/sys/arch/arm64/dev/apldart.c b/sys/arch/arm64/dev/apldart.c
index 3f3b3bd26c8..0af654ba555 100644
--- a/sys/arch/arm64/dev/apldart.c
+++ b/sys/arch/arm64/dev/apldart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apldart.c,v 1.13 2022/03/14 13:08:32 kettenis Exp $	*/
+/*	$OpenBSD: apldart.c,v 1.14 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -150,7 +150,7 @@ void	apldart_dmamem_free(bus_dma_tag_t, struct apldart_dmamem *);
 int	apldart_match(struct device *, void *, void *);
 void	apldart_attach(struct device *, struct device *, void *);
 
-struct cfattach	apldart_ca = {
+const struct cfattach	apldart_ca = {
 	sizeof (struct apldart_softc), apldart_match, apldart_attach
 };
 
diff --git a/sys/arch/arm64/dev/apldog.c b/sys/arch/arm64/dev/apldog.c
index 94d116aaa40..74902912f5e 100644
--- a/sys/arch/arm64/dev/apldog.c
+++ b/sys/arch/arm64/dev/apldog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apldog.c,v 1.3 2022/01/13 08:59:10 kettenis Exp $	*/
+/*	$OpenBSD: apldog.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -57,7 +57,7 @@ struct apldog_softc *apldog_sc;
 int	apldog_match(struct device *, void *, void *);
 void	apldog_attach(struct device *, struct device *, void *);
 
-struct cfattach	apldog_ca = {
+const struct cfattach	apldog_ca = {
 	sizeof (struct apldog_softc), apldog_match, apldog_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplhidev.c b/sys/arch/arm64/dev/aplhidev.c
index 4368932d1e2..2b00f7e217d 100644
--- a/sys/arch/arm64/dev/aplhidev.c
+++ b/sys/arch/arm64/dev/aplhidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplhidev.c,v 1.5 2022/02/14 00:53:40 jsg Exp $	*/
+/*	$OpenBSD: aplhidev.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2013-2014 joshua stein <jcs@openbsd.org>
@@ -131,7 +131,7 @@ struct aplhidev_softc {
 int	 aplhidev_match(struct device *, void *, void *);
 void	 aplhidev_attach(struct device *, struct device *, void *);
 
-struct cfattach aplhidev_ca = {
+const struct cfattach aplhidev_ca = {
 	sizeof(struct aplhidev_softc), aplhidev_match, aplhidev_attach
 };
 
@@ -429,7 +429,7 @@ const struct wskbd_accessops aplkbd_accessops = {
 int	 aplkbd_match(struct device *, void *, void *);
 void	 aplkbd_attach(struct device *, struct device *, void *);
 
-struct cfattach aplkbd_ca = {
+const struct cfattach aplkbd_ca = {
 	sizeof(struct aplkbd_softc), aplkbd_match, aplkbd_attach
 };
 
@@ -611,7 +611,7 @@ const struct wsmouse_accessops aplms_accessops = {
 int	 aplms_match(struct device *, void *, void *);
 void	 aplms_attach(struct device *, struct device *, void *);
 
-struct cfattach aplms_ca = {
+const struct cfattach aplms_ca = {
 	sizeof(struct aplms_softc), aplms_match, aplms_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplintc.c b/sys/arch/arm64/dev/aplintc.c
index 814a74f1d5d..20b9f3b349b 100644
--- a/sys/arch/arm64/dev/aplintc.c
+++ b/sys/arch/arm64/dev/aplintc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplintc.c,v 1.9 2022/03/31 18:47:04 kettenis Exp $	*/
+/*	$OpenBSD: aplintc.c,v 1.10 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis
  *
@@ -130,7 +130,7 @@ struct aplintc_softc *aplintc_sc;
 int	aplintc_match(struct device *, void *, void *);
 void	aplintc_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplintc_ca = {
+const struct cfattach	aplintc_ca = {
 	sizeof (struct aplintc_softc), aplintc_match, aplintc_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplns.c b/sys/arch/arm64/dev/aplns.c
index dbf7795960e..ddb085b576a 100644
--- a/sys/arch/arm64/dev/aplns.c
+++ b/sys/arch/arm64/dev/aplns.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplns.c,v 1.10 2022/01/10 09:07:28 kettenis Exp $ */
+/*	$OpenBSD: aplns.c,v 1.11 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2014, 2021 David Gwynne <dlg@openbsd.org>
  *
@@ -83,7 +83,7 @@ struct ans_nvmmu_tcb {
 int	aplns_match(struct device *, void *, void *);
 void	aplns_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplns_ca = {
+const struct cfattach	aplns_ca = {
 	sizeof(struct device),
 	aplns_match,
 	aplns_attach
@@ -124,7 +124,7 @@ struct nvme_ans_softc {
 int	nvme_ans_match(struct device *, void *, void *);
 void	nvme_ans_attach(struct device *, struct device *, void *);
 
-struct cfattach nvme_ans_ca = {
+const struct cfattach nvme_ans_ca = {
 	sizeof(struct nvme_ans_softc),
 	nvme_ans_match,
 	nvme_ans_attach,
diff --git a/sys/arch/arm64/dev/aplpcie.c b/sys/arch/arm64/dev/aplpcie.c
index e2d6cc773b7..613469a166e 100644
--- a/sys/arch/arm64/dev/aplpcie.c
+++ b/sys/arch/arm64/dev/aplpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpcie.c,v 1.12 2022/03/07 11:08:13 kettenis Exp $	*/
+/*	$OpenBSD: aplpcie.c,v 1.13 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -135,7 +135,7 @@ struct aplpcie_softc {
 int	aplpcie_match(struct device *, void *, void *);
 void	aplpcie_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpcie_ca = {
+const struct cfattach	aplpcie_ca = {
 	sizeof (struct aplpcie_softc), aplpcie_match, aplpcie_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplpinctrl.c b/sys/arch/arm64/dev/aplpinctrl.c
index a090585fbf2..c02ccf48077 100644
--- a/sys/arch/arm64/dev/aplpinctrl.c
+++ b/sys/arch/arm64/dev/aplpinctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpinctrl.c,v 1.3 2021/12/23 20:48:24 patrick Exp $	*/
+/*	$OpenBSD: aplpinctrl.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -86,7 +86,7 @@ struct aplpinctrl_softc {
 int	aplpinctrl_match(struct device *, void *, void *);
 void	aplpinctrl_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpinctrl_ca = {
+const struct cfattach	aplpinctrl_ca = {
 	sizeof (struct aplpinctrl_softc), aplpinctrl_match, aplpinctrl_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplpmu.c b/sys/arch/arm64/dev/aplpmu.c
index 32794c61ab7..47df97b6dd9 100644
--- a/sys/arch/arm64/dev/aplpmu.c
+++ b/sys/arch/arm64/dev/aplpmu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplpmu.c,v 1.4 2022/03/02 12:35:14 kettenis Exp $	*/
+/*	$OpenBSD: aplpmu.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -74,7 +74,7 @@ struct aplpmu_softc *aplpmu_sc;
 int	aplpmu_match(struct device *, void *, void *);
 void	aplpmu_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplpmu_ca = {
+const struct cfattach	aplpmu_ca = {
 	sizeof (struct aplpmu_softc), aplpmu_match, aplpmu_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplspi.c b/sys/arch/arm64/dev/aplspi.c
index 224a50276c8..248bf28edb9 100644
--- a/sys/arch/arm64/dev/aplspi.c
+++ b/sys/arch/arm64/dev/aplspi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplspi.c,v 1.3 2021/12/11 20:04:37 kettenis Exp $	*/
+/*	$OpenBSD: aplspi.c,v 1.4 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -101,7 +101,7 @@ void	 aplspi_scan(struct aplspi_softc *);
 #define HCLR4(sc, reg, bits)						\
 	HWRITE4((sc), (reg), HREAD4((sc), (reg)) & ~(bits))
 
-struct cfattach aplspi_ca = {
+const struct cfattach aplspi_ca = {
 	sizeof(struct aplspi_softc), aplspi_match, aplspi_attach
 };
 
diff --git a/sys/arch/arm64/dev/aplspmi.c b/sys/arch/arm64/dev/aplspmi.c
index 67854244fc9..f4a31f9c5eb 100644
--- a/sys/arch/arm64/dev/aplspmi.c
+++ b/sys/arch/arm64/dev/aplspmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplspmi.c,v 1.1 2021/05/26 20:52:21 kettenis Exp $	*/
+/*	$OpenBSD: aplspmi.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -61,7 +61,7 @@ struct aplspmi_softc {
 int	aplspmi_match(struct device *, void *, void *);
 void	aplspmi_attach(struct device *, struct device *, void *);
 
-struct cfattach	aplspmi_ca = {
+const struct cfattach	aplspmi_ca = {
 	sizeof (struct aplspmi_softc), aplspmi_match, aplspmi_attach
 };
 
diff --git a/sys/arch/arm64/dev/smmu_acpi.c b/sys/arch/arm64/dev/smmu_acpi.c
index c6b30c4082f..72f888b6a10 100644
--- a/sys/arch/arm64/dev/smmu_acpi.c
+++ b/sys/arch/arm64/dev/smmu_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smmu_acpi.c,v 1.3 2021/06/25 17:41:22 patrick Exp $ */
+/* $OpenBSD: smmu_acpi.c,v 1.4 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -37,7 +37,7 @@ struct smmu_acpi_softc {
 int smmu_acpi_match(struct device *, void *, void *);
 void smmu_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach smmu_acpi_ca = {
+const struct cfattach smmu_acpi_ca = {
 	sizeof(struct smmu_acpi_softc), smmu_acpi_match, smmu_acpi_attach
 };
 
diff --git a/sys/arch/arm64/dev/smmu_fdt.c b/sys/arch/arm64/dev/smmu_fdt.c
index cbf872d5d36..9a0819cda94 100644
--- a/sys/arch/arm64/dev/smmu_fdt.c
+++ b/sys/arch/arm64/dev/smmu_fdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smmu_fdt.c,v 1.4 2021/06/25 17:41:22 patrick Exp $ */
+/* $OpenBSD: smmu_fdt.c,v 1.5 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -44,7 +44,7 @@ void smmu_fdt_attach(struct device *, struct device *, void *);
 bus_dma_tag_t smmu_fdt_map(void *, uint32_t *, bus_dma_tag_t);
 void smmu_fdt_reserve(void *, uint32_t *, bus_addr_t, bus_size_t);
 
-struct cfattach smmu_fdt_ca = {
+const struct cfattach smmu_fdt_ca = {
 	sizeof(struct smmu_fdt_softc), smmu_fdt_match, smmu_fdt_attach
 };
 
diff --git a/sys/arch/armv7/omap/omclock.c b/sys/arch/armv7/omap/omclock.c
index ab93cf278ab..9f37b275c38 100644
--- a/sys/arch/armv7/omap/omclock.c
+++ b/sys/arch/armv7/omap/omclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omclock.c,v 1.1 2020/04/10 22:02:45 kettenis Exp $	*/
+/*	$OpenBSD: omclock.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -56,7 +56,7 @@ struct omclock_softc {
 int	omclock_match(struct device *, void *, void *);
 void	omclock_attach(struct device *, struct device *, void *);
 
-struct cfattach	omclock_ca = {
+const struct cfattach omclock_ca = {
 	sizeof (struct omclock_softc), omclock_match, omclock_attach
 };
 
diff --git a/sys/arch/armv7/omap/omcm.c b/sys/arch/armv7/omap/omcm.c
index c9e1c77e565..6a8c03c82c0 100644
--- a/sys/arch/armv7/omap/omcm.c
+++ b/sys/arch/armv7/omap/omcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omcm.c,v 1.2 2021/03/25 04:12:01 jsg Exp $ */
+/* $OpenBSD: omcm.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -31,7 +31,7 @@ struct omcm_softc {
 int	omcm_match(struct device *, void *, void *);
 void	omcm_attach(struct device *, struct device *, void *);
 
-struct cfattach omcm_ca = {
+const struct cfattach omcm_ca = {
 	sizeof(struct omcm_softc), omcm_match, omcm_attach
 };
 
diff --git a/sys/arch/armv7/omap/omrng.c b/sys/arch/armv7/omap/omrng.c
index 99a8c58a54d..b75a368eb15 100644
--- a/sys/arch/armv7/omap/omrng.c
+++ b/sys/arch/armv7/omap/omrng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: omrng.c,v 1.2 2020/05/29 04:42:23 deraadt Exp $	*/
+/*	$OpenBSD: omrng.c,v 1.3 2022/04/06 18:59:26 naddy Exp $	*/
 /*
  * Copyright (c) 2018, 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -72,7 +72,7 @@ struct omrng_softc {
 int	omrng_match(struct device *, void *, void *);
 void	omrng_attach(struct device *, struct device *, void *);
 
-struct cfattach	omrng_ca = {
+const struct cfattach omrng_ca = {
 	sizeof (struct omrng_softc), omrng_match, omrng_attach
 };
 
diff --git a/sys/arch/armv7/omap/omsysc.c b/sys/arch/armv7/omap/omsysc.c
index 6862659461f..ba97e3face0 100644
--- a/sys/arch/armv7/omap/omsysc.c
+++ b/sys/arch/armv7/omap/omsysc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omsysc.c,v 1.2 2021/03/25 04:12:01 jsg Exp $ */
+/* $OpenBSD: omsysc.c,v 1.3 2022/04/06 18:59:26 naddy Exp $ */
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -33,7 +33,7 @@ struct omsysc_softc {
 int	omsysc_match(struct device *, void *, void *);
 void	omsysc_attach(struct device *, struct device *, void *);
 
-struct cfattach omsysc_ca = {
+const struct cfattach omsysc_ca = {
 	sizeof(struct omsysc_softc), omsysc_match, omsysc_attach
 };
 
diff --git a/sys/arch/landisk/dev/obio.c b/sys/arch/landisk/dev/obio.c
index b5681174e97..f1a396b0f0d 100644
--- a/sys/arch/landisk/dev/obio.c
+++ b/sys/arch/landisk/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obio.c,v 1.9 2014/11/16 12:30:57 deraadt Exp $	*/
+/*	$OpenBSD: obio.c,v 1.10 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: obio.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -52,7 +52,7 @@ void	obio_attach(struct device *, struct device *, void *);
 int	obio_print(void *, const char *);
 int	obio_search(struct device *, void *, void *);
 
-struct cfattach obio_ca = {
+const struct cfattach obio_ca = {
 	sizeof(struct obio_softc), obio_match, obio_attach
 };
 
diff --git a/sys/arch/landisk/dev/power.c b/sys/arch/landisk/dev/power.c
index 2ec1c653bf0..f5fd23664d7 100644
--- a/sys/arch/landisk/dev/power.c
+++ b/sys/arch/landisk/dev/power.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: power.c,v 1.8 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: power.c,v 1.9 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Martin Reindl.
@@ -41,7 +41,7 @@ int	power_match(struct device *, void *, void *);
 void	power_attach(struct device *, struct device *, void *);
 int	power_intr(void *aux);
 
-struct cfattach power_ca = {
+const struct cfattach power_ca = {
 	sizeof(struct power_softc),
 	power_match,
 	power_attach
diff --git a/sys/arch/landisk/dev/wdc_obio.c b/sys/arch/landisk/dev/wdc_obio.c
index e82ca7c6cf3..790bd69f5ee 100644
--- a/sys/arch/landisk/dev/wdc_obio.c
+++ b/sys/arch/landisk/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_obio.c,v 1.4 2011/05/09 22:33:53 matthew Exp $	*/
+/*	$OpenBSD: wdc_obio.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: wdc_obio.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -54,7 +54,7 @@ struct wdc_obio_softc {
 int	wdc_obio_match(struct device *, void *, void *);
 void	wdc_obio_attach(struct device *, struct device *, void *);
 
-struct cfattach wdc_obio_ca = {
+const struct cfattach wdc_obio_ca = {
 	sizeof(struct wdc_obio_softc), wdc_obio_match, wdc_obio_attach
 };
 
diff --git a/sys/arch/landisk/landisk/mainbus.c b/sys/arch/landisk/landisk/mainbus.c
index c34f84516fb..04027342cde 100644
--- a/sys/arch/landisk/landisk/mainbus.c
+++ b/sys/arch/landisk/landisk/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.5 2010/04/21 12:39:39 jasper Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 int mainbus_match(struct device *, void *, void *);
 void mainbus_attach(struct device *, struct device *, void *);
 
-struct cfattach mainbus_ca = {
+const struct cfattach mainbus_ca = {
 	sizeof(struct device), mainbus_match, mainbus_attach
 };
 
diff --git a/sys/arch/loongson/dev/apm.c b/sys/arch/loongson/dev/apm.c
index 2d0fea5dc1d..81c484eb602 100644
--- a/sys/arch/loongson/dev/apm.c
+++ b/sys/arch/loongson/dev/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.39 2020/12/25 12:59:51 visa Exp $	*/
+/*	$OpenBSD: apm.c,v 1.40 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2001 Alexander Guy.  All rights reserved.
@@ -72,7 +72,7 @@ struct apm_softc {
 int apmmatch(struct device *, void *, void *);
 void apmattach(struct device *, struct device *, void *);
 
-struct cfattach apm_ca = {
+const struct cfattach apm_ca = {
 	sizeof(struct apm_softc), apmmatch, apmattach
 };
 
diff --git a/sys/arch/loongson/dev/gdiumiic.c b/sys/arch/loongson/dev/gdiumiic.c
index b8832134549..b247a0e2eed 100644
--- a/sys/arch/loongson/dev/gdiumiic.c
+++ b/sys/arch/loongson/dev/gdiumiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdiumiic.c,v 1.7 2020/09/30 22:23:41 patrick Exp $	*/
+/*	$OpenBSD: gdiumiic.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -78,7 +78,7 @@ int		gdiumiic_bustype(struct gpio_attach_args *);
 void		gdiumiic_sensors_scan(struct device *,
 		    struct i2cbus_attach_args *, void *);
 
-struct cfattach gdiumiic_ca = {
+const struct cfattach gdiumiic_ca = {
 	sizeof(struct gdiumiic_softc),
 	gdiumiic_match,
 	gdiumiic_attach,
diff --git a/sys/arch/loongson/dev/glxclk.c b/sys/arch/loongson/dev/glxclk.c
index 5b8429e0889..c2f1c41ff6c 100644
--- a/sys/arch/loongson/dev/glxclk.c
+++ b/sys/arch/loongson/dev/glxclk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glxclk.c,v 1.5 2015/07/19 21:11:47 jasper Exp $	*/
+/*	$OpenBSD: glxclk.c,v 1.6 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2013 Paul Irofti.
@@ -50,7 +50,7 @@ int	glxclk_intr(void *);
 int	glxclk_stat_intr(void *arg);
 void	glxclk_startclock(struct cpu_info *);
 
-struct cfattach glxclk_ca = {
+const struct cfattach glxclk_ca = {
 	sizeof(struct glxclk_softc), glxclk_match, glxclk_attach,
 };
 
diff --git a/sys/arch/loongson/dev/mcclock_isa.c b/sys/arch/loongson/dev/mcclock_isa.c
index b69a0a446ea..d01430dcf08 100644
--- a/sys/arch/loongson/dev/mcclock_isa.c
+++ b/sys/arch/loongson/dev/mcclock_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcclock_isa.c,v 1.2 2020/05/25 13:16:06 visa Exp $	*/
+/*	$OpenBSD: mcclock_isa.c,v 1.3 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: mcclock_isa.c,v 1.5 1996/12/05 01:39:29 cgd Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ struct mcclock_isa_softc {
 int	mcclock_isa_match(struct device *, void *, void *);
 void	mcclock_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach mcclock_isa_ca = {
+const struct cfattach mcclock_isa_ca = {
 	sizeof (struct mcclock_isa_softc), mcclock_isa_match,
 	    mcclock_isa_attach, 
 };
diff --git a/sys/arch/loongson/dev/ohci_voyager.c b/sys/arch/loongson/dev/ohci_voyager.c
index ee168228ac3..875ecfc5648 100644
--- a/sys/arch/loongson/dev/ohci_voyager.c
+++ b/sys/arch/loongson/dev/ohci_voyager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_voyager.c,v 1.7 2019/01/07 03:41:06 dlg Exp $	*/
+/*	$OpenBSD: ohci_voyager.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 /*	OpenBSD: ohci_pci.c,v 1.33 2008/06/26 05:42:17 ray Exp 	*/
 /*	$NetBSD: ohci_pci.c,v 1.23 2002/10/02 16:51:47 thorpej Exp $	*/
 
@@ -72,7 +72,7 @@ struct ohci_voyager_softc {
 	void 			*sc_ih;
 };
 
-struct cfattach ohci_voyager_ca = {
+const struct cfattach ohci_voyager_ca = {
 	sizeof(struct ohci_voyager_softc),
 	ohci_voyager_match, ohci_voyager_attach, NULL, ohci_activate
 };
diff --git a/sys/arch/luna88k/cbus/i82365_cbus.c b/sys/arch/luna88k/cbus/i82365_cbus.c
index 4d73a057ba6..441fddd2da4 100644
--- a/sys/arch/luna88k/cbus/i82365_cbus.c
+++ b/sys/arch/luna88k/cbus/i82365_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_cbus.c,v 1.6 2019/06/30 00:23:22 aoyama Exp $	*/
+/*	$OpenBSD: i82365_cbus.c,v 1.7 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -112,7 +112,7 @@ struct luna88k_bus_space_tag pcic_cbus_mem_bst = {
 	.bs_flags = TAG_LITTLE_ENDIAN
 };
 
-struct cfattach pcic_cbus_ca = {
+const struct cfattach pcic_cbus_ca = {
 	sizeof(struct pcic_softc), pcic_cbus_probe, pcic_cbus_attach
 };
 
diff --git a/sys/arch/luna88k/cbus/if_ne_cbus.c b/sys/arch/luna88k/cbus/if_ne_cbus.c
index a3e222d2bf1..bd705f26ea4 100644
--- a/sys/arch/luna88k/cbus/if_ne_cbus.c
+++ b/sys/arch/luna88k/cbus/if_ne_cbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_cbus.c,v 1.1 2019/12/30 12:16:12 aoyama Exp $	*/
+/*	$OpenBSD: if_ne_cbus.c,v 1.2 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -104,7 +104,7 @@ struct ne_cbus_softc {
 	void	*sc_ih;				/* interrupt cookie */
 };
 
-struct cfattach ne_cbus_ca = {
+const struct cfattach ne_cbus_ca = {
 	sizeof(struct ne_cbus_softc), ne_cbus_match, ne_cbus_attach
 };
 
diff --git a/sys/arch/luna88k/cbus/necsb.c b/sys/arch/luna88k/cbus/necsb.c
index 34759ccbf88..6fbfbccd793 100644
--- a/sys/arch/luna88k/cbus/necsb.c
+++ b/sys/arch/luna88k/cbus/necsb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: necsb.c,v 1.4 2017/03/16 18:13:43 miod Exp $	*/
+/*	$OpenBSD: necsb.c,v 1.5 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NecBSD: nec86_isa.c,v 1.9 1998/09/26 11:31:11 kmatsuda Exp $	*/
 /*	$NetBSD$	*/
 
@@ -53,7 +53,7 @@
 int	necsb_match(struct device *, void *, void *);
 void	necsb_attach(struct device *, struct device *, void *);
 
-struct cfattach necsb_ca = {
+const struct cfattach necsb_ca = {
 	sizeof(struct nec86_softc), necsb_match, necsb_attach
 };
 
diff --git a/sys/arch/luna88k/dev/spc.c b/sys/arch/luna88k/dev/spc.c
index 30978779150..91113f2ee10 100644
--- a/sys/arch/luna88k/dev/spc.c
+++ b/sys/arch/luna88k/dev/spc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spc.c,v 1.11 2020/02/05 16:29:29 krw Exp $ */
+/* $OpenBSD: spc.c,v 1.12 2022/04/06 18:59:26 naddy Exp $ */
 /* $NetBSD: spc.c,v 1.4 2003/07/05 19:00:17 tsutsui Exp $ */
 
 /*-
@@ -51,7 +51,7 @@
 int  spc_mainbus_match(struct device *, void *, void *);
 void spc_mainbus_attach(struct device *, struct device *, void *);
 
-struct cfattach spc_ca = {
+const struct cfattach spc_ca = {
 	sizeof(struct spc_softc), spc_mainbus_match, spc_mainbus_attach
 };
 
diff --git a/sys/arch/luna88k/dev/timekeeper.c b/sys/arch/luna88k/dev/timekeeper.c
index b08dfe4d287..925d94db866 100644
--- a/sys/arch/luna88k/dev/timekeeper.c
+++ b/sys/arch/luna88k/dev/timekeeper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: timekeeper.c,v 1.10 2017/11/03 06:54:06 aoyama Exp $ */
+/* $OpenBSD: timekeeper.c,v 1.11 2022/04/06 18:59:26 naddy Exp $ */
 /* $NetBSD: timekeeper.c,v 1.1 2000/01/05 08:48:56 nisimura Exp $ */
 
 /*-
@@ -64,7 +64,7 @@ struct timekeeper_softc {
 int  clock_match(struct device *, void *, void *);
 void clock_attach(struct device *, struct device *, void *);
 
-struct cfattach clock_ca = {
+const struct cfattach clock_ca = {
 	sizeof (struct timekeeper_softc), clock_match, clock_attach
 };
 
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 0f384ba3f08..a4175ee8739 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.32 2022/02/22 01:15:01 guenther Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.33 2022/04/06 18:59:26 naddy Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -298,7 +298,7 @@ struct mc_softc {
 int	mc_match(struct device *, void *, void *);
 void	mc_attach(struct device *, struct device *, void *);
 
-struct  cfattach mc_ca = {
+const struct cfattach mc_ca = {
 	sizeof(struct mc_softc), mc_match, mc_attach
 };
 
diff --git a/sys/arch/mips64/mips64/clock.c b/sys/arch/mips64/mips64/clock.c
index 05ca4fce5e0..796b45514c1 100644
--- a/sys/arch/mips64/mips64/clock.c
+++ b/sys/arch/mips64/mips64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.44 2021/05/01 16:11:11 visa Exp $ */
+/*	$OpenBSD: clock.c,v 1.45 2022/04/06 18:59:26 naddy Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -55,7 +55,7 @@ struct cfdriver clock_cd = {
 	NULL, "clock", DV_DULL
 };
 
-struct cfattach clock_ca = {
+const struct cfattach clock_ca = {
 	sizeof(struct device), clockmatch, clockattach
 };
 
diff --git a/sys/arch/mips64/mips64/cpu.c b/sys/arch/mips64/mips64/cpu.c
index 60387228fa9..83f75fb8c4d 100644
--- a/sys/arch/mips64/mips64/cpu.c
+++ b/sys/arch/mips64/mips64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.81 2021/11/26 14:45:13 jsg Exp $ */
+/*	$OpenBSD: cpu.c,v 1.82 2022/04/06 18:59:26 naddy Exp $ */
 
 /*
  * Copyright (c) 1997-2004 Opsycon AB (www.opsycon.se)
@@ -54,7 +54,7 @@ vaddr_t	cache_valias_mask;
 int	cpu_has_synced_cp0_count;
 int	cpu_has_userlocal;
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpumatch, cpuattach
 };
 struct cfdriver cpu_cd = {
diff --git a/sys/arch/octeon/dev/amdcf.c b/sys/arch/octeon/dev/amdcf.c
index 48314d581fa..f3053f19d9a 100644
--- a/sys/arch/octeon/dev/amdcf.c
+++ b/sys/arch/octeon/dev/amdcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdcf.c,v 1.7 2021/01/30 14:59:13 visa Exp $	*/
+/*	$OpenBSD: amdcf.c,v 1.8 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007, Juniper Networks, Inc.
@@ -173,7 +173,7 @@ int	amdcf_match(struct device *, void *, void *);
 void	amdcf_attach(struct device *, struct device *, void *);
 int	amdcf_detach(struct device *, int);
 
-struct cfattach amdcf_ca = {
+const struct cfattach amdcf_ca = {
 	sizeof(struct amdcf_softc), amdcf_match, amdcf_attach, amdcf_detach
 };
 
diff --git a/sys/arch/octeon/dev/cn30xxgmx.c b/sys/arch/octeon/dev/cn30xxgmx.c
index a59f0effc49..4c28f634e11 100644
--- a/sys/arch/octeon/dev/cn30xxgmx.c
+++ b/sys/arch/octeon/dev/cn30xxgmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxgmx.c,v 1.51 2021/03/11 11:16:59 jsg Exp $	*/
+/*	$OpenBSD: cn30xxgmx.c,v 1.52 2022/04/06 18:59:26 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -153,7 +153,7 @@ struct cn30xxgmx_port_ops *cn30xxgmx_port_ops[] = {
 	[GMX_AGL_PORT] = &cn30xxgmx_port_ops_agl,
 };
 
-struct cfattach octgmx_ca = {sizeof(struct cn30xxgmx_softc),
+const struct cfattach octgmx_ca = {sizeof(struct cn30xxgmx_softc),
     cn30xxgmx_match, cn30xxgmx_attach, NULL, NULL};
 
 struct cfdriver octgmx_cd = {NULL, "octgmx", DV_DULL};
diff --git a/sys/arch/octeon/dev/cn30xxuart.c b/sys/arch/octeon/dev/cn30xxuart.c
index 7e258b2ec1e..c1a32ba92df 100644
--- a/sys/arch/octeon/dev/cn30xxuart.c
+++ b/sys/arch/octeon/dev/cn30xxuart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxuart.c,v 1.12 2019/09/28 22:20:25 deraadt Exp $	*/
+/*	$OpenBSD: cn30xxuart.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -54,7 +54,7 @@ int	cn30xxuart_probe(struct device *, void *, void *);
 void	cn30xxuart_attach(struct device *, struct device *, void *);
 int	cn30xxuart_intr(void *);
 
-struct cfattach octuart_ca = {
+const struct cfattach octuart_ca = {
 	sizeof(struct com_softc), cn30xxuart_probe, cn30xxuart_attach
 };
 
diff --git a/sys/arch/octeon/dev/octcf.c b/sys/arch/octeon/dev/octcf.c
index cd8ac8bb5fb..de167f8b5ae 100644
--- a/sys/arch/octeon/dev/octcf.c
+++ b/sys/arch/octeon/dev/octcf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octcf.c,v 1.33 2021/03/11 11:16:59 jsg Exp $ */
+/*	$OpenBSD: octcf.c,v 1.34 2022/04/06 18:59:27 naddy Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -125,7 +125,7 @@ int	octcfdetach(struct device *, int);
 int	octcfactivate(struct device *, int);
 int	octcfprint(void *, char *);
 
-struct cfattach octcf_ca = {
+const struct cfattach octcf_ca = {
 	sizeof(struct octcf_softc), octcfprobe, octcfattach,
 	octcfdetach, octcfactivate
 };
diff --git a/sys/arch/octeon/dev/octeon_iobus.c b/sys/arch/octeon/dev/octeon_iobus.c
index 0a3e42c6cd8..00ade446394 100644
--- a/sys/arch/octeon/dev/octeon_iobus.c
+++ b/sys/arch/octeon/dev/octeon_iobus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeon_iobus.c,v 1.25 2019/09/15 07:15:14 visa Exp $ */
+/*	$OpenBSD: octeon_iobus.c,v 1.26 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -89,7 +89,7 @@ void	 iobus_write_raw_8(bus_space_tag_t, bus_space_handle_t, bus_addr_t,
 bus_addr_t iobus_pa_to_device(paddr_t);
 paddr_t	 iobus_device_to_pa(bus_addr_t);
 
-struct cfattach iobus_ca = {
+const struct cfattach iobus_ca = {
 	sizeof(struct device), iobusmatch, iobusattach
 };
 
diff --git a/sys/arch/octeon/dev/octrng.c b/sys/arch/octeon/dev/octrng.c
index 9ed86f26833..490f9f09134 100644
--- a/sys/arch/octeon/dev/octrng.c
+++ b/sys/arch/octeon/dev/octrng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrng.c,v 1.9 2020/05/29 04:42:24 deraadt Exp $	*/
+/*	$OpenBSD: octrng.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2013 Paul Irofti <paul@irofti.net>
  *
@@ -57,7 +57,7 @@ struct octrng_softc {
 	bus_space_handle_t sc_ioh;
 };
 
-struct cfattach octrng_ca = {
+const struct cfattach octrng_ca = {
 	sizeof(struct octrng_softc), octrng_match, octrng_attach
 };
 
diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c
index ecb28194147..e23b6ad3cc3 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrtc.c,v 1.13 2021/01/30 14:59:13 visa Exp $	*/
+/*	$OpenBSD: octrtc.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2013, 2014 Paul Irofti.
@@ -56,7 +56,7 @@ int	octrtc_settime(struct todr_chip_handle *, struct timeval *);
 int	octrtc_write(uint8_t);
 
 
-struct cfattach octrtc_ca = {
+const struct cfattach octrtc_ca = {
 	sizeof(struct octrtc_softc), octrtc_match, octrtc_attach,
 };
 
diff --git a/sys/arch/powerpc64/dev/astfb.c b/sys/arch/powerpc64/dev/astfb.c
index 0b193f4e82d..398b9288ad7 100644
--- a/sys/arch/powerpc64/dev/astfb.c
+++ b/sys/arch/powerpc64/dev/astfb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: astfb.c,v 1.3 2020/10/30 13:36:45 kettenis Exp $	*/
+/*	$OpenBSD: astfb.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis.
@@ -70,7 +70,7 @@ struct wsdisplay_accessops astfb_accessops = {
 int	astfb_match(struct device *, void *, void *);
 void	astfb_attach(struct device *, struct device *, void *);
 
-struct cfattach astfb_ca = {
+const struct cfattach astfb_ca = {
 	sizeof(struct astfb_softc), astfb_match, astfb_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/ipmi_opal.c b/sys/arch/powerpc64/dev/ipmi_opal.c
index 25efc894fe6..d5449be20aa 100644
--- a/sys/arch/powerpc64/dev/ipmi_opal.c
+++ b/sys/arch/powerpc64/dev/ipmi_opal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_opal.c,v 1.2 2022/02/22 13:34:23 visa Exp $	*/
+/*	$OpenBSD: ipmi_opal.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -60,7 +60,7 @@ struct ipmi_if opal_if = {
 int	ipmi_opal_match(struct device *, void *, void *);
 void	ipmi_opal_attach(struct device *, struct device *, void *);
 
-struct cfattach ipmi_opal_ca = {
+const struct cfattach ipmi_opal_ca = {
 	sizeof (struct ipmi_opal_softc), ipmi_opal_match, ipmi_opal_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/mainbus.c b/sys/arch/powerpc64/dev/mainbus.c
index 211d3e1a480..d3ac571f4c0 100644
--- a/sys/arch/powerpc64/dev/mainbus.c
+++ b/sys/arch/powerpc64/dev/mainbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mainbus.c,v 1.5 2020/08/26 03:29:06 visa Exp $ */
+/* $OpenBSD: mainbus.c,v 1.6 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -50,7 +50,7 @@ struct mainbus_softc {
 	int			 sc_early_nodes[64];
 };
 
-struct cfattach mainbus_ca = {
+const struct cfattach mainbus_ca = {
 	sizeof(struct mainbus_softc), mainbus_match, mainbus_attach, NULL,
 	config_activate_children
 };
diff --git a/sys/arch/powerpc64/dev/opal.c b/sys/arch/powerpc64/dev/opal.c
index 78c636407c8..10418d13572 100644
--- a/sys/arch/powerpc64/dev/opal.c
+++ b/sys/arch/powerpc64/dev/opal.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opal.c,v 1.12 2021/01/23 12:10:08 kettenis Exp $	*/
+/*	$OpenBSD: opal.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -64,7 +64,7 @@ struct opal_softc *opal_sc;
 int	opal_match(struct device *, void *, void *);
 void	opal_attach(struct device *, struct device *, void *);
 
-struct cfattach	opal_ca = {
+const struct cfattach opal_ca = {
 	sizeof (struct opal_softc), opal_match, opal_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/opalcons.c b/sys/arch/powerpc64/dev/opalcons.c
index ce628f75cd7..7dc5ca9eb42 100644
--- a/sys/arch/powerpc64/dev/opalcons.c
+++ b/sys/arch/powerpc64/dev/opalcons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opalcons.c,v 1.3 2020/10/30 13:26:29 kettenis Exp $	*/
+/*	$OpenBSD: opalcons.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -43,7 +43,7 @@ struct opalcons_softc {
 int	opalcons_match(struct device *, void *, void *);
 void	opalcons_attach(struct device *, struct device *, void *);
 
-struct cfattach	opalcons_ca = {
+const struct cfattach opalcons_ca = {
 	sizeof (struct opalcons_softc), opalcons_match, opalcons_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/opalsens.c b/sys/arch/powerpc64/dev/opalsens.c
index 0e84b57a5d1..b5215612b39 100644
--- a/sys/arch/powerpc64/dev/opalsens.c
+++ b/sys/arch/powerpc64/dev/opalsens.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opalsens.c,v 1.2 2020/07/15 07:15:00 kettenis Exp $	*/
+/*	$OpenBSD: opalsens.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -37,7 +37,7 @@ struct opalsens_softc {
 int	opalsens_match(struct device *, void *, void *);
 void	opalsens_attach(struct device *, struct device *, void *);
 
-struct cfattach	opalsens_ca = {
+const struct cfattach opalsens_ca = {
 	sizeof (struct opalsens_softc), opalsens_match, opalsens_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/phb.c b/sys/arch/powerpc64/dev/phb.c
index 8ab39523631..3fc145e015a 100644
--- a/sys/arch/powerpc64/dev/phb.c
+++ b/sys/arch/powerpc64/dev/phb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: phb.c,v 1.22 2022/02/21 11:15:09 jsg Exp $	*/
+/*	$OpenBSD: phb.c,v 1.23 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -100,7 +100,7 @@ void	phb_dmamem_free(bus_dma_tag_t, struct phb_dmamem *);
 int	phb_match(struct device *, void *, void *);
 void	phb_attach(struct device *, struct device *, void *);
 
-struct cfattach	phb_ca = {
+const struct cfattach phb_ca = {
 	sizeof (struct phb_softc), phb_match, phb_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xicp.c b/sys/arch/powerpc64/dev/xicp.c
index dd7ed80bf9b..92a97ebbdc6 100644
--- a/sys/arch/powerpc64/dev/xicp.c
+++ b/sys/arch/powerpc64/dev/xicp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xicp.c,v 1.4 2020/10/01 10:05:09 jsg Exp $	*/
+/*	$OpenBSD: xicp.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -88,7 +88,7 @@ xicp_write_4(struct xicp_softc *sc, bus_size_t off, uint32_t val)
 int	xicp_match(struct device *, void *, void *);
 void	xicp_attach(struct device *, struct device *, void *);
 
-struct cfattach	xicp_ca = {
+const struct cfattach xicp_ca = {
 	sizeof (struct xicp_softc), xicp_match, xicp_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xics.c b/sys/arch/powerpc64/dev/xics.c
index 9483b666137..2cc202e5abc 100644
--- a/sys/arch/powerpc64/dev/xics.c
+++ b/sys/arch/powerpc64/dev/xics.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xics.c,v 1.3 2020/09/21 11:14:28 kettenis Exp $	*/
+/*	$OpenBSD: xics.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -38,7 +38,7 @@ struct xics_softc {
 int	xics_match(struct device *, void *, void *);
 void	xics_attach(struct device *, struct device *, void *);
 
-struct cfattach	xics_ca = {
+const struct cfattach xics_ca = {
 	sizeof (struct xics_softc), xics_match, xics_attach
 };
 
diff --git a/sys/arch/powerpc64/dev/xive.c b/sys/arch/powerpc64/dev/xive.c
index 5955392c4f2..a6e6a0ae1ee 100644
--- a/sys/arch/powerpc64/dev/xive.c
+++ b/sys/arch/powerpc64/dev/xive.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xive.c,v 1.16 2021/06/02 19:38:14 kettenis Exp $	*/
+/*	$OpenBSD: xive.c,v 1.17 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -140,7 +140,7 @@ int	xive_match(struct device *, void *, void *);
 void	xive_attach(struct device *, struct device *, void *);
 int	xive_activate(struct device *, int);
 
-struct cfattach	xive_ca = {
+const struct cfattach xive_ca = {
 	sizeof (struct xive_softc), xive_match, xive_attach, NULL,
 	xive_activate
 };
diff --git a/sys/arch/powerpc64/powerpc64/cpu.c b/sys/arch/powerpc64/powerpc64/cpu.c
index 66a882214d0..bffdb01ba79 100644
--- a/sys/arch/powerpc64/powerpc64/cpu.c
+++ b/sys/arch/powerpc64/powerpc64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.23 2021/08/01 17:42:56 kettenis Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.24 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
@@ -72,7 +72,7 @@ void	cpu_darn(void *);
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };
 
diff --git a/sys/arch/riscv64/dev/plic.c b/sys/arch/riscv64/dev/plic.c
index a9f53b5b622..6a863fedba3 100644
--- a/sys/arch/riscv64/dev/plic.c
+++ b/sys/arch/riscv64/dev/plic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: plic.c,v 1.9 2022/01/18 07:44:37 visa Exp $	*/
+/*	$OpenBSD: plic.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -133,7 +133,7 @@ void	plic_intr_enable_with_pri(int, uint32_t, int);
 void	plic_intr_disable(int, int);
 
 
-struct cfattach plic_ca = {
+const struct cfattach plic_ca = {
 	sizeof(struct plic_softc), plic_match, plic_attach,
 };
 
diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.c b/sys/arch/riscv64/dev/riscv_cpu_intc.c
index dcf4b51ba7e..c54133f7f81 100644
--- a/sys/arch/riscv64/dev/riscv_cpu_intc.c
+++ b/sys/arch/riscv64/dev/riscv_cpu_intc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: riscv_cpu_intc.c,v 1.9 2021/06/29 21:27:52 kettenis Exp $	*/
+/*	$OpenBSD: riscv_cpu_intc.c,v 1.10 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020, Mars Li <mengshi.li.mars@gmail.com>
@@ -47,7 +47,7 @@ void	*riscv_intc_intr_establish(int, int, int (*)(void *),
 void	riscv_intc_intr_disestablish(void *);
 
 
-struct cfattach intc_ca = {
+const struct cfattach intc_ca = {
 	sizeof (struct device), riscv_intc_match, riscv_intc_attach
 };
 
diff --git a/sys/arch/riscv64/dev/sfclock.c b/sys/arch/riscv64/dev/sfclock.c
index 9d9feb419bf..ba6c1b81a2e 100644
--- a/sys/arch/riscv64/dev/sfclock.c
+++ b/sys/arch/riscv64/dev/sfclock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfclock.c,v 1.1 2021/06/17 16:10:50 kettenis Exp $	*/
+/*	$OpenBSD: sfclock.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -69,7 +69,7 @@ struct sfclock_softc {
 int	sfclock_match(struct device *, void *, void *);
 void	sfclock_attach(struct device *, struct device *, void *);
 
-struct cfattach	sfclock_ca = {
+const struct cfattach sfclock_ca = {
 	sizeof (struct sfclock_softc), sfclock_match, sfclock_attach
 };
 
diff --git a/sys/arch/riscv64/dev/sfuart.c b/sys/arch/riscv64/dev/sfuart.c
index f048ae88f69..5598a28159f 100644
--- a/sys/arch/riscv64/dev/sfuart.c
+++ b/sys/arch/riscv64/dev/sfuart.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sfuart.c,v 1.4 2021/08/31 12:24:15 jan Exp $	*/
+/*	$OpenBSD: sfuart.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -101,7 +101,7 @@ struct cfdriver sfuart_cd = {
 	NULL, "sfuart", DV_TTY
 };
 
-struct cfattach sfuart_ca = {
+const struct cfattach sfuart_ca = {
 	sizeof(struct sfuart_softc), sfuart_match, sfuart_attach
 };
 
diff --git a/sys/arch/riscv64/dev/simplebus.c b/sys/arch/riscv64/dev/simplebus.c
index 586accd1865..6325af6233e 100644
--- a/sys/arch/riscv64/dev/simplebus.c
+++ b/sys/arch/riscv64/dev/simplebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: simplebus.c,v 1.4 2021/05/14 06:48:52 jsg Exp $	*/
+/*	$OpenBSD: simplebus.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se>
@@ -36,7 +36,7 @@ int simplebus_bs_map(bus_space_tag_t, bus_addr_t, bus_size_t, int,
 int simplebus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
     bus_size_t, struct proc *, int, paddr_t *, int *, int);
 
-struct cfattach simplebus_ca = {
+const struct cfattach simplebus_ca = {
 	sizeof(struct simplebus_softc), simplebus_match, simplebus_attach
 };
 
diff --git a/sys/arch/riscv64/riscv64/cpu.c b/sys/arch/riscv64/riscv64/cpu.c
index ba29139cdc0..4996f3a25fa 100644
--- a/sys/arch/riscv64/riscv64/cpu.c
+++ b/sys/arch/riscv64/riscv64/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.12 2021/11/26 14:45:13 jsg Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.13 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2016 Dale Rahn <drahn@dalerahn.com>
@@ -74,7 +74,7 @@ struct cpu_info *cpu_info_list = &cpu_info_primary;
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };
 
diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c
index e7cb52db5c8..14e1254341d 100644
--- a/sys/arch/sh/dev/scif.c
+++ b/sys/arch/sh/dev/scif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scif.c,v 1.20 2021/01/01 10:21:26 jan Exp $	*/
+/*	$OpenBSD: scif.c,v 1.21 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
 
 /*-
@@ -225,7 +225,7 @@ unsigned int scifcn_speed = 9600;
 
 u_int scif_rbuf_size = SCIF_RING_SIZE;
 
-struct cfattach scif_ca = {
+const struct cfattach scif_ca = {
 	sizeof(struct scif_softc), scif_match, scif_attach
 };
 
diff --git a/sys/arch/sh/dev/shb.c b/sys/arch/sh/dev/shb.c
index c57a55f23a8..2e58a7b1b86 100644
--- a/sys/arch/sh/dev/shb.c
+++ b/sys/arch/sh/dev/shb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shb.c,v 1.2 2008/06/26 05:42:12 ray Exp $	*/
+/*	$OpenBSD: shb.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: shb.c,v 1.10 2005/12/11 12:18:58 christos Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@ void shb_attach(struct device *, struct device *, void *);
 int shb_print(void *, const char *);
 int shb_search(struct device *, void *, void *);
 
-struct cfattach shb_ca = {
+const struct cfattach shb_ca = {
 	sizeof(struct device), shb_match, shb_attach
 };
 
diff --git a/sys/arch/sh/dev/shpcic.c b/sys/arch/sh/dev/shpcic.c
index 7b3ca89a38d..23ea35e1661 100644
--- a/sys/arch/sh/dev/shpcic.c
+++ b/sys/arch/sh/dev/shpcic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: shpcic.c,v 1.13 2017/06/22 11:34:51 tom Exp $	*/
+/*	$OpenBSD: shpcic.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: shpcic.c,v 1.10 2005/12/24 20:07:32 perry Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ static const struct shpcic_product {
 int	shpcic_match(struct device *, void *, void *);
 void	shpcic_attach(struct device *, struct device *, void *);
 
-struct cfattach shpcic_ca = {
+const struct cfattach shpcic_ca = {
 	sizeof(struct shpcic_softc), shpcic_match, shpcic_attach
 };
 
diff --git a/sys/arch/sh/sh/cpu.c b/sys/arch/sh/sh/cpu.c
index 680b2cb040f..e814c1b5186 100644
--- a/sys/arch/sh/sh/cpu.c
+++ b/sys/arch/sh/sh/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.5 2020/09/25 14:42:25 deraadt Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.6 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cpu.c,v 1.8 2006/01/02 23:16:20 uwe Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 int	cpu_match(struct device *, void *, void *);
 void	cpu_attach(struct device *, struct device *, void *);
 
-struct cfattach cpu_ca = {
+const struct cfattach cpu_ca = {
 	sizeof(struct device), cpu_match, cpu_attach
 };
 
diff --git a/sys/dev/acpi/abl.c b/sys/dev/acpi/abl.c
index 73341d144b2..adb49b4bc7e 100644
--- a/sys/dev/acpi/abl.c
+++ b/sys/dev/acpi/abl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abl.c,v 1.4 2022/01/09 05:42:37 jsg Exp $ */
+/*	$OpenBSD: abl.c,v 1.5 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2020 Marcus Glocker <mglocker@openbsd.org>
@@ -69,7 +69,7 @@ int	abl_set_brightness(struct abl_softc *, uint8_t);
 int	abl_get_param(struct wsdisplay_param *);
 int	abl_set_param(struct wsdisplay_param *);
 
-struct cfattach abl_ca = {
+const struct cfattach abl_ca = {
 	sizeof(struct abl_softc), abl_match, abl_attach, NULL, NULL
 };
 
diff --git a/sys/dev/acpi/acpiac.c b/sys/dev/acpi/acpiac.c
index 12e80b01b3e..afec424014b 100644
--- a/sys/dev/acpi/acpiac.c
+++ b/sys/dev/acpi/acpiac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiac.c,v 1.35 2022/03/21 13:38:34 kettenis Exp $ */
+/* $OpenBSD: acpiac.c,v 1.36 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -39,7 +39,7 @@ int  acpiac_notify(struct aml_node *, int, void *);
 void acpiac_refresh(void *);
 int acpiac_getpsr(struct acpiac_softc *);
 
-struct cfattach acpiac_ca = {
+const struct cfattach acpiac_ca = {
 	sizeof(struct acpiac_softc),
 	acpiac_match,
 	acpiac_attach,
diff --git a/sys/dev/acpi/acpiasus.c b/sys/dev/acpi/acpiasus.c
index d41ce4f6bea..77e6d9b289f 100644
--- a/sys/dev/acpi/acpiasus.c
+++ b/sys/dev/acpi/acpiasus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiasus.c,v 1.19 2018/07/01 19:40:49 mlarkin Exp $ */
+/* $OpenBSD: acpiasus.c,v 1.20 2022/04/06 18:59:27 naddy Exp $ */
 /* $NetBSD: asus_acpi.c,v 1.2.2.2 2008/04/03 12:42:37 mjf Exp $ */
 /*
  * Copyright (c) 2007, 2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -86,7 +86,7 @@ int	acpiasus_activate(struct device *, int);
 extern int wskbd_set_mixervolume(long, long);
 #endif
 
-struct cfattach acpiasus_ca = {
+const struct cfattach acpiasus_ca = {
 	sizeof(struct acpiasus_softc), acpiasus_match, acpiasus_attach,
 	NULL, acpiasus_activate
 };
diff --git a/sys/dev/acpi/acpibat.c b/sys/dev/acpi/acpibat.c
index 751278c0cd8..e880ccd45fa 100644
--- a/sys/dev/acpi/acpibat.c
+++ b/sys/dev/acpi/acpibat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibat.c,v 1.69 2022/02/09 16:10:05 dv Exp $ */
+/* $OpenBSD: acpibat.c,v 1.70 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -33,7 +33,7 @@ int	acpibat_match(struct device *, void *, void *);
 void	acpibat_attach(struct device *, struct device *, void *);
 int	acpibat_activate(struct device *, int);
 
-struct cfattach acpibat_ca = {
+const struct cfattach acpibat_ca = {
 	sizeof(struct acpibat_softc),
 	acpibat_match,
 	acpibat_attach,
diff --git a/sys/dev/acpi/acpibtn.c b/sys/dev/acpi/acpibtn.c
index 1728f1c5fd3..d9254850c8e 100644
--- a/sys/dev/acpi/acpibtn.c
+++ b/sys/dev/acpi/acpibtn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpibtn.c,v 1.48 2022/02/08 17:25:12 deraadt Exp $ */
+/* $OpenBSD: acpibtn.c,v 1.49 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  *
@@ -65,7 +65,7 @@ struct acpi_lid {
 SLIST_HEAD(acpi_lid_head, acpi_lid) acpibtn_lids =
     SLIST_HEAD_INITIALIZER(acpibtn_lids);
 
-struct cfattach acpibtn_ca = {
+const struct cfattach acpibtn_ca = {
 	sizeof(struct acpibtn_softc), acpibtn_match, acpibtn_attach, NULL,
 	acpibtn_activate
 };
diff --git a/sys/dev/acpi/acpicbkbd.c b/sys/dev/acpi/acpicbkbd.c
index af0a1b8b6ec..52332a3a4e3 100644
--- a/sys/dev/acpi/acpicbkbd.c
+++ b/sys/dev/acpi/acpicbkbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicbkbd.c,v 1.2 2016/07/27 02:26:26 jcs Exp $ */
+/* $OpenBSD: acpicbkbd.c,v 1.3 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2016 joshua stein <jcs@openbsd.org>
  *
@@ -52,7 +52,7 @@ void	acpicbkbd_write_backlight(void *, int);
 extern int (*wskbd_get_backlight)(struct wskbd_backlight *);
 extern int (*wskbd_set_backlight)(struct wskbd_backlight *);
 
-struct cfattach acpicbkbd_ca = {
+const struct cfattach acpicbkbd_ca = {
 	sizeof(struct acpicbkbd_softc),
 	acpicbkbd_match,
 	acpicbkbd_attach,
diff --git a/sys/dev/acpi/acpicmos.c b/sys/dev/acpi/acpicmos.c
index 0b1a2cf9509..6e424e26530 100644
--- a/sys/dev/acpi/acpicmos.c
+++ b/sys/dev/acpi/acpicmos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpicmos.c,v 1.1 2018/03/27 21:11:16 kettenis Exp $	*/
+/*	$OpenBSD: acpicmos.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -32,7 +32,7 @@ struct acpicmos_softc {
 int	acpicmos_match(struct device *, void *, void *);
 void	acpicmos_attach(struct device *, struct device *, void *);
 
-struct cfattach acpicmos_ca = {
+const struct cfattach acpicmos_ca = {
 	sizeof(struct acpicmos_softc), acpicmos_match, acpicmos_attach
 };
 
diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c
index a46014dc9b2..0a5ee1fea7d 100644
--- a/sys/dev/acpi/acpicpu.c
+++ b/sys/dev/acpi/acpicpu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpicpu.c,v 1.91 2022/01/09 05:42:37 jsg Exp $ */
+/* $OpenBSD: acpicpu.c,v 1.92 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
  * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
@@ -178,7 +178,7 @@ void    acpicpu_set_throttle(struct acpicpu_softc *, int);
 struct acpi_cstate *acpicpu_find_cstate(struct acpicpu_softc *, int);
 #endif
 
-struct cfattach acpicpu_ca = {
+const struct cfattach acpicpu_ca = {
 	sizeof(struct acpicpu_softc), acpicpu_match, acpicpu_attach
 };
 
diff --git a/sys/dev/acpi/acpidmar.c b/sys/dev/acpi/acpidmar.c
index dec82964168..b075645039d 100644
--- a/sys/dev/acpi/acpidmar.c
+++ b/sys/dev/acpi/acpidmar.c
@@ -260,7 +260,7 @@ int		acpidmar_match(struct device *, void *, void *);
 void		acpidmar_attach(struct device *, struct device *, void *);
 struct domain	*acpidmar_pci_attach(struct acpidmar_softc *, int, int, int);
 
-struct cfattach acpidmar_ca = {
+const struct cfattach acpidmar_ca = {
 	sizeof(struct acpidmar_softc), acpidmar_match, acpidmar_attach, NULL,
 	acpidmar_activate
 };
diff --git a/sys/dev/acpi/acpidock.c b/sys/dev/acpi/acpidock.c
index f2823498268..ff0f5c74745 100644
--- a/sys/dev/acpi/acpidock.c
+++ b/sys/dev/acpi/acpidock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpidock.c,v 1.44 2015/03/14 03:38:46 jsg Exp $ */
+/* $OpenBSD: acpidock.c,v 1.45 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2006,2007 Michael Knudsen <mk@openbsd.org>
  *
@@ -36,7 +36,7 @@ struct aml_nodelist {
 int	acpidock_match(struct device *, void *, void *);
 void	acpidock_attach(struct device *, struct device *, void *);
 
-struct cfattach acpidock_ca = {
+const struct cfattach acpidock_ca = {
 	sizeof(struct acpidock_softc), acpidock_match, acpidock_attach
 };
 
diff --git a/sys/dev/acpi/acpiec.c b/sys/dev/acpi/acpiec.c
index 3d4c0902c05..9923f950ade 100644
--- a/sys/dev/acpi/acpiec.c
+++ b/sys/dev/acpi/acpiec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiec.c,v 1.63 2021/02/23 00:03:01 jsg Exp $ */
+/* $OpenBSD: acpiec.c,v 1.64 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -74,7 +74,7 @@ int		acpiec_gpehandler(struct acpi_softc *, int, void *);
 
 int	acpiec_reg(struct acpiec_softc *);
 
-struct cfattach acpiec_ca = {
+const struct cfattach acpiec_ca = {
 	sizeof(struct acpiec_softc), acpiec_match, acpiec_attach
 };
 
diff --git a/sys/dev/acpi/acpige.c b/sys/dev/acpi/acpige.c
index 1606f1db55c..2b0aa0a9ad7 100644
--- a/sys/dev/acpi/acpige.c
+++ b/sys/dev/acpi/acpige.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpige.c,v 1.1 2020/11/15 18:04:10 patrick Exp $	*/
+/*	$OpenBSD: acpige.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -46,7 +46,7 @@ void	acpige_attach(struct device *, struct device *, void *);
 int	acpige_intr(void *);
 void	acpige_event_task(void *, int);
 
-struct cfattach acpige_ca = {
+const struct cfattach acpige_ca = {
 	sizeof(struct acpige_softc), acpige_match, acpige_attach
 };
 
diff --git a/sys/dev/acpi/acpihid.c b/sys/dev/acpi/acpihid.c
index 5e622b06ac3..b1482c19b38 100644
--- a/sys/dev/acpi/acpihid.c
+++ b/sys/dev/acpi/acpihid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpihid.c,v 1.2 2020/06/02 19:26:36 jcs Exp $ */
+/* $OpenBSD: acpihid.c,v 1.3 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * ACPI HID event and 5-button array driver
  *
@@ -127,7 +127,7 @@ extern int wskbd_set_mixervolume(long, long);
 
 extern int pwr_action;
 
-struct cfattach acpihid_ca = {
+const struct cfattach acpihid_ca = {
 	sizeof(struct acpihid_softc),
 	acpihid_match,
 	acpihid_attach,
diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c
index 06de15380ca..b917edbcd2b 100644
--- a/sys/dev/acpi/acpihpet.c
+++ b/sys/dev/acpi/acpihpet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpihpet.c,v 1.25 2021/02/23 04:44:31 cheloha Exp $ */
+/* $OpenBSD: acpihpet.c,v 1.26 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -72,7 +72,7 @@ struct acpihpet_softc {
 	struct hpet_regs	sc_save;
 };
 
-struct cfattach acpihpet_ca = {
+const struct cfattach acpihpet_ca = {
 	sizeof(struct acpihpet_softc), acpihpet_match, acpihpet_attach,
 	NULL, acpihpet_activate
 };
diff --git a/sys/dev/acpi/acpihve.c b/sys/dev/acpi/acpihve.c
index 1b89c04e1df..44e170d765d 100644
--- a/sys/dev/acpi/acpihve.c
+++ b/sys/dev/acpi/acpihve.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpihve.c,v 1.3 2020/05/29 04:42:24 deraadt Exp $	*/
+/*	$OpenBSD: acpihve.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2017 Jonathan Gray <jsg@openbsd.org>
@@ -35,7 +35,7 @@ struct acpihve_softc {
 	struct device			sc_dev;
 };
 
-struct cfattach acpihve_ca = {
+const struct cfattach acpihve_ca = {
 	sizeof(struct acpihve_softc), acpihve_match, acpihve_attach
 };
 
diff --git a/sys/dev/acpi/acpimadt.c b/sys/dev/acpi/acpimadt.c
index 2ff559c7287..9d09935a4d3 100644
--- a/sys/dev/acpi/acpimadt.c
+++ b/sys/dev/acpi/acpimadt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpimadt.c,v 1.37 2018/06/29 17:39:18 kettenis Exp $ */
+/* $OpenBSD: acpimadt.c,v 1.38 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -43,7 +43,7 @@
 int acpimadt_match(struct device *, void *, void *);
 void acpimadt_attach(struct device *, struct device *, void *);
 
-struct cfattach acpimadt_ca = {
+const struct cfattach acpimadt_ca = {
 	sizeof(struct device), acpimadt_match, acpimadt_attach
 };
 
diff --git a/sys/dev/acpi/acpimcfg.c b/sys/dev/acpi/acpimcfg.c
index 2370c3b8b09..f3e520882aa 100644
--- a/sys/dev/acpi/acpimcfg.c
+++ b/sys/dev/acpi/acpimcfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpimcfg.c,v 1.4 2018/08/19 08:23:47 kettenis Exp $ */
+/* $OpenBSD: acpimcfg.c,v 1.5 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2010 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -26,7 +26,7 @@
 int acpimcfg_match(struct device *, void *, void *);
 void acpimcfg_attach(struct device *, struct device *, void *);
 
-struct cfattach acpimcfg_ca = {
+const struct cfattach acpimcfg_ca = {
 	sizeof(struct device), acpimcfg_match, acpimcfg_attach
 };
 
diff --git a/sys/dev/acpi/acpiprt.c b/sys/dev/acpi/acpiprt.c
index bd62006301a..39de79dcfca 100644
--- a/sys/dev/acpi/acpiprt.c
+++ b/sys/dev/acpi/acpiprt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpiprt.c,v 1.51 2021/03/10 21:49:55 patrick Exp $ */
+/* $OpenBSD: acpiprt.c,v 1.52 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2006 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -72,7 +72,7 @@ struct acpiprt_softc {
 	int			sc_bus;
 };
 
-struct cfattach acpiprt_ca = {
+const struct cfattach acpiprt_ca = {
 	sizeof(struct acpiprt_softc), acpiprt_match, acpiprt_attach
 };
 
diff --git a/sys/dev/acpi/acpipwrres.c b/sys/dev/acpi/acpipwrres.c
index 6ffe53870c8..57aea81fb76 100644
--- a/sys/dev/acpi/acpipwrres.c
+++ b/sys/dev/acpi/acpipwrres.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpipwrres.c,v 1.10 2021/03/10 21:49:55 patrick Exp $ */
+/* $OpenBSD: acpipwrres.c,v 1.11 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2013 Martin Pieuchot <mpi@openbsd.org>
@@ -65,7 +65,7 @@ struct acpipwrres_consumer {
 	SIMPLEQ_ENTRY(acpipwrres_consumer)	cs_next;
 };
 
-struct cfattach acpipwrres_ca = {
+const struct cfattach acpipwrres_ca = {
 	sizeof(struct acpipwrres_softc), acpipwrres_match, acpipwrres_attach
 };
 
diff --git a/sys/dev/acpi/acpisony.c b/sys/dev/acpi/acpisony.c
index 5ddda1dab44..55f3f9c5b8a 100644
--- a/sys/dev/acpi/acpisony.c
+++ b/sys/dev/acpi/acpisony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpisony.c,v 1.9 2022/02/08 17:25:12 deraadt Exp $ */
+/* $OpenBSD: acpisony.c,v 1.10 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2010 Paul Irofti <paul@irofti.net>
  *
@@ -67,7 +67,7 @@ struct acpisony_softc {
 	struct aml_node		*sc_devnode;
 };
 
-struct cfattach acpisony_ca = {
+const struct cfattach acpisony_ca = {
 	sizeof(struct acpisony_softc), acpisony_match, acpisony_attach,
 	NULL, acpisony_activate
 };
diff --git a/sys/dev/acpi/acpisurface.c b/sys/dev/acpi/acpisurface.c
index 361c7871ea0..f00421060ec 100644
--- a/sys/dev/acpi/acpisurface.c
+++ b/sys/dev/acpi/acpisurface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpisurface.c,v 1.1 2018/06/30 18:15:12 mlarkin Exp $	*/
+/*	$OpenBSD: acpisurface.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -61,7 +61,7 @@ int	surface_hotkey(struct aml_node *, int, void *);
 extern int wskbd_set_mixervolume(long, long);
 #endif
 
-struct cfattach acpisurface_ca = {
+const struct cfattach acpisurface_ca = {
 	sizeof(struct acpisurface_softc), surface_match, surface_attach,
 	NULL, NULL
 };
diff --git a/sys/dev/acpi/acpithinkpad.c b/sys/dev/acpi/acpithinkpad.c
index 8d4379234f7..f62f1d41833 100644
--- a/sys/dev/acpi/acpithinkpad.c
+++ b/sys/dev/acpi/acpithinkpad.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpithinkpad.c,v 1.69 2022/02/08 17:25:12 deraadt Exp $	*/
+/*	$OpenBSD: acpithinkpad.c,v 1.70 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2008 joshua stein <jcs@openbsd.org>
  *
@@ -189,7 +189,7 @@ extern int wskbd_set_mixermute(long, long);
 extern int wskbd_set_mixervolume(long, long);
 #endif
 
-struct cfattach acpithinkpad_ca = {
+const struct cfattach acpithinkpad_ca = {
 	sizeof(struct acpithinkpad_softc), thinkpad_match, thinkpad_attach,
 	NULL, thinkpad_activate
 };
diff --git a/sys/dev/acpi/acpitimer.c b/sys/dev/acpi/acpitimer.c
index 36623636862..7b04127d896 100644
--- a/sys/dev/acpi/acpitimer.c
+++ b/sys/dev/acpi/acpitimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitimer.c,v 1.14 2021/02/23 04:44:31 cheloha Exp $ */
+/* $OpenBSD: acpitimer.c,v 1.15 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -48,7 +48,7 @@ struct acpitimer_softc {
 	bus_space_handle_t	sc_ioh;
 };
 
-struct cfattach acpitimer_ca = {
+const struct cfattach acpitimer_ca = {
 	sizeof(struct acpitimer_softc), acpitimermatch, acpitimerattach
 };
 
diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c
index a62cecc4d32..c8ca3f139b4 100644
--- a/sys/dev/acpi/acpitoshiba.c
+++ b/sys/dev/acpi/acpitoshiba.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitoshiba.c,v 1.15 2022/02/15 21:13:39 kettenis Exp $ */
+/* $OpenBSD: acpitoshiba.c,v 1.16 2022/04/06 18:59:27 naddy Exp $ */
 /*-
  * Copyright (c) 2003 Hiroyuki Aizu <aizu@navi.org>
  * All rights reserved.
@@ -113,7 +113,7 @@ int	acpitoshiba_set_param(struct wsdisplay_param *);
 int	get_param_brightness(struct wsdisplay_param *);
 int	set_param_brightness(struct wsdisplay_param *);
 
-struct cfattach acpitoshiba_ca = {
+const struct cfattach acpitoshiba_ca = {
 	sizeof(struct acpitoshiba_softc), toshiba_match, toshiba_attach
 };
 
diff --git a/sys/dev/acpi/acpitz.c b/sys/dev/acpi/acpitz.c
index c4e166dd539..aa184976dbe 100644
--- a/sys/dev/acpi/acpitz.c
+++ b/sys/dev/acpi/acpitz.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: acpitz.c,v 1.57 2022/02/09 16:03:53 dv Exp $ */
+/* $OpenBSD: acpitz.c,v 1.58 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2006 Can Erkin Acar <canacar@openbsd.org>
  * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org>
@@ -67,7 +67,7 @@ int	acpitz_match(struct device *, void *, void *);
 void	acpitz_attach(struct device *, struct device *, void *);
 int	acpitz_activate(struct device *, int);
 
-struct cfattach acpitz_ca = {
+const struct cfattach acpitz_ca = {
 	sizeof(struct acpitz_softc), acpitz_match, acpitz_attach,
 	NULL, acpitz_activate
 };
diff --git a/sys/dev/acpi/acpivideo.c b/sys/dev/acpi/acpivideo.c
index f78af7ee952..ba8f961b0a4 100644
--- a/sys/dev/acpi/acpivideo.c
+++ b/sys/dev/acpi/acpivideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpivideo.c,v 1.13 2020/04/06 00:01:08 pirofti Exp $	*/
+/*	$OpenBSD: acpivideo.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2008 Federico G. Schwindt <fgsch@openbsd.org>
  * Copyright (c) 2009 Paul Irofti <paul@irofti.net>
@@ -57,7 +57,7 @@ int	acpivideo_print(void *, const char *);
 
 int	acpivideo_getpcibus(struct acpivideo_softc *, struct aml_node *);
 
-struct cfattach acpivideo_ca = {
+const struct cfattach acpivideo_ca = {
 	sizeof(struct acpivideo_softc), acpivideo_match, acpivideo_attach
 };
 
diff --git a/sys/dev/acpi/acpivout.c b/sys/dev/acpi/acpivout.c
index ef26a8525f3..db383b4500a 100644
--- a/sys/dev/acpi/acpivout.c
+++ b/sys/dev/acpi/acpivout.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpivout.c,v 1.24 2020/09/16 11:52:17 jsg Exp $	*/
+/*	$OpenBSD: acpivout.c,v 1.25 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2009 Paul Irofti <paul@irofti.net>
  *
@@ -74,7 +74,7 @@ void	acpivout_get_bcl(struct acpivout_softc *);
 int	acpivout_get_param(struct wsdisplay_param *);
 int	acpivout_set_param(struct wsdisplay_param *);
 
-struct cfattach acpivout_ca = {
+const struct cfattach acpivout_ca = {
 	sizeof(struct acpivout_softc), acpivout_match, acpivout_attach
 };
 
diff --git a/sys/dev/acpi/ahci_acpi.c b/sys/dev/acpi/ahci_acpi.c
index b754b4a8fb1..9fa71439655 100644
--- a/sys/dev/acpi/ahci_acpi.c
+++ b/sys/dev/acpi/ahci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci_acpi.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: ahci_acpi.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -39,7 +39,7 @@ struct ahci_acpi_softc {
 int	ahci_acpi_match(struct device *, void *, void *);
 void	ahci_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach ahci_acpi_ca = {
+const struct cfattach ahci_acpi_ca = {
 	sizeof(struct ahci_acpi_softc), ahci_acpi_match, ahci_acpi_attach
 };
 
diff --git a/sys/dev/acpi/amdgpio.c b/sys/dev/acpi/amdgpio.c
index 685ed1b6a82..1d0cd5fcede 100644
--- a/sys/dev/acpi/amdgpio.c
+++ b/sys/dev/acpi/amdgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amdgpio.c,v 1.6 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: amdgpio.c,v 1.7 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -67,7 +67,7 @@ struct amdgpio_softc {
 int	amdgpio_match(struct device *, void *, void *);
 void	amdgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach amdgpio_ca = {
+const struct cfattach amdgpio_ca = {
 	sizeof(struct amdgpio_softc), amdgpio_match, amdgpio_attach
 };
 
diff --git a/sys/dev/acpi/aplgpio.c b/sys/dev/acpi/aplgpio.c
index c70556849c3..29106b5c3aa 100644
--- a/sys/dev/acpi/aplgpio.c
+++ b/sys/dev/acpi/aplgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aplgpio.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: aplgpio.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -60,7 +60,7 @@ struct aplgpio_softc {
 int	aplgpio_match(struct device *, void *, void *);
 void	aplgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach aplgpio_ca = {
+const struct cfattach aplgpio_ca = {
 	sizeof(struct aplgpio_softc), aplgpio_match, aplgpio_attach
 };
 
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c
index 9d6feb22f73..d4baa8452a9 100644
--- a/sys/dev/acpi/atk0110.c
+++ b/sys/dev/acpi/atk0110.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atk0110.c,v 1.18 2022/01/09 05:42:37 jsg Exp $	*/
+/*	$OpenBSD: atk0110.c,v 1.19 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -113,7 +113,7 @@ void	aibs_probe(struct aibs_softc *);
 int	aibs_find_cb(struct aml_node *, void *);
 
 
-struct cfattach aibs_ca = {
+const struct cfattach aibs_ca = {
 	sizeof(struct aibs_softc), aibs_match, aibs_attach
 };
 
diff --git a/sys/dev/acpi/bytgpio.c b/sys/dev/acpi/bytgpio.c
index 6be9cdfaa69..8b7f91516a7 100644
--- a/sys/dev/acpi/bytgpio.c
+++ b/sys/dev/acpi/bytgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bytgpio.c,v 1.16 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: bytgpio.c,v 1.17 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -61,7 +61,7 @@ struct bytgpio_softc {
 int	bytgpio_match(struct device *, void *, void *);
 void	bytgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach bytgpio_ca = {
+const struct cfattach bytgpio_ca = {
 	sizeof(struct bytgpio_softc), bytgpio_match, bytgpio_attach
 };
 
diff --git a/sys/dev/acpi/ccp_acpi.c b/sys/dev/acpi/ccp_acpi.c
index 26eeca4ede1..6a1013b2335 100644
--- a/sys/dev/acpi/ccp_acpi.c
+++ b/sys/dev/acpi/ccp_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccp_acpi.c,v 1.3 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: ccp_acpi.c,v 1.4 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2019 Mark Kettenis
  *
@@ -35,7 +35,7 @@ struct ccp_acpi_softc {
 int	ccp_acpi_match(struct device *, void *, void *);
 void	ccp_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach ccp_acpi_ca = {
+const struct cfattach ccp_acpi_ca = {
 	sizeof(struct ccp_acpi_softc), ccp_acpi_match, ccp_acpi_attach
 };
 
diff --git a/sys/dev/acpi/ccpmic.c b/sys/dev/acpi/ccpmic.c
index 9f6f3475161..396ac7c0255 100644
--- a/sys/dev/acpi/ccpmic.c
+++ b/sys/dev/acpi/ccpmic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ccpmic.c,v 1.2 2018/05/21 15:00:25 kettenis Exp $	*/
+/*	$OpenBSD: ccpmic.c,v 1.3 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -78,7 +78,7 @@ struct ccpmic_softc {
 int	ccpmic_match(struct device *, void *, void *);
 void	ccpmic_attach(struct device *, struct device *, void *);
 
-struct cfattach ccpmic_ca = {
+const struct cfattach ccpmic_ca = {
 	sizeof(struct ccpmic_softc), ccpmic_match, ccpmic_attach
 };
 
diff --git a/sys/dev/acpi/chvgpio.c b/sys/dev/acpi/chvgpio.c
index af5aab91615..80c9dff285c 100644
--- a/sys/dev/acpi/chvgpio.c
+++ b/sys/dev/acpi/chvgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: chvgpio.c,v 1.11 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: chvgpio.c,v 1.12 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -107,7 +107,7 @@ chvgpio_write_pad_cfg1(struct chvgpio_softc *sc, int pin, uint32_t val)
 int	chvgpio_match(struct device *, void *, void *);
 void	chvgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach chvgpio_ca = {
+const struct cfattach chvgpio_ca = {
 	sizeof(struct chvgpio_softc), chvgpio_match, chvgpio_attach
 };
 
diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index b1e3f30f6ab..9c1e4af0426 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_acpi.c,v 1.7 2022/02/15 12:24:55 claudio Exp $	*/
+/*	$OpenBSD: com_acpi.c,v 1.8 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -43,7 +43,7 @@ struct com_acpi_softc {
 int	com_acpi_match(struct device *, void *, void *);
 void	com_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach com_acpi_ca = {
+const struct cfattach com_acpi_ca = {
 	sizeof(struct com_acpi_softc), com_acpi_match, com_acpi_attach,
 	NULL, com_activate
 };
diff --git a/sys/dev/acpi/dwgpio.c b/sys/dev/acpi/dwgpio.c
index 79a3220c793..8dd10dbaf21 100644
--- a/sys/dev/acpi/dwgpio.c
+++ b/sys/dev/acpi/dwgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dwgpio.c,v 1.6 2022/02/14 02:57:21 jsg Exp $	*/
+/*	$OpenBSD: dwgpio.c,v 1.7 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  *
@@ -74,7 +74,7 @@ struct dwgpio_softc {
 int	dwgpio_match(struct device *, void *, void *);
 void	dwgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach dwgpio_ca = {
+const struct cfattach dwgpio_ca = {
 	sizeof(struct dwgpio_softc), dwgpio_match, dwgpio_attach
 };
 
diff --git a/sys/dev/acpi/dwiic_acpi.c b/sys/dev/acpi/dwiic_acpi.c
index 7f0abc1b5ea..23b427b2bb4 100644
--- a/sys/dev/acpi/dwiic_acpi.c
+++ b/sys/dev/acpi/dwiic_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwiic_acpi.c,v 1.18 2021/12/21 20:53:46 kettenis Exp $ */
+/* $OpenBSD: dwiic_acpi.c,v 1.19 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Synopsys DesignWare I2C controller
  *
@@ -53,7 +53,7 @@ void		dwiic_acpi_power(struct dwiic_softc *, int);
 void		dwiic_acpi_bus_scan(struct device *,
 		    struct i2cbus_attach_args *, void *);
 
-struct cfattach dwiic_acpi_ca = {
+const struct cfattach dwiic_acpi_ca = {
 	sizeof(struct dwiic_softc),
 	dwiic_acpi_match,
 	dwiic_acpi_attach,
diff --git a/sys/dev/acpi/ehci_acpi.c b/sys/dev/acpi/ehci_acpi.c
index 83f2fef25bf..20b34349b4a 100644
--- a/sys/dev/acpi/ehci_acpi.c
+++ b/sys/dev/acpi/ehci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_acpi.c,v 1.1 2021/12/29 18:40:19 patrick Exp $	*/
+/*	$OpenBSD: ehci_acpi.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -46,7 +46,7 @@ struct ehci_acpi_softc {
 int	ehci_acpi_match(struct device *, void *, void *);
 void	ehci_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach ehci_acpi_ca = {
+const struct cfattach ehci_acpi_ca = {
 	sizeof(struct ehci_acpi_softc), ehci_acpi_match, ehci_acpi_attach
 };
 
diff --git a/sys/dev/acpi/glkgpio.c b/sys/dev/acpi/glkgpio.c
index fdfd78acb9a..0e90b4967a0 100644
--- a/sys/dev/acpi/glkgpio.c
+++ b/sys/dev/acpi/glkgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glkgpio.c,v 1.4 2021/12/21 20:53:46 kettenis Exp $	*/
+/*	$OpenBSD: glkgpio.c,v 1.5 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  * Copyright (c) 2019 James Hastings
@@ -60,7 +60,7 @@ struct glkgpio_softc {
 int	glkgpio_match(struct device *, void *, void *);
 void	glkgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach glkgpio_ca = {
+const struct cfattach glkgpio_ca = {
 	sizeof(struct glkgpio_softc), glkgpio_match, glkgpio_attach
 };
 
diff --git a/sys/dev/acpi/if_bse_acpi.c b/sys/dev/acpi/if_bse_acpi.c
index 0ee8a185a14..ca34b79d255 100644
--- a/sys/dev/acpi/if_bse_acpi.c
+++ b/sys/dev/acpi/if_bse_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bse_acpi.c,v 1.5 2021/12/29 17:52:22 patrick Exp $	*/
+/*	$OpenBSD: if_bse_acpi.c,v 1.6 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  *
@@ -45,7 +45,7 @@ struct bse_acpi_softc {
 int	bse_acpi_match(struct device *, void *, void *);
 void	bse_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach bse_acpi_ca = {
+const struct cfattach bse_acpi_ca = {
 	sizeof(struct bse_acpi_softc), bse_acpi_match, bse_acpi_attach
 };
 
diff --git a/sys/dev/acpi/imxiic_acpi.c b/sys/dev/acpi/imxiic_acpi.c
index 70a63af6dc7..0a6e0dc26c5 100644
--- a/sys/dev/acpi/imxiic_acpi.c
+++ b/sys/dev/acpi/imxiic_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxiic_acpi.c,v 1.3 2021/12/21 20:53:46 kettenis Exp $ */
+/* $OpenBSD: imxiic_acpi.c,v 1.4 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2015, 2016 joshua stein <jcs@openbsd.org>
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
@@ -48,7 +48,7 @@ void	imxiic_acpi_bus_scan(struct device *, struct i2cbus_attach_args *,
 	    void *);
 int	imxiic_acpi_found_hid(struct aml_node *, void *);
 
-struct cfattach imxiic_acpi_ca = {
+const struct cfattach imxiic_acpi_ca = {
 	sizeof(struct imxiic_acpi_softc),
 	imxiic_acpi_match,
 	imxiic_acpi_attach,
diff --git a/sys/dev/acpi/ipmi_acpi.c b/sys/dev/acpi/ipmi_acpi.c
index 42d68c901dd..25e2527a334 100644
--- a/sys/dev/acpi/ipmi_acpi.c
+++ b/sys/dev/acpi/ipmi_acpi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipmi_acpi.c,v 1.4 2020/03/29 09:31:10 kettenis Exp $ */
+/* $OpenBSD: ipmi_acpi.c,v 1.5 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se>
  *
@@ -53,7 +53,7 @@ struct ipmi_acpi_softc {
 	char			 sc_iotype;
 };
 
-struct cfattach ipmi_acpi_ca = {
+const struct cfattach ipmi_acpi_ca = {
 	sizeof(struct ipmi_acpi_softc), ipmi_acpi_match, ipmi_acpi_attach,
 };
 
diff --git a/sys/dev/acpi/ohci_acpi.c b/sys/dev/acpi/ohci_acpi.c
index 64946eeecea..c44f00882d2 100644
--- a/sys/dev/acpi/ohci_acpi.c
+++ b/sys/dev/acpi/ohci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_acpi.c,v 1.1 2021/12/29 18:40:19 patrick Exp $	*/
+/*	$OpenBSD: ohci_acpi.c,v 1.2 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -46,7 +46,7 @@ struct ohci_acpi_softc {
 int	ohci_acpi_match(struct device *, void *, void *);
 void	ohci_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach ohci_acpi_ca = {
+const struct cfattach ohci_acpi_ca = {
 	sizeof(struct ohci_acpi_softc), ohci_acpi_match, ohci_acpi_attach
 };
 
diff --git a/sys/dev/acpi/pchgpio.c b/sys/dev/acpi/pchgpio.c
index a0977df5a33..452009608a1 100644
--- a/sys/dev/acpi/pchgpio.c
+++ b/sys/dev/acpi/pchgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchgpio.c,v 1.11 2022/03/10 10:30:10 hastings Exp $	*/
+/*	$OpenBSD: pchgpio.c,v 1.12 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis
  * Copyright (c) 2020 James Hastings
@@ -97,7 +97,7 @@ int	pchgpio_match(struct device *, void *, void *);
 void	pchgpio_attach(struct device *, struct device *, void *);
 int	pchgpio_activate(struct device *, int);
 
-struct cfattach pchgpio_ca = {
+const struct cfattach pchgpio_ca = {
 	sizeof(struct pchgpio_softc), pchgpio_match, pchgpio_attach,
 	NULL, pchgpio_activate
 };
diff --git a/sys/dev/acpi/pluart_acpi.c b/sys/dev/acpi/pluart_acpi.c
index b04fc9474b2..e90e810e76f 100644
--- a/sys/dev/acpi/pluart_acpi.c
+++ b/sys/dev/acpi/pluart_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pluart_acpi.c,v 1.7 2022/03/13 21:17:52 kettenis Exp $	*/
+/*	$OpenBSD: pluart_acpi.c,v 1.8 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -41,7 +41,7 @@ struct pluart_acpi_softc {
 int	pluart_acpi_match(struct device *, void *, void *);
 void	pluart_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach pluart_acpi_ca = {
+const struct cfattach pluart_acpi_ca = {
 	sizeof(struct pluart_acpi_softc), pluart_acpi_match, pluart_acpi_attach
 };
 
diff --git a/sys/dev/acpi/sdhc_acpi.c b/sys/dev/acpi/sdhc_acpi.c
index 17931f04ee7..4789cb3c7b9 100644
--- a/sys/dev/acpi/sdhc_acpi.c
+++ b/sys/dev/acpi/sdhc_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdhc_acpi.c,v 1.20 2022/01/18 11:36:21 patrick Exp $	*/
+/*	$OpenBSD: sdhc_acpi.c,v 1.21 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2016 Mark Kettenis
  *
@@ -50,7 +50,7 @@ struct sdhc_acpi_softc {
 int	sdhc_acpi_match(struct device *, void *, void *);
 void	sdhc_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach sdhc_acpi_ca = {
+const struct cfattach sdhc_acpi_ca = {
 	sizeof(struct sdhc_acpi_softc), sdhc_acpi_match, sdhc_acpi_attach
 };
 
diff --git a/sys/dev/acpi/tipmic.c b/sys/dev/acpi/tipmic.c
index 26cc46c08e2..afb2eb24250 100644
--- a/sys/dev/acpi/tipmic.c
+++ b/sys/dev/acpi/tipmic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tipmic.c,v 1.6 2022/01/09 05:42:37 jsg Exp $	*/
+/*	$OpenBSD: tipmic.c,v 1.7 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -88,7 +88,7 @@ struct tipmic_softc {
 int	tipmic_match(struct device *, void *, void *);
 void	tipmic_attach(struct device *, struct device *, void *);
 
-struct cfattach tipmic_ca = {
+const struct cfattach tipmic_ca = {
 	sizeof(struct tipmic_softc), tipmic_match, tipmic_attach
 };
 
diff --git a/sys/dev/acpi/tpm.c b/sys/dev/acpi/tpm.c
index c0e6a0274f5..518b087e720 100644
--- a/sys/dev/acpi/tpm.c
+++ b/sys/dev/acpi/tpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tpm.c,v 1.16 2022/04/04 15:46:45 deraadt Exp $ */
+/* $OpenBSD: tpm.c,v 1.17 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Minimal interface to Trusted Platform Module chips implementing the
@@ -224,7 +224,7 @@ uint8_t	tpm_status(struct tpm_softc *);
 
 uint32_t tpm2_start_method(struct acpi_softc *);
 
-struct cfattach tpm_ca = {
+const struct cfattach tpm_ca = {
 	sizeof(struct tpm_softc),
 	tpm_match,
 	tpm_attach,
diff --git a/sys/dev/acpi/xhci_acpi.c b/sys/dev/acpi/xhci_acpi.c
index 8ba985157b5..2b79ba20863 100644
--- a/sys/dev/acpi/xhci_acpi.c
+++ b/sys/dev/acpi/xhci_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xhci_acpi.c,v 1.5 2021/12/29 17:52:22 patrick Exp $	*/
+/*	$OpenBSD: xhci_acpi.c,v 1.6 2022/04/06 18:59:27 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -46,7 +46,7 @@ struct xhci_acpi_softc {
 int	xhci_acpi_match(struct device *, void *, void *);
 void	xhci_acpi_attach(struct device *, struct device *, void *);
 
-struct cfattach xhci_acpi_ca = {
+const struct cfattach xhci_acpi_ca = {
 	sizeof(struct xhci_acpi_softc), xhci_acpi_match, xhci_acpi_attach
 };
 
diff --git a/sys/dev/adb/akbd.c b/sys/dev/adb/akbd.c
index c7287c81fe9..801f5b7f09a 100644
--- a/sys/dev/adb/akbd.c
+++ b/sys/dev/adb/akbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: akbd.c,v 1.14 2014/01/26 17:48:08 miod Exp $	*/
+/*	$OpenBSD: akbd.c,v 1.15 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: akbd.c,v 1.17 2005/01/15 16:00:59 chs Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ int	akbdmatch(struct device *, void *, void *);
 void	akbdattach(struct device *, struct device *, void *);
 
 /* Driver definition. */
-struct cfattach akbd_ca = {
+const struct cfattach akbd_ca = {
 	sizeof(struct akbd_softc), akbdmatch, akbdattach
 };
 struct cfdriver akbd_cd = {
diff --git a/sys/dev/adb/ams.c b/sys/dev/adb/ams.c
index 433f478c4b0..7b79b78c080 100644
--- a/sys/dev/adb/ams.c
+++ b/sys/dev/adb/ams.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ams.c,v 1.7 2016/06/05 20:02:36 bru Exp $	*/
+/*	$OpenBSD: ams.c,v 1.8 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: ams.c,v 1.11 2000/12/19 03:13:40 tsubai Exp $	*/
 
 /*
@@ -50,7 +50,7 @@ int	amsmatch(struct device *, void *, void *);
 void	amsattach(struct device *, struct device *, void *);
 
 /* Driver definition. */
-struct cfattach ams_ca = {
+const struct cfattach ams_ca = {
 	sizeof(struct ams_softc), amsmatch, amsattach
 };
 /* Driver definition. */
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 590b47048a2..feefe5c61cd 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.128 2022/01/09 05:42:37 jsg Exp $ */
+/*	$OpenBSD: wd.c,v 1.129 2022/04/06 18:59:27 naddy Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -122,7 +122,7 @@ int	wddetach(struct device *, int);
 int	wdactivate(struct device *, int);
 int	wdprint(void *, char *);
 
-struct cfattach wd_ca = {
+const struct cfattach wd_ca = {
 	sizeof(struct wd_softc), wdprobe, wdattach,
 	wddetach, wdactivate
 };
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 8d02a698869..622d1687499 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.118 2022/01/09 05:42:37 jsg Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.119 2022/04/06 18:59:27 naddy Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -163,7 +163,7 @@ static struct scsi_adapter atapiscsi_switch = {
 /* Initial version shares bus_link structure so it can easily
    be "attached to current" wdc driver */
 
-struct cfattach atapiscsi_ca = {
+const struct cfattach atapiscsi_ca = {
 	sizeof(struct atapiscsi_softc), atapiscsi_match, atapiscsi_attach,
 	    atapiscsi_detach, atapiscsi_activate
 };
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index b63830635e9..98a2840fd94 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus.c,v 1.52 2019/11/30 18:19:51 cheloha Exp $	*/
+/*	$OpenBSD: cardbus.c,v 1.53 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ STATIC void enable_function(struct cardbus_softc *, int, int);
 STATIC void disable_function(struct cardbus_softc *, int);
 
 
-struct cfattach cardbus_ca = {
+const struct cfattach cardbus_ca = {
 	sizeof(struct cardbus_softc), cardbusmatch, cardbusattach
 };
 
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index a90ca275e86..09bb1d0aef9 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardslot.c,v 1.22 2020/02/18 12:13:39 mpi Exp $	*/
+/*	$OpenBSD: cardslot.c,v 1.23 2022/04/06 18:59:27 naddy Exp $	*/
 /*	$NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ STATIC int cardslot_cb_print(void *aux, const char *pcic);
 STATIC int cardslot_16_print(void *, const char *);
 STATIC int cardslot_16_submatch(struct device *, void *,void *);
 
-struct cfattach cardslot_ca = {
+const struct cfattach cardslot_ca = {
 	sizeof(struct cardslot_softc), cardslotmatch, cardslotattach
 };
 
diff --git a/sys/dev/cardbus/com_cardbus.c b/sys/dev/cardbus/com_cardbus.c
index e520d98099e..c286a3c7940 100644
--- a/sys/dev/cardbus/com_cardbus.c
+++ b/sys/dev/cardbus/com_cardbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_cardbus.c,v 1.43 2015/11/14 14:47:56 miod Exp $ */
+/* $OpenBSD: com_cardbus.c,v 1.44 2022/04/06 18:59:27 naddy Exp $ */
 /* $NetBSD: com_cardbus.c,v 1.4 2000/04/17 09:21:59 joda Exp $ */
 
 /*
@@ -93,7 +93,7 @@ struct csdev *com_cardbus_find_csdev(struct cardbus_attach_args *);
 int	com_cardbus_gofigure(struct cardbus_attach_args *,
     struct com_cardbus_softc *);
 
-struct cfattach com_cardbus_ca = {
+const struct cfattach com_cardbus_ca = {
 	sizeof(struct com_cardbus_softc), com_cardbus_match,
 	com_cardbus_attach, com_cardbus_detach, com_activate
 };
diff --git a/sys/dev/cardbus/ehci_cardbus.c b/sys/dev/cardbus/ehci_cardbus.c
index a6778539ea9..59332abd79c 100644
--- a/sys/dev/cardbus/ehci_cardbus.c
+++ b/sys/dev/cardbus/ehci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ehci_cardbus.c,v 1.22 2015/11/11 02:29:14 jsg Exp $ */
+/*	$OpenBSD: ehci_cardbus.c,v 1.23 2022/04/06 18:59:27 naddy Exp $ */
 /*	$NetBSD: ehci_cardbus.c,v 1.6.6.3 2004/09/21 13:27:25 skrll Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct ehci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach ehci_cardbus_ca = {
+const struct cfattach ehci_cardbus_ca = {
 	sizeof(struct ehci_cardbus_softc), ehci_cardbus_match,
 	ehci_cardbus_attach, ehci_cardbus_detach, ehci_activate
 };
diff --git a/sys/dev/cardbus/if_acx_cardbus.c b/sys/dev/cardbus/if_acx_cardbus.c
index 36ed0358614..7c53a8c49ac 100644
--- a/sys/dev/cardbus/if_acx_cardbus.c
+++ b/sys/dev/cardbus/if_acx_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_acx_cardbus.c,v 1.22 2015/11/24 17:11:39 mpi Exp $  */
+/*	$OpenBSD: if_acx_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -82,7 +82,7 @@ int	acx_cardbus_match(struct device *, void *, void *);
 void	acx_cardbus_attach(struct device *, struct device *, void *);
 int	acx_cardbus_detach(struct device *, int);
 
-struct cfattach acx_cardbus_ca = {
+const struct cfattach acx_cardbus_ca = {
 	sizeof (struct acx_cardbus_softc), acx_cardbus_match,
 	acx_cardbus_attach, acx_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_ath_cardbus.c b/sys/dev/cardbus/if_ath_cardbus.c
index b7ce6546bba..30985c28ddd 100644
--- a/sys/dev/cardbus/if_ath_cardbus.c
+++ b/sys/dev/cardbus/if_ath_cardbus.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_cardbus.c,v 1.19 2015/11/24 17:11:39 mpi Exp $   */
+/*      $OpenBSD: if_ath_cardbus.c,v 1.20 2022/04/06 18:59:28 naddy Exp $   */
 /*	$NetBSD: if_ath_cardbus.c,v 1.4 2004/08/02 19:14:28 mycroft Exp $ */
 
 /*
@@ -95,7 +95,7 @@ int	ath_cardbus_match(struct device *, void *, void *);
 void	ath_cardbus_attach(struct device *, struct device *, void *);
 int	ath_cardbus_detach(struct device *, int);
 
-struct cfattach ath_cardbus_ca = {
+const struct cfattach ath_cardbus_ca = {
 	sizeof(struct ath_cardbus_softc),
 	ath_cardbus_match,
 	ath_cardbus_attach,
diff --git a/sys/dev/cardbus/if_athn_cardbus.c b/sys/dev/cardbus/if_athn_cardbus.c
index 91e2d16d61a..2082fea0b0d 100644
--- a/sys/dev/cardbus/if_athn_cardbus.c
+++ b/sys/dev/cardbus/if_athn_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_cardbus.c,v 1.16 2021/04/15 18:25:43 stsp Exp $	*/
+/*	$OpenBSD: if_athn_cardbus.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -81,7 +81,7 @@ uint32_t	athn_cardbus_read(struct athn_softc *, uint32_t);
 void		athn_cardbus_write(struct athn_softc *, uint32_t, uint32_t);
 void		athn_cardbus_write_barrier(struct athn_softc *);
 
-struct cfattach athn_cardbus_ca = {
+const struct cfattach athn_cardbus_ca = {
 	sizeof (struct athn_cardbus_softc),
 	athn_cardbus_match,
 	athn_cardbus_attach,
diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index 914c07ddd1b..1c3245a652e 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.24 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.25 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -104,7 +104,7 @@ int	atw_cardbus_match(struct device *, void *, void *);
 void	atw_cardbus_attach(struct device *, struct device *, void *);
 int	atw_cardbus_detach(struct device *, int);
 
-struct cfattach atw_cardbus_ca = {
+const struct cfattach atw_cardbus_ca = {
 	sizeof(struct atw_cardbus_softc), atw_cardbus_match, atw_cardbus_attach,
 	    atw_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_bwi_cardbus.c b/sys/dev/cardbus/if_bwi_cardbus.c
index f69e1440bd7..9e2e8970382 100644
--- a/sys/dev/cardbus/if_bwi_cardbus.c
+++ b/sys/dev/cardbus/if_bwi_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bwi_cardbus.c,v 1.15 2013/12/06 21:03:02 deraadt Exp $ */
+/*	$OpenBSD: if_bwi_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -70,7 +70,7 @@ void		bwi_cardbus_disable(struct bwi_softc *);
 void		bwi_cardbus_conf_write(void *, uint32_t, uint32_t);
 uint32_t	bwi_cardbus_conf_read(void *, uint32_t);
 
-struct cfattach bwi_cardbus_ca = {
+const struct cfattach bwi_cardbus_ca = {
 	sizeof (struct bwi_cardbus_softc), bwi_cardbus_match,
 	bwi_cardbus_attach, bwi_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index 3cb7a65d181..fd11bdd160d 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_cardbus.c,v 1.40 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_dc_cardbus.c,v 1.41 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -87,7 +87,7 @@ int dc_cardbus_detach(struct device *, int);
 
 void dc_cardbus_setup(struct dc_cardbus_softc *csc);
 
-struct cfattach dc_cardbus_ca = {
+const struct cfattach dc_cardbus_ca = {
 	sizeof(struct dc_cardbus_softc), dc_cardbus_match, dc_cardbus_attach,
 	dc_cardbus_detach, dc_activate
 };
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index 9a9d6153f54..b6221922a36 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.37 2020/01/05 01:07:58 jsg Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.38 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -87,7 +87,7 @@ struct fxp_cardbus_softc {
 	pci_chipset_tag_t pc;
 };
 
-struct cfattach fxp_cardbus_ca = {
+const struct cfattach fxp_cardbus_ca = {
 	sizeof(struct fxp_cardbus_softc), fxp_cardbus_match, fxp_cardbus_attach,
 	    fxp_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_malo_cardbus.c b/sys/dev/cardbus/if_malo_cardbus.c
index a91ae86bafc..471fe30813a 100644
--- a/sys/dev/cardbus/if_malo_cardbus.c
+++ b/sys/dev/cardbus/if_malo_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_malo_cardbus.c,v 1.12 2013/12/06 21:03:02 deraadt Exp $ */
+/*	$OpenBSD: if_malo_cardbus.c,v 1.13 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -65,7 +65,7 @@ void	malo_cardbus_setup(struct malo_cardbus_softc *csc);
 int	malo_cardbus_enable(struct malo_softc *sc);
 void	malo_cardbus_disable(struct malo_softc *sc);
 
-struct cfattach malo_cardbus_ca = {
+const struct cfattach malo_cardbus_ca = {
 	sizeof (struct malo_cardbus_softc), malo_cardbus_match,
 	malo_cardbus_attach, malo_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_pgt_cardbus.c b/sys/dev/cardbus/if_pgt_cardbus.c
index 5c8d4ca0885..1c60cb4602d 100644
--- a/sys/dev/cardbus/if_pgt_cardbus.c
+++ b/sys/dev/cardbus/if_pgt_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pgt_cardbus.c,v 1.18 2015/12/11 16:07:01 mpi Exp $ */
+/*	$OpenBSD: if_pgt_cardbus.c,v 1.19 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2006 Marcus Glocker <mglocker@openbsd.org>
@@ -72,7 +72,7 @@ void	pgt_cardbus_disable(struct pgt_softc *);
 void	pgt_cardbus_power(struct pgt_softc *, int);
 void	pgt_cardbus_setup(struct pgt_cardbus_softc *);
 
-struct cfattach pgt_cardbus_ca = {
+const struct cfattach pgt_cardbus_ca = {
 	sizeof(struct pgt_cardbus_softc), pgt_cardbus_match, pgt_cardbus_attach,
 	pgt_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_ral_cardbus.c b/sys/dev/cardbus/if_ral_cardbus.c
index d1812d8b09c..4e3ba383d4b 100644
--- a/sys/dev/cardbus/if_ral_cardbus.c
+++ b/sys/dev/cardbus/if_ral_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral_cardbus.c,v 1.22 2015/11/24 17:11:39 mpi Exp $  */
+/*	$OpenBSD: if_ral_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $  */
 
 /*-
  * Copyright (c) 2005-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -108,7 +108,7 @@ void	ral_cardbus_attach(struct device *, struct device *, void *);
 int	ral_cardbus_detach(struct device *, int);
 int	ral_cardbus_activate(struct device *, int);
 
-struct cfattach ral_cardbus_ca = {
+const struct cfattach ral_cardbus_ca = {
 	sizeof (struct ral_cardbus_softc), ral_cardbus_match,
 	ral_cardbus_attach, ral_cardbus_detach,
 	ral_cardbus_activate
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index 0d744d64cb7..0d01d700793 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_cardbus.c,v 1.29 2020/06/17 10:48:44 claudio Exp $	*/
+/*	$OpenBSD: if_re_cardbus.c,v 1.30 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -71,7 +71,7 @@ void	re_cardbus_setup(struct rl_softc *);
 /*
  * Cardbus autoconfig definitions
  */
-struct cfattach re_cardbus_ca = {
+const struct cfattach re_cardbus_ca = {
 	sizeof(struct re_cardbus_softc),
 	re_cardbus_probe,
 	re_cardbus_attach,
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index b593a88693d..2d4eb393a67 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.31 2020/06/17 10:48:44 claudio Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.32 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -118,7 +118,7 @@ static void rl_cardbus_attach(struct device *, struct device *, void *);
 static int rl_cardbus_detach(struct device *, int);
 void rl_cardbus_setup(struct rl_cardbus_softc *);
 
-struct cfattach rl_cardbus_ca = {
+const struct cfattach rl_cardbus_ca = {
 	sizeof(struct rl_cardbus_softc), rl_cardbus_match, rl_cardbus_attach,
 	    rl_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index 6f4546becba..5bbb126fa9a 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.26 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.27 2022/04/06 18:59:28 naddy Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -136,7 +136,7 @@ int rtw_cardbus_detach(struct device *, int);
 void rtw_cardbus_intr_ack(struct rtw_regs *);
 void rtw_cardbus_funcregen(struct rtw_regs *, int);
 
-struct cfattach rtw_cardbus_ca = {
+const struct cfattach rtw_cardbus_ca = {
     sizeof(struct rtw_cardbus_softc), rtw_cardbus_match, rtw_cardbus_attach,
     	rtw_cardbus_detach
 };
diff --git a/sys/dev/cardbus/if_xl_cardbus.c b/sys/dev/cardbus/if_xl_cardbus.c
index 6c6b8315385..06b6256cffd 100644
--- a/sys/dev/cardbus/if_xl_cardbus.c
+++ b/sys/dev/cardbus/if_xl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_cardbus.c,v 1.33 2015/11/24 17:11:39 mpi Exp $ */
+/*	$OpenBSD: if_xl_cardbus.c,v 1.34 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_xl_cardbus.c,v 1.13 2000/03/07 00:32:52 mycroft Exp $	*/
 
 /*
@@ -94,7 +94,7 @@ struct xl_cardbus_softc {
 	bus_size_t sc_mapsize;		/* size of mapped bus space region */
 };
 
-struct cfattach xl_cardbus_ca = {
+const struct cfattach xl_cardbus_ca = {
 	sizeof(struct xl_cardbus_softc), xl_cardbus_match,
 	    xl_cardbus_attach, xl_cardbus_detach
 };
diff --git a/sys/dev/cardbus/ohci_cardbus.c b/sys/dev/cardbus/ohci_cardbus.c
index c099342bccc..633195aa457 100644
--- a/sys/dev/cardbus/ohci_cardbus.c
+++ b/sys/dev/cardbus/ohci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci_cardbus.c,v 1.22 2019/01/07 03:41:06 dlg Exp $ */
+/*	$OpenBSD: ohci_cardbus.c,v 1.23 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: ohci_cardbus.c,v 1.19 2004/08/02 19:14:28 mycroft Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct ohci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach ohci_cardbus_ca = {
+const struct cfattach ohci_cardbus_ca = {
 	sizeof(struct ohci_cardbus_softc), ohci_cardbus_match,
 	    ohci_cardbus_attach, ohci_cardbus_detach, ohci_activate
 };
diff --git a/sys/dev/cardbus/puc_cardbus.c b/sys/dev/cardbus/puc_cardbus.c
index c900ae7ee8f..e93149efb41 100644
--- a/sys/dev/cardbus/puc_cardbus.c
+++ b/sys/dev/cardbus/puc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: puc_cardbus.c,v 1.8 2011/11/15 22:27:53 deraadt Exp $	*/
+/*	$OpenBSD: puc_cardbus.c,v 1.9 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Michael Shalayeff
@@ -47,7 +47,7 @@ const char *puc_cardbus_intr_string(struct puc_attach_args *);
 void *puc_cardbus_intr_establish(struct puc_attach_args *, int,
     int (*)(void *), void *, char *);
 
-struct cfattach puc_cardbus_ca = {
+const struct cfattach puc_cardbus_ca = {
 	sizeof(struct puc_cardbus_softc), puc_cardbus_match,
 	puc_cardbus_attach, puc_cardbus_detach
 };
diff --git a/sys/dev/cardbus/uhci_cardbus.c b/sys/dev/cardbus/uhci_cardbus.c
index f8aecdb9dc8..d6aa0a8f27e 100644
--- a/sys/dev/cardbus/uhci_cardbus.c
+++ b/sys/dev/cardbus/uhci_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci_cardbus.c,v 1.15 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: uhci_cardbus.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ struct uhci_cardbus_softc {
 	void 			*sc_ih;		/* interrupt vectoring */
 };
 
-struct cfattach uhci_cardbus_ca = {
+const struct cfattach uhci_cardbus_ca = {
 	sizeof(struct uhci_cardbus_softc), uhci_cardbus_match,
 	    uhci_cardbus_attach, uhci_cardbus_detach, uhci_activate
 };
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c
index 9cb83859de7..0ebfaa18251 100644
--- a/sys/dev/eisa/ahc_eisa.c
+++ b/sys/dev/eisa/ahc_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahc_eisa.c,v 1.24 2021/03/07 06:18:48 jsg Exp $	*/
+/*	$OpenBSD: ahc_eisa.c,v 1.25 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_eisa.c,v 1.24 2021/03/07 06:18:48 jsg Exp $
+ *	$Id: ahc_eisa.c,v 1.25 2022/04/06 18:59:28 naddy Exp $
  */
 
 #include <sys/param.h>
@@ -59,7 +59,7 @@ int   ahc_eisa_match(struct device *, void *, void *);
 void  ahc_eisa_attach(struct device *, struct device *, void *);
 
 
-struct cfattach ahc_eisa_ca = {
+const struct cfattach ahc_eisa_ca = {
 	sizeof(struct ahc_softc), ahc_eisa_match, ahc_eisa_attach
 };
 
diff --git a/sys/dev/eisa/cac_eisa.c b/sys/dev/eisa/cac_eisa.c
index ebf49b78e92..00f53f16f69 100644
--- a/sys/dev/eisa/cac_eisa.c
+++ b/sys/dev/eisa/cac_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac_eisa.c,v 1.6 2021/03/07 06:18:48 jsg Exp $	*/
+/*	$OpenBSD: cac_eisa.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: cac_eisa.c,v 1.1 2000/09/01 12:15:20 ad Exp $	*/
 
 /*-
@@ -91,7 +91,7 @@ void	cac_eisa_l0_intr_enable(struct cac_softc *, int);
 int	cac_eisa_l0_intr_pending(struct cac_softc *);
 void	cac_eisa_l0_submit(struct cac_softc *, struct cac_ccb *);
 
-struct cfattach cac_eisa_ca = {
+const struct cfattach cac_eisa_ca = {
 	sizeof(struct cac_softc), cac_eisa_match, cac_eisa_attach
 };
 
diff --git a/sys/dev/eisa/eisa.c b/sys/dev/eisa/eisa.c
index d352f765f32..76c055d66c5 100644
--- a/sys/dev/eisa/eisa.c
+++ b/sys/dev/eisa/eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa.c,v 1.14 2021/03/07 06:18:48 jsg Exp $	*/
+/*	$OpenBSD: eisa.c,v 1.15 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: eisa.c,v 1.15 1996/10/21 22:31:01 thorpej Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
 int	eisamatch(struct device *, void *, void *);
 void	eisaattach(struct device *, struct device *, void *);
 
-struct cfattach eisa_ca = {
+const struct cfattach eisa_ca = {
 	sizeof(struct device), eisamatch, eisaattach
 };
 
diff --git a/sys/dev/eisa/if_ep_eisa.c b/sys/dev/eisa/if_ep_eisa.c
index d5d23c2ec0f..2b5a318fedd 100644
--- a/sys/dev/eisa/if_ep_eisa.c
+++ b/sys/dev/eisa/if_ep_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_eisa.c,v 1.27 2021/03/07 06:18:48 jsg Exp $	*/
+/*	$OpenBSD: if_ep_eisa.c,v 1.28 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ep_eisa.c,v 1.13 1997/04/18 00:50:33 cgd Exp $	*/
 
 /*
@@ -72,7 +72,7 @@
 int ep_eisa_match(struct device *, void *, void *);
 void ep_eisa_attach(struct device *, struct device *, void *);
 
-struct cfattach ep_eisa_ca = {
+const struct cfattach ep_eisa_ca = {
 	sizeof(struct ep_softc), ep_eisa_match, ep_eisa_attach
 };
 
diff --git a/sys/dev/eisa/uha_eisa.c b/sys/dev/eisa/uha_eisa.c
index 53763bb40ec..d8490761b26 100644
--- a/sys/dev/eisa/uha_eisa.c
+++ b/sys/dev/eisa/uha_eisa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha_eisa.c,v 1.15 2021/03/07 06:18:48 jsg Exp $	*/
+/*	$OpenBSD: uha_eisa.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: uha_eisa.c,v 1.5 1996/10/21 22:31:07 thorpej Exp $	*/
 
 /*
@@ -54,7 +54,7 @@
 int	uha_eisa_match(struct device *, void *, void *);
 void	uha_eisa_attach(struct device *, struct device *, void *);
 
-struct cfattach uha_eisa_ca = {
+const struct cfattach uha_eisa_ca = {
 	sizeof(struct uha_softc), uha_eisa_match, uha_eisa_attach
 };
 
diff --git a/sys/dev/fdt/amlpwrc.c b/sys/dev/fdt/amlpwrc.c
index 64fb6bd2862..585705f305b 100644
--- a/sys/dev/fdt/amlpwrc.c
+++ b/sys/dev/fdt/amlpwrc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amlpwrc.c,v 1.3 2020/12/27 17:59:32 kettenis Exp $	*/
+/*	$OpenBSD: amlpwrc.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -66,7 +66,7 @@ struct amlpwrc_softc {
 int amlpwrc_match(struct device *, void *, void *);
 void amlpwrc_attach(struct device *, struct device *, void *);
 
-struct cfattach	amlpwrc_ca = {
+const struct cfattach amlpwrc_ca = {
 	sizeof (struct amlpwrc_softc), amlpwrc_match, amlpwrc_attach
 };
 
diff --git a/sys/dev/fdt/bcm2711_pcie.c b/sys/dev/fdt/bcm2711_pcie.c
index 2c980dd3052..c8d9225d0b9 100644
--- a/sys/dev/fdt/bcm2711_pcie.c
+++ b/sys/dev/fdt/bcm2711_pcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcm2711_pcie.c,v 1.10 2021/12/06 18:02:58 kettenis Exp $	*/
+/*	$OpenBSD: bcm2711_pcie.c,v 1.11 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -84,7 +84,7 @@ struct bcmpcie_softc {
 int bcmpcie_match(struct device *, void *, void *);
 void bcmpcie_attach(struct device *, struct device *, void *);
 
-struct cfattach bcmpcie_ca = {
+const struct cfattach bcmpcie_ca = {
 	sizeof (struct bcmpcie_softc), bcmpcie_match, bcmpcie_attach
 };
 
diff --git a/sys/dev/fdt/bcm2711_rng.c b/sys/dev/fdt/bcm2711_rng.c
index 3ee0e213c98..d8f5e3ea5e8 100644
--- a/sys/dev/fdt/bcm2711_rng.c
+++ b/sys/dev/fdt/bcm2711_rng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcm2711_rng.c,v 1.2 2020/05/29 04:42:25 deraadt Exp $	*/
+/*	$OpenBSD: bcm2711_rng.c,v 1.3 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -50,7 +50,7 @@ struct bcmirng_softc {
 int	bcmirng_match(struct device *, void *, void *);
 void	bcmirng_attach(struct device *, struct device *, void *);
 
-struct cfattach	bcmirng_ca = {
+const struct cfattach bcmirng_ca = {
 	sizeof (struct bcmirng_softc), bcmirng_match, bcmirng_attach
 };
 
diff --git a/sys/dev/fdt/bcm2711_tmon.c b/sys/dev/fdt/bcm2711_tmon.c
index fb36740f1cf..8863342cf4c 100644
--- a/sys/dev/fdt/bcm2711_tmon.c
+++ b/sys/dev/fdt/bcm2711_tmon.c
@@ -49,7 +49,7 @@ struct bcmtmon_softc {
 int	bcmtmon_match(struct device *, void *, void *);
 void	bcmtmon_attach(struct device *, struct device *, void *);
 
-struct cfattach	bcmtmon_ca = {
+const struct cfattach bcmtmon_ca = {
 	sizeof (struct bcmtmon_softc), bcmtmon_match, bcmtmon_attach
 };
 
diff --git a/sys/dev/fdt/bcm2835_bsc.c b/sys/dev/fdt/bcm2835_bsc.c
index 9d57d72d0e4..aab234fa31c 100644
--- a/sys/dev/fdt/bcm2835_bsc.c
+++ b/sys/dev/fdt/bcm2835_bsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcm2835_bsc.c,v 1.3 2021/11/21 11:00:40 kettenis Exp $	*/
+/*	$OpenBSD: bcm2835_bsc.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -79,7 +79,7 @@ struct bcmbsc_softc {
 int	bcmbsc_match(struct device *, void *, void *);
 void	bcmbsc_attach(struct device *, struct device *, void *);
 
-struct cfattach	bcmbsc_ca = {
+const struct cfattach bcmbsc_ca = {
 	sizeof (struct bcmbsc_softc), bcmbsc_match, bcmbsc_attach
 };
 
diff --git a/sys/dev/fdt/bcm2835_clock.c b/sys/dev/fdt/bcm2835_clock.c
index 4d627e543e6..6e0d877c1f4 100644
--- a/sys/dev/fdt/bcm2835_clock.c
+++ b/sys/dev/fdt/bcm2835_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcm2835_clock.c,v 1.2 2020/04/19 16:48:39 kettenis Exp $	*/
+/*	$OpenBSD: bcm2835_clock.c,v 1.3 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org>
@@ -84,7 +84,7 @@ struct bcmclock_softc {
 int bcmclock_match(struct device *, void *, void *);
 void bcmclock_attach(struct device *, struct device *, void *);
 
-struct cfattach bcmclock_ca = {
+const struct cfattach bcmclock_ca = {
 	sizeof(struct bcmclock_softc),
 	bcmclock_match,
 	bcmclock_attach,
diff --git a/sys/dev/fdt/bcm2835_dmac.c b/sys/dev/fdt/bcm2835_dmac.c
index 95bc611f533..145810dd7af 100644
--- a/sys/dev/fdt/bcm2835_dmac.c
+++ b/sys/dev/fdt/bcm2835_dmac.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bcm2835_dmac.c,v 1.1 2020/04/21 18:56:54 tobhe Exp $ */
+/*     $OpenBSD: bcm2835_dmac.c,v 1.2 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org>
@@ -87,7 +87,7 @@ struct bcmdmac_channel {
 int bcmdmac_match(struct device *, void *, void *);
 void bcmdmac_attach(struct device *, struct device *, void *);
 
-struct cfattach bcmdmac_ca = {
+const struct cfattach bcmdmac_ca = {
 	sizeof(struct bcmdmac_softc),
 	bcmdmac_match,
 	bcmdmac_attach,
diff --git a/sys/dev/fdt/bcm2835_gpio.c b/sys/dev/fdt/bcm2835_gpio.c
index 6bb4497295c..eb49352472d 100644
--- a/sys/dev/fdt/bcm2835_gpio.c
+++ b/sys/dev/fdt/bcm2835_gpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bcm2835_gpio.c,v 1.4 2020/06/12 13:21:55 kettenis Exp $	*/
+/*	$OpenBSD: bcm2835_gpio.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -80,7 +80,7 @@ struct bcmgpio_softc {
 int	bcmgpio_match(struct device *, void *, void *);
 void	bcmgpio_attach(struct device *, struct device *, void *);
 
-struct cfattach	bcmgpio_ca = {
+const struct cfattach bcmgpio_ca = {
 	sizeof (struct bcmgpio_softc), bcmgpio_match, bcmgpio_attach
 };
 
diff --git a/sys/dev/fdt/bcm2835_mbox.c b/sys/dev/fdt/bcm2835_mbox.c
index e09b3010504..acf886aa287 100644
--- a/sys/dev/fdt/bcm2835_mbox.c
+++ b/sys/dev/fdt/bcm2835_mbox.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bcm2835_mbox.c,v 1.2 2021/05/30 15:05:33 visa Exp $ */
+/*     $OpenBSD: bcm2835_mbox.c,v 1.3 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org>
@@ -85,7 +85,7 @@ static struct bcmmbox_softc *bcmmbox_sc;
 int bcmmbox_match(struct device *, void *, void *);
 void bcmmbox_attach(struct device *, struct device *, void *);
 
-struct cfattach bcmmbox_ca = {
+const struct cfattach bcmmbox_ca = {
 	sizeof(struct bcmmbox_softc),
 	bcmmbox_match,
 	bcmmbox_attach,
diff --git a/sys/dev/fdt/bcm2835_sdhost.c b/sys/dev/fdt/bcm2835_sdhost.c
index 6507a302bc9..445b129f870 100644
--- a/sys/dev/fdt/bcm2835_sdhost.c
+++ b/sys/dev/fdt/bcm2835_sdhost.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bcm2835_sdhost.c,v 1.1 2020/04/22 09:48:44 kettenis Exp $ */
+/*     $OpenBSD: bcm2835_sdhost.c,v 1.2 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2020 Tobias Heider <tobhe@openbsd.org>
@@ -146,7 +146,7 @@ struct bcmsdhost_softc {
 int bcmsdhost_match(struct device *, void *, void *);
 void bcmsdhost_attach(struct device *, struct device *, void *);
 
-struct cfattach bcmsdhost_ca = {
+const struct cfattach bcmsdhost_ca = {
 	sizeof(struct bcmsdhost_softc),
 	bcmsdhost_match,
 	bcmsdhost_attach
diff --git a/sys/dev/fdt/bd718x7.c b/sys/dev/fdt/bd718x7.c
index baec9f63ccc..99d88ed8125 100644
--- a/sys/dev/fdt/bd718x7.c
+++ b/sys/dev/fdt/bd718x7.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bd718x7.c,v 1.3 2020/11/12 10:47:07 patrick Exp $	*/
+/*	$OpenBSD: bd718x7.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2019 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2017 Mark Kettenis <kettenis@openbsd.org>
@@ -62,7 +62,7 @@ void	bdpmic_attach_regulator(struct bdpmic_softc *, int);
 uint8_t	bdpmic_reg_read(struct bdpmic_softc *, int);
 void	bdpmic_reg_write(struct bdpmic_softc *, int, uint8_t);
 
-struct cfattach bdpmic_ca = {
+const struct cfattach bdpmic_ca = {
 	sizeof(struct bdpmic_softc), bdpmic_match, bdpmic_attach
 };
 
diff --git a/sys/dev/fdt/cwfg.c b/sys/dev/fdt/cwfg.c
index 7090d1cfcf7..7eb4b6f863b 100644
--- a/sys/dev/fdt/cwfg.c
+++ b/sys/dev/fdt/cwfg.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cwfg.c,v 1.6 2021/04/01 12:06:00 kn Exp $ */
+/* $OpenBSD: cwfg.c,v 1.7 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: cwfg.c,v 1.1 2020/01/03 18:00:05 jmcneill Exp $ */
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcneill@invisible.ca>
@@ -104,7 +104,7 @@ int cwfg_read(struct cwfg_softc *, uint8_t, uint8_t *);
 int cwfg_write(struct cwfg_softc *, uint8_t, uint8_t);
 void cwfg_update_sensors(void *);
 
-struct cfattach cwfg_ca = {
+const struct cfattach cwfg_ca = {
 	sizeof(struct cwfg_softc), cwfg_match, cwfg_attach
 };
 
diff --git a/sys/dev/fdt/dapmic.c b/sys/dev/fdt/dapmic.c
index cc8d529302a..64a20d099f4 100644
--- a/sys/dev/fdt/dapmic.c
+++ b/sys/dev/fdt/dapmic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dapmic.c,v 1.1 2021/06/16 12:37:24 kettenis Exp $	*/
+/*	$OpenBSD: dapmic.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -66,7 +66,7 @@ struct dapmic_softc {
 int	dapmic_match(struct device *, void *, void *);
 void	dapmic_attach(struct device *, struct device *, void *);
 
-struct cfattach dapmic_ca = {
+const struct cfattach dapmic_ca = {
 	sizeof(struct dapmic_softc), dapmic_match, dapmic_attach
 };
 
diff --git a/sys/dev/fdt/es8316ac.c b/sys/dev/fdt/es8316ac.c
index 57d1734f261..d6a18560191 100644
--- a/sys/dev/fdt/es8316ac.c
+++ b/sys/dev/fdt/es8316ac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: es8316ac.c,v 1.2 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: es8316ac.c,v 1.3 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: es8316ac.c,v 1.2 2020/01/03 01:00:08 jmcneill Exp $ */
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcneill@invisible.ca>
@@ -138,7 +138,7 @@ const struct audio_hw_if escodec_hw_if = {
 	.query_devinfo = escodec_query_devinfo,
 };
 
-struct cfattach escodec_ca = {
+const struct cfattach escodec_ca = {
 	sizeof(struct escodec_softc), escodec_match, escodec_attach
 };
 
diff --git a/sys/dev/fdt/exuart.c b/sys/dev/fdt/exuart.c
index d7ee9757a32..151035d35aa 100644
--- a/sys/dev/fdt/exuart.c
+++ b/sys/dev/fdt/exuart.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exuart.c,v 1.9 2021/09/01 09:29:31 jan Exp $ */
+/* $OpenBSD: exuart.c,v 1.10 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2005 Dale Rahn <drahn@motorola.com>
  *
@@ -123,7 +123,7 @@ struct cfdriver exuart_cd = {
 	NULL, "exuart", DV_TTY
 };
 
-struct cfattach exuart_ca = {
+const struct cfattach exuart_ca = {
 	sizeof(struct exuart_softc), exuart_match, exuart_attach
 };
 
diff --git a/sys/dev/fdt/gfrtc.c b/sys/dev/fdt/gfrtc.c
index 503767ea631..b946b514bd2 100644
--- a/sys/dev/fdt/gfrtc.c
+++ b/sys/dev/fdt/gfrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gfrtc.c,v 1.1 2021/04/24 05:14:45 jsg Exp $	*/
+/*	$OpenBSD: gfrtc.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2021 Jonathan Gray <jsg@openbsd.org>
@@ -52,7 +52,7 @@ void	gfrtc_attach(struct device *, struct device *, void *);
 int	gfrtc_gettime(struct todr_chip_handle *, struct timeval *);
 int	gfrtc_settime(struct todr_chip_handle *, struct timeval *);
 
-struct cfattach gfrtc_ca = {
+const struct cfattach gfrtc_ca = {
 	sizeof(struct gfrtc_softc), gfrtc_match, gfrtc_attach
 };
 
diff --git a/sys/dev/fdt/gpiocharger.c b/sys/dev/fdt/gpiocharger.c
index eae1dd64e38..365165a4194 100644
--- a/sys/dev/fdt/gpiocharger.c
+++ b/sys/dev/fdt/gpiocharger.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpiocharger.c,v 1.1 2021/09/25 18:40:08 kn Exp $	*/
+/*	$OpenBSD: gpiocharger.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Klemens Nanni <kn@openbsd.org>
  *
@@ -43,7 +43,7 @@ struct gpiocharger_softc {
 int	gpiocharger_match(struct device *, void *, void *);
 void	gpiocharger_attach(struct device *, struct device *, void *);
 
-struct cfattach gpiocharger_ca = {
+const struct cfattach gpiocharger_ca = {
 	sizeof (struct gpiocharger_softc), gpiocharger_match, gpiocharger_attach
 };
 
diff --git a/sys/dev/fdt/gpioleds.c b/sys/dev/fdt/gpioleds.c
index 6a58344ac8b..1d28066eb52 100644
--- a/sys/dev/fdt/gpioleds.c
+++ b/sys/dev/fdt/gpioleds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpioleds.c,v 1.3 2021/11/07 16:43:12 kn Exp $	*/
+/*	$OpenBSD: gpioleds.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Klemens Nanni <kn@openbsd.org>
  *
@@ -38,7 +38,7 @@ struct gpioleds_softc {
 int	gpioleds_match(struct device *, void *, void *);
 void	gpioleds_attach(struct device *, struct device *, void *);
 
-struct cfattach gpioleds_ca = {
+const struct cfattach gpioleds_ca = {
 	sizeof (struct gpioleds_softc), gpioleds_match, gpioleds_attach
 };
 
diff --git a/sys/dev/fdt/graphaudio.c b/sys/dev/fdt/graphaudio.c
index d09e08ecea7..af6eb4c370a 100644
--- a/sys/dev/fdt/graphaudio.c
+++ b/sys/dev/fdt/graphaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: graphaudio.c,v 1.3 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: graphaudio.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
@@ -83,7 +83,7 @@ const struct audio_hw_if graphaudio_hw_if = {
 	.halt_input = graphaudio_halt_input,
 };
 
-struct cfattach graphaudio_ca = {
+const struct cfattach graphaudio_ca = {
 	sizeof(struct graphaudio_softc), graphaudio_match, graphaudio_attach
 };
 
diff --git a/sys/dev/fdt/if_bse_fdt.c b/sys/dev/fdt/if_bse_fdt.c
index 5769aaacad1..ed5659bc151 100644
--- a/sys/dev/fdt/if_bse_fdt.c
+++ b/sys/dev/fdt/if_bse_fdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bse_fdt.c,v 1.1 2020/04/18 07:55:06 kettenis Exp $	*/
+/*	$OpenBSD: if_bse_fdt.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -36,7 +36,7 @@
 int	bse_fdt_match(struct device *, void *, void *);
 void	bse_fdt_attach(struct device *, struct device *, void *);
 
-struct cfattach bse_fdt_ca = {
+const struct cfattach bse_fdt_ca = {
 	sizeof (struct genet_softc), bse_fdt_match, bse_fdt_attach
 };
 
diff --git a/sys/dev/fdt/if_mvpp.c b/sys/dev/fdt/if_mvpp.c
index e26b6130821..438652bc585 100644
--- a/sys/dev/fdt/if_mvpp.c
+++ b/sys/dev/fdt/if_mvpp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mvpp.c,v 1.48 2021/07/07 21:21:48 patrick Exp $	*/
+/*	$OpenBSD: if_mvpp.c,v 1.49 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2008, 2019 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2017, 2020 Patrick Wildt <patrick@blueri.se>
@@ -237,7 +237,7 @@ int	mvpp2_match(struct device *, void *, void *);
 void	mvpp2_attach(struct device *, struct device *, void *);
 void	mvpp2_attach_deferred(struct device *);
 
-struct cfattach mvppc_ca = {
+const struct cfattach mvppc_ca = {
 	sizeof(struct mvpp2_softc), mvpp2_match, mvpp2_attach
 };
 
@@ -248,7 +248,7 @@ struct cfdriver mvppc_cd = {
 int	mvpp2_port_match(struct device *, void *, void *);
 void	mvpp2_port_attach(struct device *, struct device *, void *);
 
-struct cfattach mvpp_ca = {
+const struct cfattach mvpp_ca = {
 	sizeof(struct mvpp2_port), mvpp2_port_match, mvpp2_port_attach
 };
 
diff --git a/sys/dev/fdt/iicmux.c b/sys/dev/fdt/iicmux.c
index e564a366f37..0d875627d1e 100644
--- a/sys/dev/fdt/iicmux.c
+++ b/sys/dev/fdt/iicmux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iicmux.c,v 1.1 2021/11/21 11:02:21 kettenis Exp $	*/
+/*	$OpenBSD: iicmux.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -58,7 +58,7 @@ struct iicmux_softc {
 int	iicmux_match(struct device *, void *, void *);
 void	iicmux_attach(struct device *, struct device *, void *);
 
-struct cfattach iicmux_ca = {
+const struct cfattach iicmux_ca = {
 	sizeof(struct iicmux_softc), iicmux_match, iicmux_attach
 };
 
diff --git a/sys/dev/fdt/imxdog.c b/sys/dev/fdt/imxdog.c
index 73ca0200bb8..d95198eae77 100644
--- a/sys/dev/fdt/imxdog.c
+++ b/sys/dev/fdt/imxdog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxdog.c,v 1.3 2021/05/28 13:08:37 patrick Exp $ */
+/* $OpenBSD: imxdog.c,v 1.4 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2012-2013,2021 Patrick Wildt <patrick@blueri.se>
  *
@@ -55,7 +55,7 @@ void	imxdog_attach(struct device *, struct device *, void *);
 void	imxdog_reset(void);
 void	imxdog_timeout(void *);
 
-struct cfattach	imxdog_ca = {
+const struct cfattach imxdog_ca = {
 	sizeof (struct imxdog_softc), imxdog_match, imxdog_attach
 };
 
diff --git a/sys/dev/fdt/imxdwusb.c b/sys/dev/fdt/imxdwusb.c
index 5e2adb2a7e1..d7b51ff3608 100644
--- a/sys/dev/fdt/imxdwusb.c
+++ b/sys/dev/fdt/imxdwusb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxdwusb.c,v 1.4 2020/12/19 01:21:35 patrick Exp $	*/
+/*	$OpenBSD: imxdwusb.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2017, 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
@@ -44,7 +44,7 @@ struct imxdwusb_softc {
 int	imxdwusb_match(struct device *, void *, void *);
 void	imxdwusb_attach(struct device *, struct device *, void *);
 
-struct cfattach imxdwusb_ca = {
+const struct cfattach imxdwusb_ca = {
 	sizeof(struct imxdwusb_softc), imxdwusb_match, imxdwusb_attach
 };
 
diff --git a/sys/dev/fdt/imxehci.c b/sys/dev/fdt/imxehci.c
index 9328fb9a671..effa9f9a551 100644
--- a/sys/dev/fdt/imxehci.c
+++ b/sys/dev/fdt/imxehci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxehci.c,v 1.5 2021/11/05 09:36:30 patrick Exp $ */
+/*	$OpenBSD: imxehci.c,v 1.6 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -94,7 +94,7 @@ struct imxehci_softc {
 	uint32_t		sc_unit;
 };
 
-struct cfattach imxehci_ca = {
+const struct cfattach imxehci_ca = {
 	sizeof (struct imxehci_softc), imxehci_match, imxehci_attach,
 	imxehci_detach
 };
diff --git a/sys/dev/fdt/imxiic_fdt.c b/sys/dev/fdt/imxiic_fdt.c
index f6d21ffe604..3d9280a18f5 100644
--- a/sys/dev/fdt/imxiic_fdt.c
+++ b/sys/dev/fdt/imxiic_fdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxiic_fdt.c,v 1.2 2021/03/11 09:15:25 patrick Exp $ */
+/* $OpenBSD: imxiic_fdt.c,v 1.3 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -40,7 +40,7 @@ void imxiic_fdt_attach(struct device *, struct device *, void *);
 
 void imxiic_fdt_bus_scan(struct device *, struct i2cbus_attach_args *, void *);
 
-struct cfattach imxiic_fdt_ca = {
+const struct cfattach imxiic_fdt_ca = {
 	sizeof(struct imxiic_fdt_softc), imxiic_fdt_match, imxiic_fdt_attach
 };
 
diff --git a/sys/dev/fdt/imxpciephy.c b/sys/dev/fdt/imxpciephy.c
index cff4c2c31fd..c8a31353283 100644
--- a/sys/dev/fdt/imxpciephy.c
+++ b/sys/dev/fdt/imxpciephy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxpciephy.c,v 1.1 2020/04/26 15:03:04 patrick Exp $ */
+/* $OpenBSD: imxpciephy.c,v 1.2 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -35,7 +35,7 @@ struct imxpciephy_softc {
 int	imxpciephy_match(struct device *, void *, void *);
 void	imxpciephy_attach(struct device *, struct device *, void *);
 
-struct cfattach imxpciephy_ca = {
+const struct cfattach imxpciephy_ca = {
 	sizeof(struct imxpciephy_softc), imxpciephy_match, imxpciephy_attach
 };
 
diff --git a/sys/dev/fdt/imxpwm.c b/sys/dev/fdt/imxpwm.c
index 6ae9da177d6..8d35d360568 100644
--- a/sys/dev/fdt/imxpwm.c
+++ b/sys/dev/fdt/imxpwm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: imxpwm.c,v 1.1 2020/03/27 16:53:06 patrick Exp $	*/
+/*	$OpenBSD: imxpwm.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018-2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -72,7 +72,7 @@ struct imxpwm_softc {
 int	imxpwm_match(struct device *, void *, void *);
 void	imxpwm_attach(struct device *, struct device *, void *);
 
-struct cfattach imxpwm_ca = {
+const struct cfattach imxpwm_ca = {
 	sizeof(struct imxpwm_softc), imxpwm_match, imxpwm_attach
 };
 
diff --git a/sys/dev/fdt/ipmi_fdt.c b/sys/dev/fdt/ipmi_fdt.c
index 8008d95c9fc..d2f7723f20c 100644
--- a/sys/dev/fdt/ipmi_fdt.c
+++ b/sys/dev/fdt/ipmi_fdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_fdt.c,v 1.1 2020/03/29 09:31:11 kettenis Exp $	*/
+/*	$OpenBSD: ipmi_fdt.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -30,7 +30,7 @@
 int	ipmi_fdt_match(struct device *, void *, void *);
 void	ipmi_fdt_attach(struct device *, struct device *, void *);
 
-struct cfattach ipmi_fdt_ca = {
+const struct cfattach ipmi_fdt_ca = {
 	sizeof (struct ipmi_softc), ipmi_fdt_match, ipmi_fdt_attach
 };
 
diff --git a/sys/dev/fdt/mvkpcie.c b/sys/dev/fdt/mvkpcie.c
index 4dcb0421f1e..592adfa48f8 100644
--- a/sys/dev/fdt/mvkpcie.c
+++ b/sys/dev/fdt/mvkpcie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvkpcie.c,v 1.12 2022/02/08 09:41:04 jsg Exp $	*/
+/*	$OpenBSD: mvkpcie.c,v 1.13 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
@@ -207,7 +207,7 @@ struct mvkpcie_softc {
 int mvkpcie_match(struct device *, void *, void *);
 void mvkpcie_attach(struct device *, struct device *, void *);
 
-struct cfattach mvkpcie_ca = {
+const struct cfattach mvkpcie_ca = {
 	sizeof (struct mvkpcie_softc), mvkpcie_match, mvkpcie_attach
 };
 
diff --git a/sys/dev/fdt/mvsw.c b/sys/dev/fdt/mvsw.c
index b3f442fc705..5b8d2512162 100644
--- a/sys/dev/fdt/mvsw.c
+++ b/sys/dev/fdt/mvsw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mvsw.c,v 1.4 2021/09/06 19:55:27 patrick Exp $	*/
+/*	$OpenBSD: mvsw.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -80,7 +80,7 @@ struct mvsw_softc {
 int	mvsw_match(struct device *, void *, void *);
 void	mvsw_attach(struct device *, struct device *, void *);
 
-struct cfattach	mvsw_ca = {
+const struct cfattach mvsw_ca = {
 	sizeof (struct mvsw_softc), mvsw_match, mvsw_attach
 };
 
diff --git a/sys/dev/fdt/ociic.c b/sys/dev/fdt/ociic.c
index a184acf1a32..0f165fb0623 100644
--- a/sys/dev/fdt/ociic.c
+++ b/sys/dev/fdt/ociic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ociic.c,v 1.2 2021/06/23 13:39:12 kettenis Exp $	*/
+/*	$OpenBSD: ociic.c,v 1.3 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -89,7 +89,7 @@ ociic_clr(struct ociic_softc *sc, bus_size_t reg, uint8_t bits)
 int ociic_match(struct device *, void *, void *);
 void ociic_attach(struct device *, struct device *, void *);
 
-struct cfattach	ociic_ca = {
+const struct cfattach ociic_ca = {
 	sizeof (struct ociic_softc), ociic_match, ociic_attach
 };
 
diff --git a/sys/dev/fdt/pciecam.c b/sys/dev/fdt/pciecam.c
index da640f698aa..ffae96f0b0a 100644
--- a/sys/dev/fdt/pciecam.c
+++ b/sys/dev/fdt/pciecam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciecam.c,v 1.3 2021/06/25 17:41:22 patrick Exp $ */
+/* $OpenBSD: pciecam.c,v 1.4 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2013,2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -120,7 +120,7 @@ struct interrupt_controller pciecam_ic = {
 	.ic_barrier = intr_barrier
 };
 
-struct cfattach pciecam_ca = {
+const struct cfattach pciecam_ca = {
 	sizeof (struct pciecam_softc), pciecam_match, pciecam_attach
 };
 
diff --git a/sys/dev/fdt/rkanxdp.c b/sys/dev/fdt/rkanxdp.c
index 1d87a2fccb1..54e8e778512 100644
--- a/sys/dev/fdt/rkanxdp.c
+++ b/sys/dev/fdt/rkanxdp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkanxdp.c,v 1.4 2020/06/08 04:47:58 jsg Exp $ */
+/* $OpenBSD: rkanxdp.c,v 1.5 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: rk_anxdp.c,v 1.2 2020/01/04 12:08:32 jmcneill Exp $ */
 /*-
  * Copyright (c) 2019 Jonathan A. Kollasch <jakllsch@kollasch.net>
@@ -77,7 +77,7 @@ void rkanxdp_encoder_dpms(struct drm_encoder *, int);
 int rkanxdp_ep_activate(void *, struct endpoint *, void *);
 void *rkanxdp_ep_get_cookie(void *, struct endpoint *);
 
-struct cfattach	rkanxdp_ca = {
+const struct cfattach rkanxdp_ca = {
 	sizeof (struct rkanxdp_softc), rkanxdp_match, rkanxdp_attach
 };
 
diff --git a/sys/dev/fdt/rkdrm.c b/sys/dev/fdt/rkdrm.c
index 33add572e2b..bccda1b84db 100644
--- a/sys/dev/fdt/rkdrm.c
+++ b/sys/dev/fdt/rkdrm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkdrm.c,v 1.12 2022/01/14 06:52:58 jsg Exp $ */
+/* $OpenBSD: rkdrm.c,v 1.13 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $ */
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -81,7 +81,7 @@ const struct drm_gem_object_funcs rkdrm_gem_object_funcs = {
 	.free = drm_gem_cma_free_object,
 };
 
-struct cfattach	rkdrm_ca = {
+const struct cfattach rkdrm_ca = {
 	sizeof (struct rkdrm_softc), rkdrm_match, rkdrm_attach
 };
 
diff --git a/sys/dev/fdt/rkdwhdmi.c b/sys/dev/fdt/rkdwhdmi.c
index 7d5fe9e4c63..c325f0cc527 100644
--- a/sys/dev/fdt/rkdwhdmi.c
+++ b/sys/dev/fdt/rkdwhdmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkdwhdmi.c,v 1.5 2020/06/30 02:19:11 deraadt Exp $ */
+/* $OpenBSD: rkdwhdmi.c,v 1.6 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: rk_dwhdmi.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $ */
 
 /*-
@@ -100,7 +100,7 @@ void rkdwhdmi_mode_set(struct dwhdmi_softc *, const struct drm_display_mode *,
 enum drm_mode_status rkdwhdmi_mode_valid(struct dwhdmi_softc *,
     const struct drm_display_mode *);
 
-struct cfattach	rkdwhdmi_ca = {
+const struct cfattach rkdwhdmi_ca = {
 	sizeof (struct rkdwhdmi_softc), rkdwhdmi_match, rkdwhdmi_attach
 };
 
diff --git a/sys/dev/fdt/rkiis.c b/sys/dev/fdt/rkiis.c
index baf3c1d6bf3..e294d583b13 100644
--- a/sys/dev/fdt/rkiis.c
+++ b/sys/dev/fdt/rkiis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkiis.c,v 1.2 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: rkiis.c,v 1.3 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: rk_i2s.c,v 1.3 2020/02/29 05:51:10 isaki Exp $ */
 /*-
  * Copyright (c) 2019 Jared McNeill <jmcneill@invisible.ca>
@@ -211,7 +211,7 @@ const struct audio_hw_if rkiis_hw_if = {
 	.halt_input = rkiis_halt_input,
 };
 
-struct cfattach rkiis_ca = {
+const struct cfattach rkiis_ca = {
 	sizeof (struct rkiis_softc), rkiis_match, rkiis_attach
 };
 
diff --git a/sys/dev/fdt/rkrng.c b/sys/dev/fdt/rkrng.c
index eaecdf41d6d..7108742dac7 100644
--- a/sys/dev/fdt/rkrng.c
+++ b/sys/dev/fdt/rkrng.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rkrng.c,v 1.3 2020/05/29 04:42:25 deraadt Exp $	*/
+/*	$OpenBSD: rkrng.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -52,7 +52,7 @@ struct rkrng_softc {
 int	rkrng_match(struct device *, void *, void *);
 void	rkrng_attach(struct device *, struct device *, void *);
 
-struct cfattach	rkrng_ca = {
+const struct cfattach rkrng_ca = {
 	sizeof (struct rkrng_softc), rkrng_match, rkrng_attach
 };
 
diff --git a/sys/dev/fdt/rktcphy.c b/sys/dev/fdt/rktcphy.c
index cd68538905a..3a19e05a3c0 100644
--- a/sys/dev/fdt/rktcphy.c
+++ b/sys/dev/fdt/rktcphy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rktcphy.c,v 1.1 2021/06/29 12:43:09 patrick Exp $ */
+/* $OpenBSD: rktcphy.c,v 1.2 2022/04/06 18:59:28 naddy Exp $ */
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
@@ -128,7 +128,7 @@ void rktcphy_attach(struct device *, struct device *, void *);
 void rktcphy_set_usb2_only(struct rktcphy_softc *, int);
 int rktcphy_enable(void *, uint32_t *);
 
-struct cfattach	rktcphy_ca = {
+const struct cfattach rktcphy_ca = {
 	sizeof (struct rktcphy_softc), rktcphy_match, rktcphy_attach
 };
 
diff --git a/sys/dev/fdt/rkvop.c b/sys/dev/fdt/rkvop.c
index 4595be00ce2..0c6994b365a 100644
--- a/sys/dev/fdt/rkvop.c
+++ b/sys/dev/fdt/rkvop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rkvop.c,v 1.5 2022/01/14 06:52:58 jsg Exp $ */
+/* $OpenBSD: rkvop.c,v 1.6 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: rk_vop.c,v 1.6 2020/01/05 12:14:35 mrg Exp $ */
 /*-
  * Copyright (c) 2019 Jared D. McNeill <jmcneill@invisible.ca>
@@ -185,7 +185,7 @@ struct rkvop_config rk3399_vop_lit_config = {
 	.set_polarity = rk3399_vop_set_polarity,
 };
 
-struct cfattach	rkvop_ca = {
+const struct cfattach rkvop_ca = {
 	sizeof (struct rkvop_softc), rkvop_match, rkvop_attach
 };
 
diff --git a/sys/dev/fdt/simpleamp.c b/sys/dev/fdt/simpleamp.c
index 23617d4ab8e..cefa90cc1a3 100644
--- a/sys/dev/fdt/simpleamp.c
+++ b/sys/dev/fdt/simpleamp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: simpleamp.c,v 1.3 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: simpleamp.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -51,7 +51,7 @@ const struct audio_hw_if simpleamp_hw_if = {
 	.close = simpleamp_close,
 };
 
-struct cfattach simpleamp_ca = {
+const struct cfattach simpleamp_ca = {
 	sizeof(struct simpleamp_softc), simpleamp_match, simpleamp_attach
 };
 
diff --git a/sys/dev/fdt/simpleaudio.c b/sys/dev/fdt/simpleaudio.c
index 482c453d5fc..64559ca5759 100644
--- a/sys/dev/fdt/simpleaudio.c
+++ b/sys/dev/fdt/simpleaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: simpleaudio.c,v 1.4 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: simpleaudio.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -85,7 +85,7 @@ const struct audio_hw_if simpleaudio_hw_if = {
 	.halt_input = simpleaudio_halt_input,
 };
 
-struct cfattach simpleaudio_ca = {
+const struct cfattach simpleaudio_ca = {
 	sizeof(struct simpleaudio_softc), simpleaudio_match, simpleaudio_attach
 };
 
diff --git a/sys/dev/fdt/tcpci.c b/sys/dev/fdt/tcpci.c
index d521fb388c3..bde451425c8 100644
--- a/sys/dev/fdt/tcpci.c
+++ b/sys/dev/fdt/tcpci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpci.c,v 1.2 2021/02/05 00:42:25 patrick Exp $ */
+/* $OpenBSD: tcpci.c,v 1.3 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se>
  *
@@ -192,7 +192,7 @@ uint16_t tcpci_read_reg16(struct tcpci_softc *, uint8_t);
 void	 tcpci_write_reg8(struct tcpci_softc *, uint8_t, uint8_t);
 uint8_t	 tcpci_read_reg8(struct tcpci_softc *, uint8_t);
 
-struct cfattach tcpci_ca = {
+const struct cfattach tcpci_ca = {
 	sizeof(struct tcpci_softc),
 	tcpci_match,
 	tcpci_attach,
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
index 0aa7ed5c69b..421f38be60e 100644
--- a/sys/dev/gpio/gpio.c
+++ b/sys/dev/gpio/gpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpio.c,v 1.15 2017/08/18 12:15:35 jsg Exp $	*/
+/*	$OpenBSD: gpio.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -54,7 +54,7 @@ int	gpio_search(struct device *, void *, void *);
 int	gpio_print(void *, const char *);
 int	gpio_pinbyname(struct gpio_softc *, char *gp_name);
 
-struct cfattach gpio_ca = {
+const struct cfattach gpio_ca = {
 	sizeof (struct gpio_softc),
 	gpio_match,
 	gpio_attach,
diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c
index c638f7e113e..3c5f8e04764 100644
--- a/sys/dev/gpio/gpioiic.c
+++ b/sys/dev/gpio/gpioiic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpioiic.c,v 1.10 2013/04/19 23:44:34 miod Exp $	*/
+/*	$OpenBSD: gpioiic.c,v 1.11 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -74,7 +74,7 @@ void		gpioiic_bb_set_bits(void *, u_int32_t);
 void		gpioiic_bb_set_dir(void *, u_int32_t);
 u_int32_t	gpioiic_bb_read_bits(void *);
 
-struct cfattach gpioiic_ca = {
+const struct cfattach gpioiic_ca = {
 	sizeof(struct gpioiic_softc),
 	gpioiic_match,
 	gpioiic_attach,
diff --git a/sys/dev/gpio/gpioow.c b/sys/dev/gpio/gpioow.c
index 64d79ab0cb8..43d5d6d8950 100644
--- a/sys/dev/gpio/gpioow.c
+++ b/sys/dev/gpio/gpioow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpioow.c,v 1.5 2011/07/03 15:47:16 matthew Exp $	*/
+/*	$OpenBSD: gpioow.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -59,7 +59,7 @@ void	gpioow_bb_tx(void *);
 int	gpioow_bb_get(void *);
 void	gpioow_bb_set(void *, int);
 
-struct cfattach gpioow_ca = {
+const struct cfattach gpioow_ca = {
 	sizeof(struct gpioow_softc),
 	gpioow_match,
 	gpioow_attach,
diff --git a/sys/dev/gpio/gpiosim.c b/sys/dev/gpio/gpiosim.c
index f4ee74bd512..18c67f595ed 100644
--- a/sys/dev/gpio/gpiosim.c
+++ b/sys/dev/gpio/gpiosim.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: gpiosim.c,v 1.1 2008/11/23 18:46:49 mbalmer Exp $	*/
+/*      $OpenBSD: gpiosim.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Marc Balmer <mbalmer@openbsd.org>
@@ -54,7 +54,7 @@ int	gpiosim_pin_read(void *, int);
 void	gpiosim_pin_write(void *, int, int);
 void	gpiosim_pin_ctl(void *, int, int);
 
-struct cfattach gpiosim_ca = {
+const struct cfattach gpiosim_ca = {
 	sizeof(struct gpiosim_softc), gpiosim_match, gpiosim_attach
 };
 
diff --git a/sys/dev/hil/hilid.c b/sys/dev/hil/hilid.c
index ad65909d55d..46ad931f264 100644
--- a/sys/dev/hil/hilid.c
+++ b/sys/dev/hil/hilid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hilid.c,v 1.4 2005/01/09 23:49:36 miod Exp $	*/
+/*	$OpenBSD: hilid.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -53,7 +53,7 @@ struct cfdriver hilid_cd = {
 	NULL, "hilid", DV_DULL
 };
 
-struct cfattach hilid_ca = {
+const struct cfattach hilid_ca = {
 	sizeof(struct hilid_softc), hilidprobe, hilidattach, hiliddetach,
 };
 
diff --git a/sys/dev/hil/hilkbd.c b/sys/dev/hil/hilkbd.c
index 069e8f0735b..a7807db9c4c 100644
--- a/sys/dev/hil/hilkbd.c
+++ b/sys/dev/hil/hilkbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hilkbd.c,v 1.17 2017/03/11 11:55:03 mpi Exp $	*/
+/*	$OpenBSD: hilkbd.c,v 1.18 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -75,7 +75,7 @@ struct cfdriver hilkbd_cd = {
 	NULL, "hilkbd", DV_DULL
 };
 
-struct cfattach hilkbd_ca = {
+const struct cfattach hilkbd_ca = {
 	sizeof(struct hilkbd_softc), hilkbdprobe, hilkbdattach, hilkbddetach,
 };
 
diff --git a/sys/dev/hil/hilms.c b/sys/dev/hil/hilms.c
index a59b7949925..c13d1bd4536 100644
--- a/sys/dev/hil/hilms.c
+++ b/sys/dev/hil/hilms.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hilms.c,v 1.6 2016/06/05 20:15:54 bru Exp $	*/
+/*	$OpenBSD: hilms.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -62,7 +62,7 @@ struct cfdriver hilms_cd = {
 	NULL, "hilms", DV_DULL
 };
 
-struct cfattach hilms_ca = {
+const struct cfattach hilms_ca = {
 	sizeof(struct hilms_softc), hilmsprobe, hilmsattach, hilmsdetach,
 };
 
diff --git a/sys/dev/i2c/abx80x.c b/sys/dev/i2c/abx80x.c
index ff810566512..80c51281efe 100644
--- a/sys/dev/i2c/abx80x.c
+++ b/sys/dev/i2c/abx80x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: abx80x.c,v 1.6 2020/04/29 19:18:31 patrick Exp $	*/
+/*	$OpenBSD: abx80x.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se>
@@ -72,7 +72,7 @@ struct abcrtc_softc {
 int	abcrtc_match(struct device *, void *, void *);
 void	abcrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach abcrtc_ca = {
+const struct cfattach abcrtc_ca = {
 	sizeof(struct abcrtc_softc), abcrtc_match, abcrtc_attach
 };
 
diff --git a/sys/dev/i2c/ad741x.c b/sys/dev/i2c/ad741x.c
index e4b9b67dc98..c95f48f5d4d 100644
--- a/sys/dev/i2c/ad741x.c
+++ b/sys/dev/i2c/ad741x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ad741x.c,v 1.14 2008/04/17 19:01:48 deraadt Exp $	*/
+/*	$OpenBSD: ad741x.c,v 1.15 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -56,7 +56,7 @@ int	adc_match(struct device *, void *, void *);
 void	adc_attach(struct device *, struct device *, void *);
 void	adc_refresh(void *);
 
-struct cfattach adc_ca = {
+const struct cfattach adc_ca = {
 	sizeof(struct adc_softc), adc_match, adc_attach
 };
 
diff --git a/sys/dev/i2c/adm1021.c b/sys/dev/i2c/adm1021.c
index 3bf90ee934b..f6dc07ccd4c 100644
--- a/sys/dev/i2c/adm1021.c
+++ b/sys/dev/i2c/adm1021.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1021.c,v 1.28 2011/03/10 23:14:30 deraadt Exp $	*/
+/*	$OpenBSD: adm1021.c,v 1.29 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -54,7 +54,7 @@ int	admtemp_match(struct device *, void *, void *);
 void	admtemp_attach(struct device *, struct device *, void *);
 void	admtemp_refresh(void *);
 
-struct cfattach admtemp_ca = {
+const struct cfattach admtemp_ca = {
 	sizeof(struct admtemp_softc), admtemp_match, admtemp_attach
 };
 
diff --git a/sys/dev/i2c/adm1024.c b/sys/dev/i2c/adm1024.c
index e826660e4b5..506a2dd5103 100644
--- a/sys/dev/i2c/adm1024.c
+++ b/sys/dev/i2c/adm1024.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1024.c,v 1.14 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: adm1024.c,v 1.15 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -71,7 +71,7 @@ int	admlc_match(struct device *, void *, void *);
 void	admlc_attach(struct device *, struct device *, void *);
 void	admlc_refresh(void *);
 
-struct cfattach admlc_ca = {
+const struct cfattach admlc_ca = {
 	sizeof(struct admlc_softc), admlc_match, admlc_attach
 };
 
diff --git a/sys/dev/i2c/adm1025.c b/sys/dev/i2c/adm1025.c
index 5a92ab081b7..37034714260 100644
--- a/sys/dev/i2c/adm1025.c
+++ b/sys/dev/i2c/adm1025.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1025.c,v 1.25 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: adm1025.c,v 1.26 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -71,7 +71,7 @@ int	admtm_match(struct device *, void *, void *);
 void	admtm_attach(struct device *, struct device *, void *);
 void	admtm_refresh(void *);
 
-struct cfattach admtm_ca = {
+const struct cfattach admtm_ca = {
 	sizeof(struct admtm_softc), admtm_match, admtm_attach
 };
 
diff --git a/sys/dev/i2c/adm1026.c b/sys/dev/i2c/adm1026.c
index d1de8f2e480..47db8a75f52 100644
--- a/sys/dev/i2c/adm1026.c
+++ b/sys/dev/i2c/adm1026.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1026.c,v 1.11 2008/06/09 16:21:33 cnst Exp $	*/
+/*	$OpenBSD: adm1026.c,v 1.12 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -87,7 +87,7 @@ int	admcts_match(struct device *, void *, void *);
 void	admcts_attach(struct device *, struct device *, void *);
 void	admcts_refresh(void *);
 
-struct cfattach admcts_ca = {
+const struct cfattach admcts_ca = {
 	sizeof(struct admcts_softc), admcts_match, admcts_attach
 };
 
diff --git a/sys/dev/i2c/adm1030.c b/sys/dev/i2c/adm1030.c
index cf47d472df1..eefe7ff7ab3 100644
--- a/sys/dev/i2c/adm1030.c
+++ b/sys/dev/i2c/adm1030.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1030.c,v 1.9 2008/05/01 23:02:05 deraadt Exp $	*/
+/*	$OpenBSD: adm1030.c,v 1.10 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -50,7 +50,7 @@ int	admtmp_match(struct device *, void *, void *);
 void	admtmp_attach(struct device *, struct device *, void *);
 void	admtmp_refresh(void *);
 
-struct cfattach admtmp_ca = {
+const struct cfattach admtmp_ca = {
 	sizeof(struct admtmp_softc), admtmp_match, admtmp_attach
 };
 
diff --git a/sys/dev/i2c/adm1031.c b/sys/dev/i2c/adm1031.c
index 0bf9dd54af3..f45fcf88a0c 100644
--- a/sys/dev/i2c/adm1031.c
+++ b/sys/dev/i2c/adm1031.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adm1031.c,v 1.8 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: adm1031.c,v 1.9 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -55,7 +55,7 @@ int	admtt_match(struct device *, void *, void *);
 void	admtt_attach(struct device *, struct device *, void *);
 void	admtt_refresh(void *);
 
-struct cfattach admtt_ca = {
+const struct cfattach admtt_ca = {
 	sizeof(struct admtt_softc), admtt_match, admtt_attach
 };
 
diff --git a/sys/dev/i2c/adt7460.c b/sys/dev/i2c/adt7460.c
index 98d0548fc30..bc11b634414 100644
--- a/sys/dev/i2c/adt7460.c
+++ b/sys/dev/i2c/adt7460.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adt7460.c,v 1.21 2007/12/12 16:56:59 deraadt Exp $	*/
+/*	$OpenBSD: adt7460.c,v 1.22 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -130,7 +130,7 @@ void	adt_attach(struct device *, struct device *, void *);
 
 void	adt_refresh(void *);
 
-struct cfattach adt_ca = {
+const struct cfattach adt_ca = {
 	sizeof(struct adt_softc), adt_match, adt_attach
 };
 
diff --git a/sys/dev/i2c/adt7462.c b/sys/dev/i2c/adt7462.c
index cbda0ef5679..e99ffcef723 100644
--- a/sys/dev/i2c/adt7462.c
+++ b/sys/dev/i2c/adt7462.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adt7462.c,v 1.6 2008/04/23 11:11:14 deraadt Exp $	*/
+/*	$OpenBSD: adt7462.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Theo de Raadt
@@ -77,7 +77,7 @@ int	adtfsm_match(struct device *, void *, void *);
 void	adtfsm_attach(struct device *, struct device *, void *);
 void	adtfsm_refresh(void *);
 
-struct cfattach adtfsm_ca = {
+const struct cfattach adtfsm_ca = {
 	sizeof(struct adtfsm_softc), adtfsm_match, adtfsm_attach
 };
 
diff --git a/sys/dev/i2c/asb100.c b/sys/dev/i2c/asb100.c
index 62a0e13d379..856bc683bb9 100644
--- a/sys/dev/i2c/asb100.c
+++ b/sys/dev/i2c/asb100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asb100.c,v 1.11 2008/04/17 19:01:48 deraadt Exp $	*/
+/*	$OpenBSD: asb100.c,v 1.12 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Damien Miller <djm@openbsd.org>
@@ -117,7 +117,7 @@ int	asbtm_match(struct device *, void *, void *);
 void	asbtm_attach(struct device *, struct device *, void *);
 void	asbtm_refresh(void *);
 
-struct cfattach asbtm_ca = {
+const struct cfattach asbtm_ca = {
 	sizeof(struct asbtm_softc), asbtm_match, asbtm_attach
 };
 
diff --git a/sys/dev/i2c/asc7611.c b/sys/dev/i2c/asc7611.c
index 2ebb2b32792..1d89c4334b1 100644
--- a/sys/dev/i2c/asc7611.c
+++ b/sys/dev/i2c/asc7611.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc7611.c,v 1.2 2009/01/26 15:07:49 kettenis Exp $	*/
+/*	$OpenBSD: asc7611.c,v 1.3 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -84,7 +84,7 @@ uint8_t	andl_readreg(struct andl_softc *, uint8_t);
 void	andl_writereg(struct andl_softc *, uint8_t, uint8_t);
 
 
-struct cfattach andl_ca = {
+const struct cfattach andl_ca = {
 	sizeof(struct andl_softc), andl_match, andl_attach
 };
 
diff --git a/sys/dev/i2c/asc7621.c b/sys/dev/i2c/asc7621.c
index cefca7685a2..94cd5acb510 100644
--- a/sys/dev/i2c/asc7621.c
+++ b/sys/dev/i2c/asc7621.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: asc7621.c,v 1.4 2007/10/31 20:46:17 cnst Exp $	*/
+/*	$OpenBSD: asc7621.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Mike Belopuhov
@@ -123,7 +123,7 @@ void	adl_attach(struct device *, struct device *, void *);
 
 void	adl_refresh(void *);
 
-struct cfattach adl_ca = {
+const struct cfattach adl_ca = {
 	sizeof(struct adl_softc), adl_match, adl_attach
 };
 
diff --git a/sys/dev/i2c/bmc150.c b/sys/dev/i2c/bmc150.c
index 732691594e6..e276c28084f 100644
--- a/sys/dev/i2c/bmc150.c
+++ b/sys/dev/i2c/bmc150.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bmc150.c,v 1.1 2017/11/30 14:53:21 kettenis Exp $	*/
+/*	$OpenBSD: bmc150.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2017 Mark Kettenis
@@ -59,7 +59,7 @@ struct bgw_softc {
 int	bgw_match(struct device *, void *, void *);
 void	bgw_attach(struct device *, struct device *, void *);
 
-struct cfattach bgw_ca = {
+const struct cfattach bgw_ca = {
 	sizeof(struct bgw_softc), bgw_match, bgw_attach
 };
 
diff --git a/sys/dev/i2c/ds1307.c b/sys/dev/i2c/ds1307.c
index c12ac4e3eb8..372a59d53bb 100644
--- a/sys/dev/i2c/ds1307.c
+++ b/sys/dev/i2c/ds1307.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ds1307.c,v 1.4 2022/01/09 05:42:37 jsg Exp $ */
+/*	$OpenBSD: ds1307.c,v 1.5 2022/04/06 18:59:28 naddy Exp $ */
 
 /*
  * Copyright (c) 2016 Marcus Glocker <mglocker@openbsd.org>
@@ -76,7 +76,7 @@ int	maxrtc_settime(struct todr_chip_handle *, struct timeval *);
 /*
  * Driver glue structures.
  */
-struct cfattach maxrtc_ca = {
+const struct cfattach maxrtc_ca = {
 	sizeof(struct maxrtc_softc), maxrtc_match, maxrtc_attach
 };
 
diff --git a/sys/dev/i2c/ds1631.c b/sys/dev/i2c/ds1631.c
index dd1cd5baf40..8cc254fcd4f 100644
--- a/sys/dev/i2c/ds1631.c
+++ b/sys/dev/i2c/ds1631.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ds1631.c,v 1.12 2016/05/12 21:00:23 kettenis Exp $	*/
+/*	$OpenBSD: ds1631.c,v 1.13 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -48,7 +48,7 @@ int	maxds_match(struct device *, void *, void *);
 void	maxds_attach(struct device *, struct device *, void *);
 void	maxds_refresh(void *);
 
-struct cfattach maxds_ca = {
+const struct cfattach maxds_ca = {
 	sizeof(struct maxds_softc), maxds_match, maxds_attach
 };
 
diff --git a/sys/dev/i2c/ds3231.c b/sys/dev/i2c/ds3231.c
index 888c892d57d..47f0d140ac5 100644
--- a/sys/dev/i2c/ds3231.c
+++ b/sys/dev/i2c/ds3231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ds3231.c,v 1.1 2020/04/25 15:10:52 kettenis Exp $	*/
+/*	$OpenBSD: ds3231.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -52,7 +52,7 @@ struct dsxrtc_softc {
 int	dsxrtc_match(struct device *, void *, void *);
 void	dsxrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach dsxrtc_ca = {
+const struct cfattach dsxrtc_ca = {
 	sizeof(struct dsxrtc_softc), dsxrtc_match, dsxrtc_attach
 };
 
diff --git a/sys/dev/i2c/fcu.c b/sys/dev/i2c/fcu.c
index 3d93aa5649f..746cccd0d70 100644
--- a/sys/dev/i2c/fcu.c
+++ b/sys/dev/i2c/fcu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fcu.c,v 1.7 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: fcu.c,v 1.8 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -59,7 +59,7 @@ void	fcu_attach(struct device *, struct device *, void *);
 
 void	fcu_refresh(void *);
 
-struct cfattach fcu_ca = {
+const struct cfattach fcu_ca = {
 	sizeof(struct fcu_softc), fcu_match, fcu_attach
 };
 
diff --git a/sys/dev/i2c/fintek.c b/sys/dev/i2c/fintek.c
index d8457f7d0b6..46d14de4d25 100644
--- a/sys/dev/i2c/fintek.c
+++ b/sys/dev/i2c/fintek.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fintek.c,v 1.8 2014/10/12 19:40:22 miod Exp $ */
+/*	$OpenBSD: fintek.c,v 1.9 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2006 Dale Rahn <drahn@openbsd.org>
  *
@@ -54,7 +54,7 @@ int	fintek_write_reg(struct fintek_softc *sc, u_int8_t cmd, u_int8_t *data,
 	    size_t size);
 void	fintek_fullspeed(struct fintek_softc *sc);
 
-struct cfattach fintek_ca = {
+const struct cfattach fintek_ca = {
 	sizeof(struct fintek_softc), fintek_match, fintek_attach
 };
 
diff --git a/sys/dev/i2c/gl518sm.c b/sys/dev/i2c/gl518sm.c
index d1c00429014..9159293fabe 100644
--- a/sys/dev/i2c/gl518sm.c
+++ b/sys/dev/i2c/gl518sm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gl518sm.c,v 1.6 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: gl518sm.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Mark Kettenis
@@ -69,7 +69,7 @@ void	glenv_attach(struct device *, struct device *, void *);
 
 void	glenv_refresh(void *);
 
-struct cfattach glenv_ca = {
+const struct cfattach glenv_ca = {
 	sizeof(struct glenv_softc), glenv_match, glenv_attach
 };
 
diff --git a/sys/dev/i2c/i2c.c b/sys/dev/i2c/i2c.c
index 48e0ec96a76..0d63b40d136 100644
--- a/sys/dev/i2c/i2c.c
+++ b/sys/dev/i2c/i2c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i2c.c,v 1.18 2022/02/09 07:58:24 visa Exp $	*/
+/*	$OpenBSD: i2c.c,v 1.19 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: i2c.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $	*/
 
 /*
@@ -56,7 +56,7 @@ int	iic_match(struct device *, void *, void *);
 void	iic_attach(struct device *, struct device *, void *);
 int	iic_search(struct device *, void *, void *);
 
-struct cfattach iic_ca = {
+const struct cfattach iic_ca = {
 	sizeof (struct iic_softc),
 	iic_match,
 	iic_attach
diff --git a/sys/dev/i2c/iatp.c b/sys/dev/i2c/iatp.c
index 216fb0e4b3e..7c233dede09 100644
--- a/sys/dev/i2c/iatp.c
+++ b/sys/dev/i2c/iatp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iatp.c,v 1.8 2020/08/26 03:29:06 visa Exp $ */
+/* $OpenBSD: iatp.c,v 1.9 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Atmel maXTouch i2c touchscreen/touchpad driver
  * Copyright (c) 2016 joshua stein <jcs@openbsd.org>
@@ -218,7 +218,7 @@ const struct wsmouse_accessops iatp_accessops = {
 	iatp_disable,
 };
 
-struct cfattach iatp_ca = {
+const struct cfattach iatp_ca = {
 	sizeof(struct iatp_softc),
 	iatp_match,
 	iatp_attach,
diff --git a/sys/dev/i2c/ihidev.c b/sys/dev/i2c/ihidev.c
index 50862ad5731..f6d95265790 100644
--- a/sys/dev/i2c/ihidev.c
+++ b/sys/dev/i2c/ihidev.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ihidev.c,v 1.25 2022/01/09 05:42:37 jsg Exp $ */
+/* $OpenBSD: ihidev.c,v 1.26 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * HID-over-i2c driver
  *
@@ -74,7 +74,7 @@ int	ihidev_maxrepid(void *buf, int len);
 int	ihidev_print(void *aux, const char *pnp);
 int	ihidev_submatch(struct device *parent, void *cf, void *aux);
 
-struct cfattach ihidev_ca = {
+const struct cfattach ihidev_ca = {
 	sizeof(struct ihidev_softc),
 	ihidev_match,
 	ihidev_attach,
diff --git a/sys/dev/i2c/ipmi_i2c.c b/sys/dev/i2c/ipmi_i2c.c
index 41f86dbdf0e..d330fe7a75a 100644
--- a/sys/dev/i2c/ipmi_i2c.c
+++ b/sys/dev/i2c/ipmi_i2c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi_i2c.c,v 1.3 2020/01/11 20:41:34 kettenis Exp $	*/
+/*	$OpenBSD: ipmi_i2c.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2019 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -57,7 +57,7 @@ extern void ipmi_attach(struct device *, struct device *, void *);
 int	ipmi_i2c_match(struct device *, void *, void *);
 void	ipmi_i2c_attach(struct device *, struct device *, void *);
 
-struct cfattach ipmi_i2c_ca = {
+const struct cfattach ipmi_i2c_ca = {
 	sizeof(struct ipmi_i2c_softc), ipmi_i2c_match, ipmi_i2c_attach
 };
 
diff --git a/sys/dev/i2c/isl1208.c b/sys/dev/i2c/isl1208.c
index ea16860efbe..87eda94afe3 100644
--- a/sys/dev/i2c/isl1208.c
+++ b/sys/dev/i2c/isl1208.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isl1208.c,v 1.3 2020/04/24 22:42:31 kettenis Exp $	*/
+/*	$OpenBSD: isl1208.c,v 1.4 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -51,7 +51,7 @@ struct islrtc_softc {
 int	islrtc_match(struct device *, void *, void *);
 void	islrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach islrtc_ca = {
+const struct cfattach islrtc_ca = {
 	sizeof(struct islrtc_softc), islrtc_match, islrtc_attach
 };
 
diff --git a/sys/dev/i2c/lis331dl.c b/sys/dev/i2c/lis331dl.c
index 76cef4b2df0..2fbffb50a84 100644
--- a/sys/dev/i2c/lis331dl.c
+++ b/sys/dev/i2c/lis331dl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lis331dl.c,v 1.1 2009/08/12 14:51:20 cnst Exp $	*/
+/*	$OpenBSD: lis331dl.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -59,7 +59,7 @@ uint8_t	lisa_readreg(struct lisa_softc *, uint8_t);
 void	lisa_writereg(struct lisa_softc *, uint8_t, uint8_t);
 
 
-struct cfattach lisa_ca = {
+const struct cfattach lisa_ca = {
 	sizeof(struct lisa_softc), lisa_match, lisa_attach
 };
 
diff --git a/sys/dev/i2c/lm75.c b/sys/dev/i2c/lm75.c
index 60b17996e43..3cd1ec5a12f 100644
--- a/sys/dev/i2c/lm75.c
+++ b/sys/dev/i2c/lm75.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lm75.c,v 1.20 2015/05/30 08:39:05 kettenis Exp $	*/
+/*	$OpenBSD: lm75.c,v 1.21 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: lm75.c,v 1.1 2003/09/30 00:35:31 thorpej Exp $	*/
 /*
  * Copyright (c) 2006 Theo de Raadt <deraadt@openbsd.org>
@@ -69,7 +69,7 @@ struct lmtemp_softc {
 int  lmtemp_match(struct device *, void *, void *);
 void lmtemp_attach(struct device *, struct device *, void *);
 
-struct cfattach lmtemp_ca = {
+const struct cfattach lmtemp_ca = {
 	sizeof(struct lmtemp_softc),
 	lmtemp_match,
 	lmtemp_attach
diff --git a/sys/dev/i2c/lm78_i2c.c b/sys/dev/i2c/lm78_i2c.c
index 5a2504991c8..9ed289e64d3 100644
--- a/sys/dev/i2c/lm78_i2c.c
+++ b/sys/dev/i2c/lm78_i2c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lm78_i2c.c,v 1.4 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: lm78_i2c.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -35,7 +35,7 @@ void lm_i2c_attach(struct device *, struct device *, void *);
 u_int8_t lm_i2c_readreg(struct lm_softc *, int);
 void lm_i2c_writereg(struct lm_softc *, int, int);
 
-struct cfattach lm_i2c_ca = {
+const struct cfattach lm_i2c_ca = {
 	sizeof(struct lm_i2c_softc), lm_i2c_match, lm_i2c_attach
 };
 
diff --git a/sys/dev/i2c/lm87.c b/sys/dev/i2c/lm87.c
index 7a9389777cd..8ec04f54a89 100644
--- a/sys/dev/i2c/lm87.c
+++ b/sys/dev/i2c/lm87.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lm87.c,v 1.20 2008/11/10 05:19:48 cnst Exp $	*/
+/*	$OpenBSD: lm87.c,v 1.21 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -72,7 +72,7 @@ void	lmenv_attach(struct device *, struct device *, void *);
 
 void	lmenv_refresh(void *);
 
-struct cfattach lmenv_ca = {
+const struct cfattach lmenv_ca = {
 	sizeof(struct lmenv_softc), lmenv_match, lmenv_attach
 };
 
diff --git a/sys/dev/i2c/lm93.c b/sys/dev/i2c/lm93.c
index 00b7b91dfb9..f72445c9d58 100644
--- a/sys/dev/i2c/lm93.c
+++ b/sys/dev/i2c/lm93.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lm93.c,v 1.8 2007/10/31 20:46:17 cnst Exp $	*/
+/*	$OpenBSD: lm93.c,v 1.9 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Theo de Raadt
@@ -131,7 +131,7 @@ void	lmn_attach(struct device *, struct device *, void *);
 
 void	lmn_refresh(void *);
 
-struct cfattach lmn_ca = {
+const struct cfattach lmn_ca = {
 	sizeof(struct lmn_softc), lmn_match, lmn_attach
 };
 
diff --git a/sys/dev/i2c/maxim6690.c b/sys/dev/i2c/maxim6690.c
index cf9261b1b5e..b0416426491 100644
--- a/sys/dev/i2c/maxim6690.c
+++ b/sys/dev/i2c/maxim6690.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: maxim6690.c,v 1.16 2007/10/20 22:06:43 cnst Exp $	*/
+/*	$OpenBSD: maxim6690.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -62,7 +62,7 @@ int	maxtmp_match(struct device *, void *, void *);
 void	maxtmp_attach(struct device *, struct device *, void *);
 void	maxtmp_refresh(void *);
 
-struct cfattach maxtmp_ca = {
+const struct cfattach maxtmp_ca = {
 	sizeof(struct maxtmp_softc), maxtmp_match, maxtmp_attach
 };
 
diff --git a/sys/dev/i2c/mcp794xx.c b/sys/dev/i2c/mcp794xx.c
index 93d2d5a5a89..a1b9990f16b 100644
--- a/sys/dev/i2c/mcp794xx.c
+++ b/sys/dev/i2c/mcp794xx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mcp794xx.c,v 1.1 2019/09/06 09:38:19 patrick Exp $	*/
+/*	$OpenBSD: mcp794xx.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2018 Patrick Wildt <patrick@blueri.se>
@@ -56,7 +56,7 @@ struct mcprtc_softc {
 int	mcprtc_match(struct device *, void *, void *);
 void	mcprtc_attach(struct device *, struct device *, void *);
 
-struct cfattach mcprtc_ca = {
+const struct cfattach mcprtc_ca = {
 	sizeof(struct mcprtc_softc), mcprtc_match, mcprtc_attach
 };
 
diff --git a/sys/dev/i2c/pca9532.c b/sys/dev/i2c/pca9532.c
index 15635a7f500..1299f3c7b9d 100644
--- a/sys/dev/i2c/pca9532.c
+++ b/sys/dev/i2c/pca9532.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pca9532.c,v 1.3 2008/04/17 16:50:17 deraadt Exp $ */
+/*	$OpenBSD: pca9532.c,v 1.4 2022/04/06 18:59:28 naddy Exp $ */
 /*
  * Copyright (c) 2006 Dale Rahn <drahn@openbsd.org>
  *
@@ -51,7 +51,7 @@ int pcaled_gpio_pin_read(void *arg, int pin);
 void pcaled_gpio_pin_write (void *arg, int pin, int value);
 void pcaled_gpio_pin_ctl (void *arg, int pin, int flags);
 
-struct cfattach pcaled_ca = {
+const struct cfattach pcaled_ca = {
 	sizeof(struct pcaled_softc), pcaled_match, pcaled_attach
 };
 
diff --git a/sys/dev/i2c/pca9548.c b/sys/dev/i2c/pca9548.c
index d47a26cbf27..c28717a4d9c 100644
--- a/sys/dev/i2c/pca9548.c
+++ b/sys/dev/i2c/pca9548.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pca9548.c,v 1.5 2020/11/14 21:50:51 patrick Exp $	*/
+/*	$OpenBSD: pca9548.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2020 Mark Kettenis
@@ -78,7 +78,7 @@ struct pcamux_crs {
 int	pcamux_match(struct device *, void *, void *);
 void	pcamux_attach(struct device *, struct device *, void *);
 
-struct cfattach pcamux_ca = {
+const struct cfattach pcamux_ca = {
 	sizeof(struct pcamux_softc), pcamux_match, pcamux_attach
 };
 
diff --git a/sys/dev/i2c/pca9554.c b/sys/dev/i2c/pca9554.c
index 41c71b68f45..d975c43dd36 100644
--- a/sys/dev/i2c/pca9554.c
+++ b/sys/dev/i2c/pca9554.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pca9554.c,v 1.18 2018/07/09 18:48:52 patrick Exp $	*/
+/*	$OpenBSD: pca9554.c,v 1.19 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Theo de Raadt
@@ -77,7 +77,7 @@ void	pcagpio_config_pin(void *, uint32_t *, int);
 int	pcagpio_get_pin(void *, uint32_t *);
 void	pcagpio_set_pin(void *, uint32_t *, int);
 
-struct cfattach pcagpio_ca = {
+const struct cfattach pcagpio_ca = {
 	sizeof(struct pcagpio_softc), pcagpio_match, pcagpio_attach
 };
 
diff --git a/sys/dev/i2c/pcf85063.c b/sys/dev/i2c/pcf85063.c
index 7f282e3fdee..f94b5118ffe 100644
--- a/sys/dev/i2c/pcf85063.c
+++ b/sys/dev/i2c/pcf85063.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcf85063.c,v 1.1 2021/11/22 20:20:20 kettenis Exp $	*/
+/*	$OpenBSD: pcf85063.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Kimihiro Nonaka
@@ -75,7 +75,7 @@ struct pcyrtc_softc {
 int pcyrtc_match(struct device *, void *, void *);
 void pcyrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach pcyrtc_ca = {
+const struct cfattach pcyrtc_ca = {
 	sizeof(struct pcyrtc_softc), pcyrtc_match, pcyrtc_attach
 };
 
diff --git a/sys/dev/i2c/pcf8523.c b/sys/dev/i2c/pcf8523.c
index 9576ebec492..a16047df867 100644
--- a/sys/dev/i2c/pcf8523.c
+++ b/sys/dev/i2c/pcf8523.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcf8523.c,v 1.6 2021/11/22 20:19:23 kettenis Exp $	*/
+/*	$OpenBSD: pcf8523.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Kimihiro Nonaka
@@ -90,7 +90,7 @@ struct pcfrtc_softc {
 int pcfrtc_match(struct device *, void *, void *);
 void pcfrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach pcfrtc_ca = {
+const struct cfattach pcfrtc_ca = {
 	sizeof(struct pcfrtc_softc), pcfrtc_match, pcfrtc_attach
 };
 
diff --git a/sys/dev/i2c/pcf8563.c b/sys/dev/i2c/pcf8563.c
index 02d33ff1420..ec214007883 100644
--- a/sys/dev/i2c/pcf8563.c
+++ b/sys/dev/i2c/pcf8563.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcf8563.c,v 1.5 2021/11/22 20:19:23 kettenis Exp $	*/
+/*	$OpenBSD: pcf8563.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Kimihiro Nonaka
@@ -77,7 +77,7 @@ struct pcxrtc_softc {
 int pcxrtc_match(struct device *, void *, void *);
 void pcxrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach pcxrtc_ca = {
+const struct cfattach pcxrtc_ca = {
 	sizeof(struct pcxrtc_softc), pcxrtc_match, pcxrtc_attach
 };
 
diff --git a/sys/dev/i2c/rs5c372.c b/sys/dev/i2c/rs5c372.c
index ad974de6ce3..44ba03da602 100644
--- a/sys/dev/i2c/rs5c372.c
+++ b/sys/dev/i2c/rs5c372.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rs5c372.c,v 1.6 2021/04/24 10:15:15 mpi Exp $	*/
+/*	$OpenBSD: rs5c372.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: rs5c372.c,v 1.5 2006/03/29 06:41:24 thorpej Exp $	*/
 
 /*
@@ -94,7 +94,7 @@ struct ricohrtc_softc {
 int ricohrtc_match(struct device *, void *, void *);
 void ricohrtc_attach(struct device *, struct device *, void *);
 
-struct cfattach ricohrtc_ca = {
+const struct cfattach ricohrtc_ca = {
 	sizeof(struct ricohrtc_softc), ricohrtc_match, ricohrtc_attach
 };
 
diff --git a/sys/dev/i2c/sdtemp.c b/sys/dev/i2c/sdtemp.c
index d33876749e3..05b41864cde 100644
--- a/sys/dev/i2c/sdtemp.c
+++ b/sys/dev/i2c/sdtemp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdtemp.c,v 1.15 2014/11/14 07:03:22 jsg Exp $	*/
+/*	$OpenBSD: sdtemp.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Theo de Raadt
@@ -43,7 +43,7 @@ int	sdtemp_match(struct device *, void *, void *);
 void	sdtemp_attach(struct device *, struct device *, void *);
 void	sdtemp_refresh(void *);
 
-struct cfattach sdtemp_ca = {
+const struct cfattach sdtemp_ca = {
 	sizeof(struct sdtemp_softc), sdtemp_match, sdtemp_attach
 };
 
diff --git a/sys/dev/i2c/spdmem_i2c.c b/sys/dev/i2c/spdmem_i2c.c
index d4df0d8b647..a04e0afcbaa 100644
--- a/sys/dev/i2c/spdmem_i2c.c
+++ b/sys/dev/i2c/spdmem_i2c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spdmem_i2c.c,v 1.1 2010/03/22 21:20:58 miod Exp $	*/
+/*	$OpenBSD: spdmem_i2c.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /* $NetBSD: spdmem.c,v 1.3 2007/09/20 23:09:59 xtraeme Exp $ */
 
 /*
@@ -68,7 +68,7 @@ int	spdmem_iic_match(struct device *, void *, void *);
 void	spdmem_iic_attach(struct device *, struct device *, void *);
 uint8_t	spdmem_iic_read(struct spdmem_softc *, uint8_t);
 
-struct cfattach spdmem_iic_ca = {
+const struct cfattach spdmem_iic_ca = {
 	sizeof(struct spdmem_iic_softc), spdmem_iic_match, spdmem_iic_attach
 };
 
diff --git a/sys/dev/i2c/thmc50.c b/sys/dev/i2c/thmc50.c
index 900c2da9b36..8c5068c89e0 100644
--- a/sys/dev/i2c/thmc50.c
+++ b/sys/dev/i2c/thmc50.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: thmc50.c,v 1.4 2007/10/17 17:14:54 deraadt Exp $	*/
+/*	$OpenBSD: thmc50.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Theo de Raadt
@@ -47,7 +47,7 @@ int	thmc_match(struct device *, void *, void *);
 void	thmc_attach(struct device *, struct device *, void *);
 void	thmc_refresh(void *);
 
-struct cfattach thmc_ca = {
+const struct cfattach thmc_ca = {
 	sizeof(struct thmc_softc), thmc_match, thmc_attach
 };
 
diff --git a/sys/dev/i2c/tmp451.c b/sys/dev/i2c/tmp451.c
index aa5b29a13f3..398d2a94983 100644
--- a/sys/dev/i2c/tmp451.c
+++ b/sys/dev/i2c/tmp451.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmp451.c,v 1.1 2021/06/23 15:25:39 kettenis Exp $	*/
+/*	$OpenBSD: tmp451.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -48,7 +48,7 @@ struct titmp_softc {
 int	titmp_match(struct device *, void *, void *);
 void	titmp_attach(struct device *, struct device *, void *);
 
-struct cfattach titmp_ca = {
+const struct cfattach titmp_ca = {
 	sizeof(struct titmp_softc), titmp_match, titmp_attach
 };
 
diff --git a/sys/dev/i2c/tsl2560.c b/sys/dev/i2c/tsl2560.c
index 197164bffe3..f552d3ea7ea 100644
--- a/sys/dev/i2c/tsl2560.c
+++ b/sys/dev/i2c/tsl2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tsl2560.c,v 1.7 2008/04/18 01:17:51 deraadt Exp $	*/
+/*	$OpenBSD: tsl2560.c,v 1.8 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -50,7 +50,7 @@ void	tsl_attach(struct device *, struct device *, void *);
 void	tsl_refresh(void *);
 u_int64_t tsl_lux(u_int32_t, u_int32_t);
 
-struct cfattach tsl_ca = {
+const struct cfattach tsl_ca = {
 	sizeof(struct tsl_softc), tsl_match, tsl_attach
 };
 
diff --git a/sys/dev/i2c/w83793g.c b/sys/dev/i2c/w83793g.c
index d637f0b3c41..b50d372e2b7 100644
--- a/sys/dev/i2c/w83793g.c
+++ b/sys/dev/i2c/w83793g.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w83793g.c,v 1.5 2009/01/26 15:07:49 kettenis Exp $	*/
+/*	$OpenBSD: w83793g.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
@@ -85,7 +85,7 @@ uint8_t	wbng_readreg(struct wbng_softc *, uint8_t);
 void	wbng_writereg(struct wbng_softc *, uint8_t, uint8_t);
 
 
-struct cfattach wbng_ca = {
+const struct cfattach wbng_ca = {
 	sizeof(struct wbng_softc), wbng_match, wbng_attach
 };
 
diff --git a/sys/dev/i2c/w83795g.c b/sys/dev/i2c/w83795g.c
index 1a8a7163ff6..1bd1d9c596f 100644
--- a/sys/dev/i2c/w83795g.c
+++ b/sys/dev/i2c/w83795g.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w83795g.c,v 1.1 2011/07/03 21:30:20 kettenis Exp $	*/
+/*	$OpenBSD: w83795g.c,v 1.2 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2011 Mark Kettenis
@@ -91,7 +91,7 @@ uint8_t	nvt_readreg(struct nvt_softc *, uint8_t);
 void	nvt_writereg(struct nvt_softc *, uint8_t, uint8_t);
 
 
-struct cfattach nvt_ca = {
+const struct cfattach nvt_ca = {
 	sizeof(struct nvt_softc), nvt_match, nvt_attach
 };
 
diff --git a/sys/dev/i2c/w83l784r.c b/sys/dev/i2c/w83l784r.c
index 0b33f8a432e..a813447ec95 100644
--- a/sys/dev/i2c/w83l784r.c
+++ b/sys/dev/i2c/w83l784r.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w83l784r.c,v 1.12 2007/06/24 05:34:35 dlg Exp $	*/
+/*	$OpenBSD: w83l784r.c,v 1.13 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Mark Kettenis
@@ -100,7 +100,7 @@ void	w83l785r_refresh_fanrpm(struct wbenv_softc *, int);
 u_int8_t wbenv_readreg(struct wbenv_softc *, u_int8_t);
 void	wbenv_writereg(struct wbenv_softc *, u_int8_t, u_int8_t);
 
-struct cfattach wbenv_ca = {
+const struct cfattach wbenv_ca = {
 	sizeof(struct wbenv_softc), wbenv_match, wbenv_attach
 };
 
diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c
index 5ea5b45aed2..069b97e3f4d 100644
--- a/sys/dev/ipmi.c
+++ b/sys/dev/ipmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi.c,v 1.115 2021/01/23 12:10:08 kettenis Exp $ */
+/*	$OpenBSD: ipmi.c,v 1.116 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2015 Masao Uebayashi
@@ -1851,7 +1851,7 @@ void	ipmi_smbios_probe(struct smbios_ipmi *, struct ipmi_attach_args *);
 int	ipmi_match(struct device *, void *, void *);
 void	ipmi_attach(struct device *, struct device *, void *);
 
-struct cfattach ipmi_ca = {
+const struct cfattach ipmi_ca = {
 	sizeof(struct ipmi_softc), ipmi_match, ipmi_attach,
 	NULL, ipmi_activate
 };
diff --git a/sys/dev/isa/addcom_isa.c b/sys/dev/isa/addcom_isa.c
index 35a91988e73..65752117b2a 100644
--- a/sys/dev/isa/addcom_isa.c
+++ b/sys/dev/isa/addcom_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: addcom_isa.c,v 1.6 2002/03/14 01:26:56 millert Exp $	*/
+/*	$OpenBSD: addcom_isa.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: addcom_isa.c,v 1.2 2000/04/21 20:13:41 explorer Exp $	*/
 
 /*
@@ -111,7 +111,7 @@ void addcomattach(struct device *, struct device *, void *);
 int addcomintr(void *);
 int addcomprint(void *, const char *);
 
-struct cfattach addcom_isa_ca = {
+const struct cfattach addcom_isa_ca = {
 	sizeof(struct addcom_softc), addcomprobe, addcomattach,
 };
 
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 47d315d43fc..a6b7942b49b 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_isa.c,v 1.9 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: aic_isa.c,v 1.10 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 /*
@@ -75,7 +75,7 @@
 int	aic_isa_probe(struct device *, void *, void *);
 void	aic_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach aic_isa_ca = {
+const struct cfattach aic_isa_ca = {
 	sizeof(struct aic_softc), aic_isa_probe, aic_isa_attach
 };
 
diff --git a/sys/dev/isa/aic_isapnp.c b/sys/dev/isa/aic_isapnp.c
index eff8697555f..c60536cb49d 100644
--- a/sys/dev/isa/aic_isapnp.c
+++ b/sys/dev/isa/aic_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_isapnp.c,v 1.2 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: aic_isapnp.c,v 1.3 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2002 Anders Arnholm
@@ -51,7 +51,7 @@
 int	aic_isapnp_match(struct device *, void *, void *);
 void	aic_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach aic_isapnp_ca = {
+const struct cfattach aic_isapnp_ca = {
 	sizeof(struct aic_softc), aic_isapnp_match, aic_isapnp_attach
 };
 
diff --git a/sys/dev/isa/aps.c b/sys/dev/isa/aps.c
index 5bc17883d7d..93e5069c6c4 100644
--- a/sys/dev/isa/aps.c
+++ b/sys/dev/isa/aps.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aps.c,v 1.27 2022/01/09 05:42:42 jsg Exp $	*/
+/*	$OpenBSD: aps.c,v 1.28 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2005 Jonathan Gray <jsg@openbsd.org>
  * Copyright (c) 2008 Can Erkin Acar <canacar@openbsd.org>
@@ -155,7 +155,7 @@ void	 aps_refresh(void *);
 int	 aps_do_io(bus_space_tag_t, bus_space_handle_t,
 		   unsigned char *, int, int);
 
-struct cfattach aps_ca = {
+const struct cfattach aps_ca = {
 	sizeof(struct aps_softc),
 	aps_match, aps_attach, NULL, aps_activate
 };
diff --git a/sys/dev/isa/ast.c b/sys/dev/isa/ast.c
index 40d776f745d..1212743d27b 100644
--- a/sys/dev/isa/ast.c
+++ b/sys/dev/isa/ast.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ast.c,v 1.19 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: ast.c,v 1.20 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: ast.c,v 1.28 1996/05/12 23:51:45 mycroft Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ void astattach(struct device *, struct device *, void *);
 int astintr(void *);
 int astprint(void *, const char *);
 
-struct cfattach ast_ca = {
+const struct cfattach ast_ca = {
 	sizeof(struct ast_softc), astprobe, astattach
 };
 
diff --git a/sys/dev/isa/boca.c b/sys/dev/isa/boca.c
index 06ce953f5b5..111dea29ec4 100644
--- a/sys/dev/isa/boca.c
+++ b/sys/dev/isa/boca.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boca.c,v 1.16 2002/03/14 01:26:56 millert Exp $ */
+/*	$OpenBSD: boca.c,v 1.17 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: boca.c,v 1.15 1996/05/12 23:51:50 mycroft Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ void bocaattach(struct device *, struct device *, void *);
 int bocaintr(void *);
 int bocaprint(void *, const char *);
 
-struct cfattach boca_ca = {
+const struct cfattach boca_ca = {
 	sizeof(struct boca_softc), bocaprobe, bocaattach,
 };
 
diff --git a/sys/dev/isa/com_commulti.c b/sys/dev/isa/com_commulti.c
index 9247334d4ab..c250f2a8ee4 100644
--- a/sys/dev/isa/com_commulti.c
+++ b/sys/dev/isa/com_commulti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_commulti.c,v 1.5 2017/04/30 13:04:49 mpi Exp $	*/
+/*	$OpenBSD: com_commulti.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
  *
@@ -75,7 +75,7 @@
 int com_commulti_probe(struct device *, void *, void *);
 void com_commulti_attach(struct device *, struct device *, void *);
 
-struct cfattach com_commulti_ca = {
+const struct cfattach com_commulti_ca = {
         sizeof(struct com_softc), com_commulti_probe, com_commulti_attach
 };
 
diff --git a/sys/dev/isa/com_isa.c b/sys/dev/isa/com_isa.c
index b7d420a613c..04a0bfd45da 100644
--- a/sys/dev/isa/com_isa.c
+++ b/sys/dev/isa/com_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_isa.c,v 1.9 2017/04/30 13:04:49 mpi Exp $	*/
+/*	$OpenBSD: com_isa.c,v 1.10 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
  *
@@ -74,7 +74,7 @@
 int com_isa_probe(struct device *, void *, void *);
 void com_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach com_isa_ca = {
+const struct cfattach com_isa_ca = {
 	sizeof(struct com_softc), com_isa_probe, com_isa_attach, NULL,
 	com_activate
 };
diff --git a/sys/dev/isa/com_isapnp.c b/sys/dev/isa/com_isapnp.c
index 6e030839139..fceec13f330 100644
--- a/sys/dev/isa/com_isapnp.c
+++ b/sys/dev/isa/com_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_isapnp.c,v 1.5 2017/04/30 13:04:49 mpi Exp $	*/
+/*	$OpenBSD: com_isapnp.c,v 1.6 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
  *
@@ -75,7 +75,7 @@
 int com_isapnp_probe(struct device *, void *, void *);
 void com_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach com_isapnp_ca = {
+const struct cfattach com_isapnp_ca = {
 	sizeof(struct com_softc), com_isapnp_probe, com_isapnp_attach
 };
 
diff --git a/sys/dev/isa/cy_isa.c b/sys/dev/isa/cy_isa.c
index 4b4a56dc3b9..230a8eeea56 100644
--- a/sys/dev/isa/cy_isa.c
+++ b/sys/dev/isa/cy_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cy_isa.c,v 1.10 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: cy_isa.c,v 1.11 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 1996 Timo Rossi.
  * All rights reserved.
@@ -52,7 +52,7 @@
 static int cy_isa_probe(struct device *, void *, void *);
 void cy_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach cy_isa_ca = {
+const struct cfattach cy_isa_ca = {
 	sizeof(struct cy_softc), cy_isa_probe, cy_isa_attach
 };
 
diff --git a/sys/dev/isa/ess_isapnp.c b/sys/dev/isa/ess_isapnp.c
index b1a0e580078..22381ecc901 100644
--- a/sys/dev/isa/ess_isapnp.c
+++ b/sys/dev/isa/ess_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ess_isapnp.c,v 1.7 2013/11/15 16:46:27 brad Exp $	*/
+/*	$OpenBSD: ess_isapnp.c,v 1.8 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: ess_isa.c,v 1.4 1999/03/18 20:57:11 mycroft Exp $	*/
 
 /*-
@@ -53,7 +53,7 @@
 int ess_isapnp_probe(struct device *, void *, void *);
 void ess_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach ess_isapnp_ca = {
+const struct cfattach ess_isapnp_ca = {
 	sizeof(struct ess_softc), ess_isapnp_probe, ess_isapnp_attach
 };
 
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 453a50905f6..644a51ba924 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.107 2020/02/07 13:35:08 cheloha Exp $	*/
+/*	$OpenBSD: fd.c,v 1.108 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -129,7 +129,7 @@ int fdprobe(struct device *, void *, void *);
 void fdattach(struct device *, struct device *, void *);
 int fdactivate(struct device *, int);
 
-struct cfattach fd_ca = {
+const struct cfattach fd_ca = {
 	sizeof(struct fd_softc), fdprobe, fdattach, NULL, fdactivate
 };
 
diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c
index 973be4ecf70..db3c9e0b9f4 100644
--- a/sys/dev/isa/fdc.c
+++ b/sys/dev/isa/fdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdc.c,v 1.23 2017/12/30 20:46:59 guenther Exp $	*/
+/*	$OpenBSD: fdc.c,v 1.24 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -82,7 +82,7 @@ void fdcattach(struct device *, struct device *, void *);
 void fdcattach_deferred(void *);
 void fdc_create_kthread(void *);
 
-struct cfattach fdc_ca = {
+const struct cfattach fdc_ca = {
 	sizeof(struct fdc_softc), fdcprobe, fdcattach
 };
 
diff --git a/sys/dev/isa/fins.c b/sys/dev/isa/fins.c
index 5fd0a256466..7261317d34c 100644
--- a/sys/dev/isa/fins.c
+++ b/sys/dev/isa/fins.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fins.c,v 1.4 2014/12/10 12:27:57 mikeb Exp $	*/
+/*	$OpenBSD: fins.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Mark Kettenis
@@ -148,7 +148,7 @@ void fins_get_volt(struct fins_softc *, int);
 
 int fins_wdog_cb(void *, int);
 
-struct cfattach fins_ca = {
+const struct cfattach fins_ca = {
 	sizeof(struct fins_softc),
 	fins_match,
 	fins_attach,
diff --git a/sys/dev/isa/gscsio.c b/sys/dev/isa/gscsio.c
index 8e0665439b0..80085e351a3 100644
--- a/sys/dev/isa/gscsio.c
+++ b/sys/dev/isa/gscsio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gscsio.c,v 1.13 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: gscsio.c,v 1.14 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -81,7 +81,7 @@ int	gscsio_acb_initiate_xfer(void *, i2c_addr_t, int);
 int	gscsio_acb_read_byte(void *, uint8_t *, int);
 int	gscsio_acb_write_byte(void *, uint8_t, int);
 
-struct cfattach gscsio_ca = {
+const struct cfattach gscsio_ca = {
 	sizeof(struct gscsio_softc),
 	gscsio_probe,
 	gscsio_attach
diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c
index f4b321032b5..28886f791dd 100644
--- a/sys/dev/isa/gus_isa.c
+++ b/sys/dev/isa/gus_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isa.c,v 1.8 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: gus_isa.c,v 1.9 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -126,7 +126,7 @@
 int	gus_isa_match(struct device *, void *, void *);
 void	gus_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach gus_isa_ca = {
+const struct cfattach gus_isa_ca = {
 	sizeof(struct gus_softc), gus_isa_match, gus_isa_attach,
 };
 
diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c
index fc5b9a38a7c..56277cc3d6d 100644
--- a/sys/dev/isa/gus_isapnp.c
+++ b/sys/dev/isa/gus_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isapnp.c,v 1.9 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: gus_isapnp.c,v 1.10 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -122,7 +122,7 @@
 int	gus_isapnp_match(struct device *, void *, void *);
 void	gus_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach gus_isapnp_ca = {
+const struct cfattach gus_isapnp_ca = {
 	sizeof(struct gus_softc), gus_isapnp_match, gus_isapnp_attach
 };
 
diff --git a/sys/dev/isa/hsq.c b/sys/dev/isa/hsq.c
index 0c74f36f15b..f1e2d2d65e5 100644
--- a/sys/dev/isa/hsq.c
+++ b/sys/dev/isa/hsq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hsq.c,v 1.6 2022/01/09 05:42:42 jsg Exp $	*/
+/*	$OpenBSD: hsq.c,v 1.7 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*-
  * Copyright (c) 1999 Denis A. Doroshenko. All rights reserved.
@@ -111,7 +111,7 @@ void hsqattach(struct device *, struct device *, void *);
 int hsqintr(void *);
 int hsqprint(void *, const char *);
 
-struct cfattach hsq_ca = {
+const struct cfattach hsq_ca = {
 	sizeof(struct hsq_softc), hsqprobe, hsqattach
 };
 
diff --git a/sys/dev/isa/i82365_isa.c b/sys/dev/isa/i82365_isa.c
index b46be330451..45865798ce8 100644
--- a/sys/dev/isa/i82365_isa.c
+++ b/sys/dev/isa/i82365_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isa.c,v 1.24 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: i82365_isa.c,v 1.25 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: i82365_isa.c,v 1.11 1998/06/09 07:25:00 thorpej Exp $	*/
 
 /*
@@ -60,7 +60,7 @@
 int	pcic_isa_probe(struct device *, void *, void *);
 void	pcic_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach pcic_isa_ca = {
+const struct cfattach pcic_isa_ca = {
 	sizeof(struct pcic_softc), pcic_isa_probe, pcic_isa_attach
 };
 
diff --git a/sys/dev/isa/i82365_isapnp.c b/sys/dev/isa/i82365_isapnp.c
index 39430ce7c23..fe10f1cc313 100644
--- a/sys/dev/isa/i82365_isapnp.c
+++ b/sys/dev/isa/i82365_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365_isapnp.c,v 1.10 2021/03/07 06:17:03 jsg Exp $ */
+/*	$OpenBSD: i82365_isapnp.c,v 1.11 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: i82365_isapnp.c,v 1.8 2000/02/23 17:22:11 soren Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ int	pcicisapnp_debug = 0 /* XXX */ ;
 int	pcic_isapnp_match(struct device *, void *, void *);
 void	pcic_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach pcic_isapnp_ca = {
+const struct cfattach pcic_isapnp_ca = {
 	sizeof(struct pcic_softc), pcic_isapnp_match, pcic_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_an_isapnp.c b/sys/dev/isa/if_an_isapnp.c
index 4b0227614bc..61c0f3d4f3d 100644
--- a/sys/dev/isa/if_an_isapnp.c
+++ b/sys/dev/isa/if_an_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_isapnp.c,v 1.10 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_an_isapnp.c,v 1.11 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -53,7 +53,7 @@
 int an_isapnp_match(struct device *, void *, void *);
 void an_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach an_isapnp_ca = {
+const struct cfattach an_isapnp_ca = {
 	sizeof(struct an_softc), an_isapnp_match, an_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_ec.c b/sys/dev/isa/if_ec.c
index 86464561d77..ee3fa381f9f 100644
--- a/sys/dev/isa/if_ec.c
+++ b/sys/dev/isa/if_ec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ec.c,v 1.18 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: if_ec.c,v 1.19 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ec.c,v 1.9 1998/07/05 06:49:12 jonathan Exp $	*/
 
 /*-
@@ -92,7 +92,7 @@ struct ec_softc {
 int	ec_probe(struct device *, void *, void *);
 void	ec_attach(struct device *, struct device *, void *);
 
-struct cfattach ec_ca = {
+const struct cfattach ec_ca = {
 	sizeof(struct ec_softc), ec_probe, ec_attach
 };
 
diff --git a/sys/dev/isa/if_ef_isapnp.c b/sys/dev/isa/if_ef_isapnp.c
index b85cf17a234..d1d28341cdd 100644
--- a/sys/dev/isa/if_ef_isapnp.c
+++ b/sys/dev/isa/if_ef_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ef_isapnp.c,v 1.40 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: if_ef_isapnp.c,v 1.41 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -129,7 +129,7 @@ struct cfdriver ef_cd = {
 	NULL, "ef", DV_IFNET
 };
 
-struct cfattach ef_isapnp_ca = {
+const struct cfattach ef_isapnp_ca = {
 	sizeof(struct ef_softc), ef_isapnp_match, ef_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_eg.c b/sys/dev/isa/if_eg.c
index abbd04dc03f..53249f70077 100644
--- a/sys/dev/isa/if_eg.c
+++ b/sys/dev/isa/if_eg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_eg.c,v 1.50 2020/07/10 13:22:20 patrick Exp $	*/
+/*	$OpenBSD: if_eg.c,v 1.51 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_eg.c,v 1.26 1996/05/12 23:52:27 mycroft Exp $	*/
 
 /*
@@ -97,7 +97,7 @@ struct eg_softc {
 int egprobe(struct device *, void *, void *);
 void egattach(struct device *, struct device *, void *);
 
-struct cfattach eg_ca = {
+const struct cfattach eg_ca = {
 	sizeof(struct eg_softc), egprobe, egattach
 };
 
diff --git a/sys/dev/isa/if_el.c b/sys/dev/isa/if_el.c
index 40904e5893f..e99011002e3 100644
--- a/sys/dev/isa/if_el.c
+++ b/sys/dev/isa/if_el.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: if_el.c,v 1.36 2021/03/07 06:17:03 jsg Exp $       */
+/*    $OpenBSD: if_el.c,v 1.37 2022/04/06 18:59:28 naddy Exp $       */
 /*	$NetBSD: if_el.c,v 1.39 1996/05/12 23:52:32 mycroft Exp $	*/
 
 /*
@@ -82,7 +82,7 @@ static inline void el_hardreset(struct el_softc *);
 int elprobe(struct device *, void *, void *);
 void elattach(struct device *, struct device *, void *);
 
-struct cfattach el_ca = {
+const struct cfattach el_ca = {
 	sizeof(struct el_softc), elprobe, elattach
 };
 
diff --git a/sys/dev/isa/if_ep_isa.c b/sys/dev/isa/if_ep_isa.c
index 5855e6a8bbf..9ddcf3dca99 100644
--- a/sys/dev/isa/if_ep_isa.c
+++ b/sys/dev/isa/if_ep_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_isa.c,v 1.31 2015/11/25 11:20:38 mpi Exp $	*/
+/*	$OpenBSD: if_ep_isa.c,v 1.32 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ep_isa.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $	*/
 
 /*
@@ -76,7 +76,7 @@
 int ep_isa_probe(struct device *, void *, void *);
 void ep_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach ep_isa_ca = {
+const struct cfattach ep_isa_ca = {
 	sizeof(struct ep_softc), ep_isa_probe, ep_isa_attach
 };
 
diff --git a/sys/dev/isa/if_ep_isapnp.c b/sys/dev/isa/if_ep_isapnp.c
index 70546539e06..bb7f5b784f8 100644
--- a/sys/dev/isa/if_ep_isapnp.c
+++ b/sys/dev/isa/if_ep_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_isapnp.c,v 1.16 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_ep_isapnp.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ep_isapnp.c,v 1.5 1996/05/12 23:52:36 mycroft Exp $	*/
 
 /*
@@ -76,7 +76,7 @@
 int ep_isapnp_match(struct device *, void *, void *);
 void ep_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach ep_isapnp_ca = {
+const struct cfattach ep_isapnp_ca = {
 	sizeof(struct ep_softc), ep_isapnp_match, ep_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 88249fe0516..6de88afe168 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ex.c,v 1.47 2020/07/10 13:26:37 patrick Exp $	*/
+/*	$OpenBSD: if_ex.c,v 1.48 2022/04/06 18:59:28 naddy Exp $	*/
 /*
  * Copyright (c) 1997, Donald A. Schmidt
  * Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -121,7 +121,7 @@ int ex_intr(void *);
 void ex_tx_intr(struct ex_softc *);
 void ex_rx_intr(struct ex_softc *);
 
-struct cfattach ex_ca = {
+const struct cfattach ex_ca = {
 	sizeof(struct ex_softc), ex_probe, ex_attach
 };
 
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 21eeb91610d..38aba160698 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.58 2022/02/22 01:15:01 guenther Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.59 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -303,7 +303,7 @@ static __inline int ie_packet_len(struct ie_softc *);
 
 static void run_tdr(struct ie_softc *, struct ie_tdr_cmd *);
 
-struct cfattach ie_isa_ca = {
+const struct cfattach ie_isa_ca = {
 	sizeof(struct ie_softc), ieprobe, ieattach
 };
 
diff --git a/sys/dev/isa/if_lc_isa.c b/sys/dev/isa/if_lc_isa.c
index d9ea5700d23..91b0c4fb7ce 100644
--- a/sys/dev/isa/if_lc_isa.c
+++ b/sys/dev/isa/if_lc_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lc_isa.c,v 1.13 2021/03/07 06:17:03 jsg Exp $ */
+/*	$OpenBSD: if_lc_isa.c,v 1.14 2022/04/06 18:59:28 naddy Exp $ */
 /*	$NetBSD: if_lc_isa.c,v 1.10 2001/06/13 10:46:03 wiz Exp $ */
 
 /*-
@@ -72,7 +72,7 @@ int	lemac_isa_find(struct lemac_softc *, struct isa_attach_args *,
 int	lemac_isa_probe(struct device *, void *, void *);
 void	lemac_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach lc_isa_ca = {
+const struct cfattach lc_isa_ca = {
 	sizeof(struct lemac_softc), lemac_isa_probe, lemac_isa_attach
 };
 
diff --git a/sys/dev/isa/if_le_isa.c b/sys/dev/isa/if_le_isa.c
index 00d852a7959..396855ea8ab 100644
--- a/sys/dev/isa/if_le_isa.c
+++ b/sys/dev/isa/if_le_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_isa.c,v 1.22 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: if_le_isa.c,v 1.23 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $	*/
 
 /*-
@@ -72,7 +72,7 @@ static char *card_type[] =
 int	le_isa_probe(struct device *, void *, void *);
 void	le_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach le_isa_ca = {
+const struct cfattach le_isa_ca = {
 	sizeof(struct le_softc), le_isa_probe, le_isa_attach
 };
 
diff --git a/sys/dev/isa/if_le_isapnp.c b/sys/dev/isa/if_le_isapnp.c
index cd596ba4fb0..867efd83431 100644
--- a/sys/dev/isa/if_le_isapnp.c
+++ b/sys/dev/isa/if_le_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_isapnp.c,v 1.14 2014/12/22 02:28:51 tedu Exp $	*/
+/*	$OpenBSD: if_le_isapnp.c,v 1.15 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_le_isa.c,v 1.2 1996/05/12 23:52:56 mycroft Exp $	*/
 
 /*-
@@ -69,7 +69,7 @@
 int	le_isapnp_match(struct device *, void *, void *);
 void	le_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach le_isapnp_ca = {
+const struct cfattach le_isapnp_ca = {
 	sizeof(struct le_softc), le_isapnp_match, le_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_ne_isa.c b/sys/dev/isa/if_ne_isa.c
index badabe3bc40..ceda5b786ad 100644
--- a/sys/dev/isa/if_ne_isa.c
+++ b/sys/dev/isa/if_ne_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isa.c,v 1.17 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_ne_isa.c,v 1.18 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ne_isa.c,v 1.6 1998/07/05 06:49:13 jonathan Exp $	*/
 
 /*-
@@ -77,7 +77,7 @@ struct ne_isa_softc {
 	void	*sc_ih;				/* interrupt cookie */
 };
 
-struct cfattach ne_isa_ca = {
+const struct cfattach ne_isa_ca = {
 	sizeof(struct ne_isa_softc), ne_isa_match, ne_isa_attach
 };
 
diff --git a/sys/dev/isa/if_ne_isapnp.c b/sys/dev/isa/if_ne_isapnp.c
index 54ba0f2acda..a7386a14cf3 100644
--- a/sys/dev/isa/if_ne_isapnp.c
+++ b/sys/dev/isa/if_ne_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_isapnp.c,v 1.16 2015/11/24 17:11:39 mpi Exp $	*/
+/*	$OpenBSD: if_ne_isapnp.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_ne_isapnp.c,v 1.7 1998/07/23 19:30:45 christos Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@ struct ne_isapnp_softc {
 	void	*sc_ih;				/* interrupt cookie */
 };
 
-struct cfattach ne_isapnp_ca = {
+const struct cfattach ne_isapnp_ca = {
 	sizeof(struct ne_isapnp_softc), ne_isapnp_match, ne_isapnp_attach
 };
 
diff --git a/sys/dev/isa/if_sm_isa.c b/sys/dev/isa/if_sm_isa.c
index 87270f830f2..57fde2b7690 100644
--- a/sys/dev/isa/if_sm_isa.c
+++ b/sys/dev/isa/if_sm_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_isa.c,v 1.15 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: if_sm_isa.c,v 1.16 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_sm_isa.c,v 1.4 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -75,7 +75,7 @@ struct sm_isa_softc {
 	void	*sc_ih;				/* interrupt cookie */
 };
 
-struct cfattach sm_isa_ca = {
+const struct cfattach sm_isa_ca = {
 	sizeof(struct sm_isa_softc), sm_isa_match, sm_isa_attach
 };
 
diff --git a/sys/dev/isa/if_we.c b/sys/dev/isa/if_we.c
index 985660e0c14..22bfa46dedf 100644
--- a/sys/dev/isa/if_we.c
+++ b/sys/dev/isa/if_we.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_we.c,v 1.27 2017/07/26 05:25:21 deraadt Exp $	*/
+/*	$OpenBSD: if_we.c,v 1.28 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: if_we.c,v 1.11 1998/07/05 06:49:14 jonathan Exp $	*/
 
 /*-
@@ -106,12 +106,12 @@ int	we_probe(struct device *, void *, void *);
 int	we_match(struct device *, void *, void *);
 void	we_attach(struct device *, struct device *, void *);
 
-struct cfattach we_isa_ca = {
+const struct cfattach we_isa_ca = {
 	sizeof(struct we_softc), we_probe, we_attach
 };
 
 #if NWE_ISAPNP
-struct cfattach we_isapnp_ca = {
+const struct cfattach we_isapnp_ca = {
 	sizeof(struct we_softc), we_match, we_attach
 };
 #endif /* NWE_ISAPNP */
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 8665c3eeab2..5a8685bea0d 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa.c,v 1.49 2021/10/26 16:29:49 deraadt Exp $	*/
+/*	$OpenBSD: isa.c,v 1.50 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: isa.c,v 1.85 1996/05/14 00:31:04 thorpej Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ void isaattach(struct device *, struct device *, void *);
 
 extern int autoconf_verbose;
 
-struct cfattach isa_ca = {
+const struct cfattach isa_ca = {
 	sizeof(struct isa_softc), isamatch, isaattach
 };
 
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 702f7a87d78..6c28253c8b6 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isadma.c,v 1.36 2021/10/26 16:29:49 deraadt Exp $	*/
+/*	$OpenBSD: isadma.c,v 1.37 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: isadma.c,v 1.32 1997/09/05 01:48:33 thorpej Exp $	*/
 
 /*-
@@ -84,7 +84,7 @@ static u_int8_t dmamode[4] = {
 int isadmamatch(struct device *, void *, void *);
 void isadmaattach(struct device *, struct device *, void *);
 
-struct cfattach isadma_ca = {
+const struct cfattach isadma_ca = {
 	sizeof(struct device), isadmamatch, isadmaattach
 };
 
diff --git a/sys/dev/isa/isagpio.c b/sys/dev/isa/isagpio.c
index 8a69c639c4c..36209a92208 100644
--- a/sys/dev/isa/isagpio.c
+++ b/sys/dev/isa/isagpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isagpio.c,v 1.4 2009/03/29 21:53:52 sthen Exp $	*/
+/*	$OpenBSD: isagpio.c,v 1.5 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Oleg Safiullin <form@pdp-11.org.ru>
@@ -60,7 +60,7 @@ int	isagpio_pin_read(void *, int);
 void	isagpio_pin_write(void *, int, int);
 void	isagpio_pin_ctl(void *, int, int);
 
-struct cfattach isagpio_ca = {
+const struct cfattach isagpio_ca = {
 	sizeof(struct isagpio_softc), isagpio_match, isagpio_attach
 };
 
diff --git a/sys/dev/isa/isapnp.c b/sys/dev/isa/isapnp.c
index 6d6021d20c4..0bb6c758412 100644
--- a/sys/dev/isa/isapnp.c
+++ b/sys/dev/isa/isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp.c,v 1.42 2021/03/07 06:17:03 jsg Exp $	*/
+/*	$OpenBSD: isapnp.c,v 1.43 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: isapnp.c,v 1.9.4.3 1997/10/29 00:40:43 thorpej Exp $	*/
 
 /*
@@ -79,7 +79,7 @@ void isapnp_attach(struct device *, struct device *, void *);
 # define DPRINTF(a)
 #endif
 
-struct cfattach isapnp_ca = {
+const struct cfattach isapnp_ca = {
 	sizeof(struct isapnp_softc), isapnp_match, isapnp_attach
 };
 
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index 140db361aec..9cdce94a36e 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: it.c,v 1.46 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: it.c,v 1.47 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -534,7 +534,7 @@ it_wdog_cb(void *arg, int period)
 }
 
 
-struct cfattach it_ca = {
+const struct cfattach it_ca = {
 	sizeof(struct it_softc),
 	it_match,
 	it_attach,
diff --git a/sys/dev/isa/lm78_isa.c b/sys/dev/isa/lm78_isa.c
index 0c9f156d988..725b8224b84 100644
--- a/sys/dev/isa/lm78_isa.c
+++ b/sys/dev/isa/lm78_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lm78_isa.c,v 1.11 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: lm78_isa.c,v 1.12 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Mark Kettenis
@@ -52,13 +52,13 @@ u_int8_t lm_isa_readreg(struct lm_softc *, int);
 void lm_isa_writereg(struct lm_softc *, int, int);
 void lm_isa_remove_alias(struct lm_softc *, const char *);
 
-struct cfattach lm_isa_ca = {
+const struct cfattach lm_isa_ca = {
 	sizeof(struct lm_isa_softc),
 	lm_isa_match,
 	lm_isa_attach
 };
 
-struct cfattach lm_wbsio_ca = {
+const struct cfattach lm_wbsio_ca = {
 	sizeof(struct lm_isa_softc),
 	lm_wbsio_match,
 	lm_isa_attach
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index c588a867c1d..551540dec0f 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_isa.c,v 1.16 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: lpt_isa.c,v 1.17 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -66,7 +66,7 @@
 int	lpt_isa_probe(struct device *, void *, void *);
 void	lpt_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach lpt_isa_ca = {
+const struct cfattach lpt_isa_ca = {
 	sizeof(struct lpt_softc), lpt_isa_probe, lpt_isa_attach, NULL,
 	lpt_activate
 };
diff --git a/sys/dev/isa/mpu_isa.c b/sys/dev/isa/mpu_isa.c
index eddb494e287..49565aa7728 100644
--- a/sys/dev/isa/mpu_isa.c
+++ b/sys/dev/isa/mpu_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu_isa.c,v 1.7 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: mpu_isa.c,v 1.8 2022/04/06 18:59:28 naddy Exp $	*/
 
 /*
  * Copyright (c) 2002 Sergey Smitienko. All rights reserved.
@@ -63,7 +63,7 @@ struct mpu_isa_softc {
 	struct mpu_softc sc_mpu;
 };
 
-struct cfattach mpu_isa_ca = {
+const struct cfattach mpu_isa_ca = {
 	sizeof(struct mpu_isa_softc), mpu_isa_match, mpu_isa_attach
 };
 
diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c
index 6eac6005cd5..6c011cff63b 100644
--- a/sys/dev/isa/mpu_isapnp.c
+++ b/sys/dev/isa/mpu_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpu_isapnp.c,v 1.9 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: mpu_isapnp.c,v 1.10 2022/04/06 18:59:28 naddy Exp $	*/
 
 #include "midi.h"
 
@@ -31,7 +31,7 @@ struct mpu_isapnp_softc {
 	struct mpu_softc sc_mpu;
 };
 
-struct cfattach mpu_isapnp_ca = {
+const struct cfattach mpu_isapnp_ca = {
 	sizeof(struct mpu_isapnp_softc), mpu_isapnp_match, mpu_isapnp_attach
 };
 
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index beea21ef595..f0c96a7e491 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nsclpcsio_isa.c,v 1.14 2018/06/04 05:24:11 kevlo Exp $ */
+/* $OpenBSD: nsclpcsio_isa.c,v 1.15 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */
 
 /*
@@ -202,7 +202,7 @@ struct nsclpcsio_softc {
 int	 nsclpcsio_isa_match(struct device *, void *, void *);
 void	 nsclpcsio_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach nsclpcsio_isa_ca = {
+const struct cfattach nsclpcsio_isa_ca = {
 	sizeof(struct nsclpcsio_softc),
 	nsclpcsio_isa_match,
 	nsclpcsio_isa_attach
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index d475b2d81ac..4c9d01f294f 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pas.c,v 1.32 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: pas.c,v 1.33 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $	*/
 
 /*
@@ -227,7 +227,7 @@ pasconf(int model, int sbbase, int sbirq, int sbdrq)
 int	pasprobe(struct device *, void *, void *);
 void	pasattach(struct device *, struct device *, void *);
 
-struct cfattach pas_ca = {
+const struct cfattach pas_ca = {
 	sizeof(struct pas_softc), pasprobe, pasattach
 };
 
diff --git a/sys/dev/isa/pcdisplay.c b/sys/dev/isa/pcdisplay.c
index 11e77664ee6..ed87e47245e 100644
--- a/sys/dev/isa/pcdisplay.c
+++ b/sys/dev/isa/pcdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcdisplay.c,v 1.14 2020/05/25 09:55:48 jsg Exp $ */
+/* $OpenBSD: pcdisplay.c,v 1.15 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: pcdisplay.c,v 1.9.4.1 2000/06/30 16:27:48 simonb Exp $ */
 
 /*
@@ -73,7 +73,7 @@ static void pcdisplay_init(struct pcdisplay_config *,
 static int pcdisplay_pack_attr(void *, int, int, int, uint32_t *);
 static void pcdisplay_unpack_attr(void *, uint32_t, int *, int *, int *);
 
-struct cfattach pcdisplay_ca = {
+const struct cfattach pcdisplay_ca = {
 	sizeof(struct pcdisplay_softc), pcdisplay_match, pcdisplay_attach,
 };
 
diff --git a/sys/dev/isa/pcppi.c b/sys/dev/isa/pcppi.c
index 2e2ba8426c1..60191b9dc72 100644
--- a/sys/dev/isa/pcppi.c
+++ b/sys/dev/isa/pcppi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcppi.c,v 1.18 2022/01/09 05:42:44 jsg Exp $ */
+/* $OpenBSD: pcppi.c,v 1.19 2022/04/06 18:59:28 naddy Exp $ */
 /* $NetBSD: pcppi.c,v 1.1 1998/04/15 20:26:18 drochner Exp $ */
 
 /*
@@ -69,7 +69,7 @@ struct pcppi_softc {
 int	pcppi_match(struct device *, void *, void *);
 void	pcppi_attach(struct device *, struct device *, void *);
 
-struct cfattach pcppi_ca = {
+const struct cfattach pcppi_ca = {
 	sizeof(struct pcppi_softc), pcppi_match, pcppi_attach,
 };
 
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index 1ba2030eeb5..e698e6ef358 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb_isa.c,v 1.11 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: sb_isa.c,v 1.12 2022/04/06 18:59:28 naddy Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ static	int sbfind(struct device *, struct sbdsp_softc *, struct isa_attach_args
 int	sb_isa_match(struct device *, void *, void *);
 void	sb_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach sb_isa_ca = {
+const struct cfattach sb_isa_ca = {
 	sizeof(struct sbdsp_softc), sb_isa_match, sb_isa_attach
 };
 
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
index 5ae25609c22..a80a136a247 100644
--- a/sys/dev/isa/sb_isapnp.c
+++ b/sys/dev/isa/sb_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb_isapnp.c,v 1.16 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: sb_isapnp.c,v 1.17 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $	*/
 
 /*
@@ -57,7 +57,7 @@
 int	sb_isapnp_match(struct device *, void *, void *);
 void	sb_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach sb_isapnp_ca = {
+const struct cfattach sb_isapnp_ca = {
 	sizeof(struct sbdsp_softc), sb_isapnp_match, sb_isapnp_attach
 };
 
diff --git a/sys/dev/isa/sch311x.c b/sys/dev/isa/sch311x.c
index 6a5ad56f509..ce9f7158589 100644
--- a/sys/dev/isa/sch311x.c
+++ b/sys/dev/isa/sch311x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sch311x.c,v 1.17 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: sch311x.c,v 1.18 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
  * Copyright (c) 2009 Michael Knudsen <mk@openbsd.org>
@@ -180,7 +180,7 @@ u_int8_t schsio_hwm_read(struct schsio_softc *sc, u_int8_t reg);
 void schsio_wdt_init(struct schsio_softc *sc);
 int schsio_wdt_cb(void *arg, int period);
 
-struct cfattach schsio_ca = {
+const struct cfattach schsio_ca = {
 	sizeof(struct schsio_softc),
 	schsio_probe,
 	schsio_attach,
diff --git a/sys/dev/isa/skgpio.c b/sys/dev/isa/skgpio.c
index 48d8d19d85a..93a104e4b02 100644
--- a/sys/dev/isa/skgpio.c
+++ b/sys/dev/isa/skgpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skgpio.c,v 1.4 2020/08/26 03:29:06 visa Exp $ */
+/*	$OpenBSD: skgpio.c,v 1.5 2022/04/06 18:59:29 naddy Exp $ */
 
 /*
  * Copyright (c) 2014 Matt Dainty <matt@bodgit-n-scarper.com>
@@ -72,7 +72,7 @@ int	 skgpio_led_read(void *, int);
 void	 skgpio_led_write(void *, int, int);
 void	 skgpio_led_ctl(void *, int, int);
 
-struct cfattach skgpio_ca = {
+const struct cfattach skgpio_ca = {
 	sizeof(struct skgpio_softc), skgpio_match, skgpio_attach
 };
 
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 04240de05fa..28fa395d0d1 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spkr.c,v 1.26 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: spkr.c,v 1.27 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ cdev_decl(spkr);
 int spkrprobe(struct device *, void *, void *);
 void spkrattach(struct device *, struct device *, void *);
 
-struct cfattach spkr_ca = {
+const struct cfattach spkr_ca = {
 	sizeof(struct device), spkrprobe, spkrattach
 };
 
diff --git a/sys/dev/isa/tcic2_isa.c b/sys/dev/isa/tcic2_isa.c
index 9eb7a5325ec..c757bd40ac9 100644
--- a/sys/dev/isa/tcic2_isa.c
+++ b/sys/dev/isa/tcic2_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2_isa.c,v 1.10 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: tcic2_isa.c,v 1.11 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: tcic2_isa.c,v 1.2 1999/04/08 16:14:29 bad Exp $	*/
 
 #undef	TCICISADEBUG
@@ -113,7 +113,7 @@ void	*tcic_isa_chip_intr_establish(pcmcia_chipset_handle_t,
 void	tcic_isa_chip_intr_disestablish(pcmcia_chipset_handle_t, void *);
 const char *tcic_isa_chip_intr_string(pcmcia_chipset_handle_t, void *);
 
-struct cfattach tcic_isa_ca = {
+const struct cfattach tcic_isa_ca = {
 	sizeof(struct tcic_softc), tcic_isa_probe, tcic_isa_attach
 };
 
diff --git a/sys/dev/isa/uguru.c b/sys/dev/isa/uguru.c
index 06b4e3755b3..80612b18f49 100644
--- a/sys/dev/isa/uguru.c
+++ b/sys/dev/isa/uguru.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uguru.c,v 1.5 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: uguru.c,v 1.6 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2010 Mikko Tolmunen <oskari@sefirosu.org>
@@ -648,7 +648,7 @@ struct cfdriver uguru_cd = {
 	NULL, "uguru", DV_DULL
 };
 
-struct cfattach uguru_ca = {
+const struct cfattach uguru_ca = {
 	sizeof(struct uguru_softc), uguru_match, uguru_attach
 };
 
diff --git a/sys/dev/isa/uha_isa.c b/sys/dev/isa/uha_isa.c
index 5979faf12a2..f18a00d2b2e 100644
--- a/sys/dev/isa/uha_isa.c
+++ b/sys/dev/isa/uha_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha_isa.c,v 1.14 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: uha_isa.c,v 1.15 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: uha_isa.c,v 1.5 1996/10/21 22:41:21 thorpej Exp $	*/
 
 /*
@@ -53,7 +53,7 @@
 int	uha_isa_probe(struct device *, void *, void *);
 void	uha_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach uha_isa_ca = {
+const struct cfattach uha_isa_ca = {
 	sizeof(struct uha_softc), uha_isa_probe, uha_isa_attach
 };
 
diff --git a/sys/dev/isa/vga_isa.c b/sys/dev/isa/vga_isa.c
index c55173d1399..fcc9166df8b 100644
--- a/sys/dev/isa/vga_isa.c
+++ b/sys/dev/isa/vga_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_isa.c,v 1.10 2015/07/18 00:48:05 miod Exp $ */
+/* $OpenBSD: vga_isa.c,v 1.11 2022/04/06 18:59:29 naddy Exp $ */
 /* $NetBSD: vga_isa.c,v 1.3 1998/06/12 18:45:48 drochner Exp $ */
 
 /*
@@ -56,7 +56,7 @@ struct vga_isa_softc {
 int	vga_isa_match(struct device *, void *, void *);
 void	vga_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach vga_isa_ca = {
+const struct cfattach vga_isa_ca = {
 	sizeof(struct vga_isa_softc), vga_isa_match, vga_isa_attach,
 };
 
diff --git a/sys/dev/isa/viasio.c b/sys/dev/isa/viasio.c
index 32d2b9f29d3..6ba63d8dc66 100644
--- a/sys/dev/isa/viasio.c
+++ b/sys/dev/isa/viasio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: viasio.c,v 1.14 2014/12/10 12:27:57 mikeb Exp $	*/
+/*	$OpenBSD: viasio.c,v 1.15 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2005 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -70,7 +70,7 @@ void	viasio_hm_refresh(void *);
 void	viasio_wdg_init(struct viasio_softc *);
 int	viasio_wdg_cb(void *, int);
 
-struct cfattach viasio_ca = {
+const struct cfattach viasio_ca = {
 	sizeof(struct viasio_softc),
 	viasio_probe,
 	viasio_attach,
diff --git a/sys/dev/isa/wbsio.c b/sys/dev/isa/wbsio.c
index de36287d157..833f138a02d 100644
--- a/sys/dev/isa/wbsio.c
+++ b/sys/dev/isa/wbsio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wbsio.c,v 1.11 2019/12/17 01:34:59 mortimer Exp $	*/
+/*	$OpenBSD: wbsio.c,v 1.12 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org>
  *
@@ -46,7 +46,7 @@ int	wbsio_probe(struct device *, void *, void *);
 void	wbsio_attach(struct device *, struct device *, void *);
 int	wbsio_print(void *, const char *);
 
-struct cfattach wbsio_ca = {
+const struct cfattach wbsio_ca = {
 	sizeof(struct wbsio_softc),
 	wbsio_probe,
 	wbsio_attach
diff --git a/sys/dev/isa/wdc_isa.c b/sys/dev/isa/wdc_isa.c
index 6804ab54388..2d22cd79896 100644
--- a/sys/dev/isa/wdc_isa.c
+++ b/sys/dev/isa/wdc_isa.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: wdc_isa.c,v 1.16 2017/09/08 05:36:52 deraadt Exp $     */
+/*      $OpenBSD: wdc_isa.c,v 1.17 2022/04/06 18:59:29 naddy Exp $     */
 /*	$NetBSD: wdc_isa.c,v 1.15 1999/05/19 14:41:25 bouyer Exp $ */
 
 /*-
@@ -66,7 +66,7 @@ struct wdc_isa_softc {
 int	wdc_isa_probe(struct device *, void *, void *);
 void	wdc_isa_attach(struct device *, struct device *, void *);
 
-struct cfattach wdc_isa_ca = {
+const struct cfattach wdc_isa_ca = {
 	sizeof(struct wdc_isa_softc), wdc_isa_probe, wdc_isa_attach
 };
 
diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c
index 2d07b72667e..f873a03fb8e 100644
--- a/sys/dev/isa/wdc_isapnp.c
+++ b/sys/dev/isa/wdc_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_isapnp.c,v 1.12 2021/03/07 06:17:04 jsg Exp $	*/
+/*	$OpenBSD: wdc_isapnp.c,v 1.13 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $	*/
 
 /*-
@@ -57,7 +57,7 @@ struct wdc_isapnp_softc {
 int	wdc_isapnp_match(struct device *, void *, void *);
 void	wdc_isapnp_attach(struct device *, struct device *, void *);
 
-struct cfattach wdc_isapnp_ca = {
+const struct cfattach wdc_isapnp_ca = {
 	sizeof(struct wdc_isapnp_softc), wdc_isapnp_match, wdc_isapnp_attach
 };
 
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 34d98044b9a..ef567ad6338 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wds.c,v 1.57 2020/09/22 19:32:53 krw Exp $	*/
+/*	$OpenBSD: wds.c,v 1.58 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $	*/
 
 #undef	WDSDIAG
@@ -173,7 +173,7 @@ struct scsi_adapter wds_switch = {
 int	wdsprobe(struct device *, void *, void *);
 void	wdsattach(struct device *, struct device *, void *);
 
-struct cfattach wds_ca = {
+const struct cfattach wds_ca = {
 	sizeof(struct wds_softc), wdsprobe, wdsattach
 };
 
diff --git a/sys/dev/midi.c b/sys/dev/midi.c
index 73000a32c82..24099d4ca70 100644
--- a/sys/dev/midi.c
+++ b/sys/dev/midi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: midi.c,v 1.53 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: midi.c,v 1.54 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Alexandre Ratchov
@@ -56,7 +56,7 @@ void	midi_out_do(struct midi_softc *);
 void	midi_attach(struct midi_softc *, struct device *);
 
 
-struct cfattach midi_ca = {
+const struct cfattach midi_ca = {
 	sizeof(struct midi_softc), midiprobe, midiattach, mididetach
 };
 
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index 6b1e1fb9e3b..e13b02645a8 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acphy.c,v 1.9 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: acphy.c,v 1.10 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: acphy.c,v 1.13 2003/04/29 01:49:33 thorpej Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 int	acphymatch(struct device *, void *, void *);
 void	acphyattach(struct device *, struct device *, void *);
 
-struct cfattach acphy_ca = {
+const struct cfattach acphy_ca = {
 	sizeof(struct mii_softc), acphymatch, acphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index c34eeb9cbd0..5f3543b4fca 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amphy.c,v 1.21 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: amphy.c,v 1.22 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -58,7 +58,7 @@
 int	amphymatch(struct device *, void *, void *);
 void	amphyattach(struct device *, struct device *, void *);
 
-struct cfattach amphy_ca = {
+const struct cfattach amphy_ca = {
 	sizeof(struct mii_softc), amphymatch, amphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index 65dbd2a38f6..61d97312594 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atphy.c,v 1.12 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: atphy.c,v 1.13 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -92,7 +92,7 @@ static const struct mii_phydesc atphys[] = {
 	  NULL },
 };
 
-struct cfattach atphy_ca = {
+const struct cfattach atphy_ca = {
 	sizeof (struct mii_softc), atphy_match, atphy_attach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index ce82ebb65ba..db640234ba6 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bmtphy.c,v 1.20 2015/03/14 03:38:47 jsg Exp $	*/
+/*	$OpenBSD: bmtphy.c,v 1.21 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: bmtphy.c,v 1.17 2005/01/17 13:17:45 scw Exp $	*/
 
 /*-
@@ -51,7 +51,7 @@
 int	bmtphymatch(struct device *, void *, void *);
 void	bmtphyattach(struct device *, struct device *, void *);
 
-struct cfattach bmtphy_ca = {
+const struct cfattach bmtphy_ca = {
 	sizeof(struct mii_softc), bmtphymatch, bmtphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index 24b12294ce8..fbf7be2d5f3 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brgphy.c,v 1.107 2021/06/17 09:30:32 kettenis Exp $	*/
+/*	$OpenBSD: brgphy.c,v 1.108 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -63,7 +63,7 @@
 int brgphy_probe(struct device *, void *, void *);
 void brgphy_attach(struct device *, struct device *, void *);
 
-struct cfattach brgphy_ca = {
+const struct cfattach brgphy_ca = {
 	sizeof(struct mii_softc), brgphy_probe, brgphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/brswphy.c b/sys/dev/mii/brswphy.c
index c059ddcb122..eff0388d9c4 100644
--- a/sys/dev/mii/brswphy.c
+++ b/sys/dev/mii/brswphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brswphy.c,v 1.3 2020/04/06 00:01:08 pirofti Exp $	*/
+/*	$OpenBSD: brswphy.c,v 1.4 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2014 Paul Irofti <paul@irofti.net>
@@ -150,7 +150,7 @@ struct brswphy_softc {
 int	brswphymatch(struct device *, void *, void *);
 void	brswphyattach(struct device *, struct device *, void *);
 
-struct cfattach brswphy_ca = { sizeof(struct brswphy_softc),
+const struct cfattach brswphy_ca = { sizeof(struct brswphy_softc),
 	brswphymatch, brswphyattach, mii_phy_detach,
 };
 
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index 7f3b2fcc4fc..9caa61d97a5 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ciphy.c,v 1.27 2015/07/19 06:28:12 yuo Exp $	*/
+/*	$OpenBSD: ciphy.c,v 1.28 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$FreeBSD: ciphy.c,v 1.1 2004/09/10 20:57:45 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -56,7 +56,7 @@
 int	ciphymatch(struct device *, void *, void *);
 void	ciphyattach(struct device *, struct device *, void *);
 
-struct cfattach ciphy_ca = {
+const struct cfattach ciphy_ca = {
 	sizeof(struct mii_softc), ciphymatch, ciphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/dcphy.c b/sys/dev/mii/dcphy.c
index 09bedb3bdb8..102c49b5120 100644
--- a/sys/dev/mii/dcphy.c
+++ b/sys/dev/mii/dcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dcphy.c,v 1.25 2013/12/28 03:30:41 deraadt Exp $	*/
+/*	$OpenBSD: dcphy.c,v 1.26 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -84,7 +84,7 @@
 int	dcphy_match(struct device *, void *, void *);
 void	dcphy_attach(struct device *, struct device *, void *);
 
-struct cfattach dcphy_ca = {
+const struct cfattach dcphy_ca = {
 	sizeof(struct mii_softc), dcphy_match, dcphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/eephy.c b/sys/dev/mii/eephy.c
index e6cf176b0c2..e33abe38431 100644
--- a/sys/dev/mii/eephy.c
+++ b/sys/dev/mii/eephy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eephy.c,v 1.59 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: eephy.c,v 1.60 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Principal Author: Parag Patel
  * Copyright (c) 2001
@@ -58,7 +58,7 @@
 int	eephy_match(struct device *, void *, void *);
 void	eephy_attach(struct device *, struct device *, void *);
 
-struct cfattach eephy_ca = {
+const struct cfattach eephy_ca = {
 	sizeof (struct mii_softc), eephy_match, eephy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/etphy.c b/sys/dev/mii/etphy.c
index 8ab9f659bc4..d9ff0c6fc53 100644
--- a/sys/dev/mii/etphy.c
+++ b/sys/dev/mii/etphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etphy.c,v 1.7 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: etphy.c,v 1.8 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -90,7 +90,7 @@ static const struct mii_phydesc etphys[] = {
 	  NULL },
 };
 
-struct cfattach etphy_ca = {
+const struct cfattach etphy_ca = {
 	sizeof (struct mii_softc), etphy_match, etphy_attach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/exphy.c b/sys/dev/mii/exphy.c
index 93ca03a16bd..cf16e19384f 100644
--- a/sys/dev/mii/exphy.c
+++ b/sys/dev/mii/exphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exphy.c,v 1.23 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: exphy.c,v 1.24 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: exphy.c,v 1.23 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -75,7 +75,7 @@
 int	exphymatch(struct device *, void *, void *);
 void	exphyattach(struct device *, struct device *, void *);
 
-struct cfattach exphy_ca = {
+const struct cfattach exphy_ca = {
 	sizeof(struct mii_softc), exphymatch, exphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 8fe93076dca..d1bdb2e6db3 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gentbi.c,v 1.11 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: gentbi.c,v 1.12 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: gentbi.c,v 1.12 2004/04/11 15:40:56 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	gentbimatch(struct device *, void *, void *);
 void	gentbiattach(struct device *, struct device *, void *);
 
-struct cfattach gentbi_ca = {
+const struct cfattach gentbi_ca = {
 	sizeof(struct mii_softc), gentbimatch, gentbiattach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 2c72405c7c9..fc64e1d470a 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icsphy.c,v 1.24 2021/03/05 09:37:20 jsg Exp $	*/
+/*	$OpenBSD: icsphy.c,v 1.25 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: icsphy.c,v 1.17 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	icsphymatch(struct device *, void *, void *);
 void	icsphyattach(struct device *, struct device *, void *);
 
-struct cfattach icsphy_ca = {
+const struct cfattach icsphy_ca = {
 	sizeof(struct mii_softc), icsphymatch, icsphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index 025c3771aa2..d0f494942c1 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inphy.c,v 1.22 2021/03/05 09:37:20 jsg Exp $	*/
+/*	$OpenBSD: inphy.c,v 1.23 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: inphy.c,v 1.18 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	inphymatch(struct device *, void *, void *);
 void	inphyattach(struct device *, struct device *, void *);
 
-struct cfattach inphy_ca = {
+const struct cfattach inphy_ca = {
 	sizeof(struct mii_softc), inphymatch, inphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index 8c8ad975923..b19616677c9 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iophy.c,v 1.21 2021/03/05 09:37:20 jsg Exp $	*/
+/*	$OpenBSD: iophy.c,v 1.22 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: iophy.c,v 1.8 2000/02/02 23:34:56 thorpej Exp $	*/
 
 /*
@@ -77,7 +77,7 @@
 int	iophymatch(struct device *, void *, void *);
 void	iophyattach(struct device *, struct device *, void *);
 
-struct cfattach iophy_ca = {
+const struct cfattach iophy_ca = {
 	sizeof(struct mii_softc), iophymatch, iophyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/ipgphy.c b/sys/dev/mii/ipgphy.c
index d131a8d94bc..46af4925967 100644
--- a/sys/dev/mii/ipgphy.c
+++ b/sys/dev/mii/ipgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $	*/
+/*	$OpenBSD: ipgphy.c,v 1.20 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2006, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -58,7 +58,7 @@
 int ipgphy_probe(struct device *, void *, void *);
 void ipgphy_attach(struct device *, struct device *, void *);
 
-struct cfattach ipgphy_ca = {
+const struct cfattach ipgphy_ca = {
 	sizeof(struct mii_softc), ipgphy_probe, ipgphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index 88133de067a..756de365e68 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: jmphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: jmphy.c,v 1.7 2022/04/06 18:59:29 naddy Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -59,7 +59,7 @@ const struct mii_phy_funcs jmphy_funcs = {
 	jmphy_service, jmphy_status, jmphy_reset,
 };
 
-struct cfattach jmphy_ca = {
+const struct cfattach jmphy_ca = {
 	sizeof (struct mii_softc), jmphy_match, jmphy_attach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/luphy.c b/sys/dev/mii/luphy.c
index e65c97ce29b..1935b07f555 100644
--- a/sys/dev/mii/luphy.c
+++ b/sys/dev/mii/luphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: luphy.c,v 1.6 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: luphy.c,v 1.7 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*-
  * Copyright (c) 2004 Marius Strobl
@@ -57,7 +57,7 @@
 int	luphymatch(struct device *, void *, void *);
 void	luphyattach(struct device *, struct device *, void *);
 
-struct cfattach luphy_ca = {
+const struct cfattach luphy_ca = {
 	sizeof(struct mii_softc), luphymatch, luphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index 6ae804b1572..bee7dea95c0 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lxtphy.c,v 1.22 2022/01/09 05:42:44 jsg Exp $	*/
+/*	$OpenBSD: lxtphy.c,v 1.23 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: lxtphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	lxtphymatch(struct device *, void *, void *);
 void	lxtphyattach(struct device *, struct device *, void *);
 
-struct cfattach lxtphy_ca = {
+const struct cfattach lxtphy_ca = {
 	sizeof(struct mii_softc), lxtphymatch, lxtphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index efd49fdd35e..7d50e86b49e 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mlphy.c,v 1.5 2014/12/05 15:50:04 mpi Exp $	*/
+/*	$OpenBSD: mlphy.c,v 1.6 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999
@@ -130,7 +130,7 @@ struct mlphy_softc {
 int	mlphy_probe(struct device *, void *, void *);
 void	mlphy_attach(struct device *, struct device *, void *);
 
-struct cfattach mlphy_ca = {
+const struct cfattach mlphy_ca = {
 	sizeof(struct mii_softc), mlphy_probe, mlphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/mtdphy.c b/sys/dev/mii/mtdphy.c
index 477c7f5ecd9..b70abdaa747 100644
--- a/sys/dev/mii/mtdphy.c
+++ b/sys/dev/mii/mtdphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mtdphy.c,v 1.15 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: mtdphy.c,v 1.16 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net)
@@ -48,7 +48,7 @@
 int	mtdphymatch(struct device *, void *, void *);
 void	mtdphyattach(struct device *, struct device *, void *);
 
-struct cfattach mtdphy_ca = {
+const struct cfattach mtdphy_ca = {
 	sizeof(struct mii_softc), mtdphymatch, mtdphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 34a0853274e..2c13a290533 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsgphy.c,v 1.25 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: nsgphy.c,v 1.26 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 2001
@@ -68,7 +68,7 @@
 int	nsgphymatch(struct device*, void *, void *);
 void	nsgphyattach(struct device *, struct device *, void *);
 
-struct cfattach nsgphy_ca = {
+const struct cfattach nsgphy_ca = {
 	sizeof(struct mii_softc), nsgphymatch, nsgphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 69df14da098..263051c2c1c 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsphy.c,v 1.28 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: nsphy.c,v 1.29 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: nsphy.c,v 1.25 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	nsphymatch(struct device *, void *, void *);
 void	nsphyattach(struct device *, struct device *, void *);
 
-struct cfattach nsphy_ca = {
+const struct cfattach nsphy_ca = {
 	sizeof(struct mii_softc), nsphymatch, nsphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 3733edf02cb..b6989b72183 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nsphyter.c,v 1.19 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: nsphyter.c,v 1.20 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: nsphyter.c,v 1.5 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -79,7 +79,7 @@
 int	nsphytermatch(struct device *, void *, void *);
 void	nsphyterattach(struct device *, struct device *, void *);
 
-struct cfattach nsphyter_ca = {
+const struct cfattach nsphyter_ca = {
 	sizeof(struct mii_softc), nsphytermatch, nsphyterattach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 4f7b3139462..c93e9d0b8c5 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qsphy.c,v 1.21 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: qsphy.c,v 1.22 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -78,7 +78,7 @@
 int	qsphymatch(struct device *, void *, void *);
 void	qsphyattach(struct device *, struct device *, void *);
 
-struct cfattach qsphy_ca = {
+const struct cfattach qsphy_ca = {
 	sizeof(struct mii_softc), qsphymatch, qsphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index cf7d75d57ef..f1eefcbe783 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdcphy.c,v 1.3 2014/12/05 15:50:04 mpi Exp $	*/
+/*	$OpenBSD: rdcphy.c,v 1.4 2022/04/06 18:59:29 naddy Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -106,7 +106,7 @@ static const struct mii_phydesc rdcphys[] = {
 	  NULL },
 };
 
-struct cfattach rdcphy_ca = {
+const struct cfattach rdcphy_ca = {
 	sizeof(struct rdcphy_softc), rdcphy_match, rdcphy_attach,
 	mii_phy_detach
 };
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index d06ae4c5e62..a56759cde2c 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rgephy.c,v 1.40 2018/02/27 19:47:10 kettenis Exp $	*/
+/*	$OpenBSD: rgephy.c,v 1.41 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2003
  *	Bill Paul <wpaul@windriver.com>.  All rights reserved.
@@ -63,7 +63,7 @@
 int	rgephymatch(struct device *, void *, void *);
 void	rgephyattach(struct device *, struct device *, void *);
 
-struct cfattach rgephy_ca = { sizeof(struct mii_softc),
+const struct cfattach rgephy_ca = { sizeof(struct mii_softc),
 	rgephymatch, rgephyattach, mii_phy_detach,
 };
 
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index 41dc1a79053..4be32035653 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlphy.c,v 1.33 2014/11/24 00:13:42 brad Exp $	*/
+/*	$OpenBSD: rlphy.c,v 1.34 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Jason L. Wright (jason@thought.net)
@@ -56,7 +56,7 @@
 int	rlphymatch(struct device *, void *, void *);
 void	rlphyattach(struct device *, struct device *, void *);
 
-struct cfattach rlphy_ca = {
+const struct cfattach rlphy_ca = {
 	sizeof(struct mii_softc), rlphymatch, rlphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index af156e25d07..ce4873c6a8c 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sqphy.c,v 1.21 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: sqphy.c,v 1.22 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: sqphy.c,v 1.17 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -78,7 +78,7 @@
 int	sqphymatch(struct device *, void *, void *);
 void	sqphyattach(struct device *, struct device *, void *);
 
-struct cfattach sqphy_ca = {
+const struct cfattach sqphy_ca = {
 	sizeof(struct mii_softc), sqphymatch, sqphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index 72bee5fba69..9afd3e50dd7 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tlphy.c,v 1.21 2013/12/28 03:30:41 deraadt Exp $	*/
+/*	$OpenBSD: tlphy.c,v 1.22 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: tlphy.c,v 1.26 2000/07/04 03:29:00 thorpej Exp $	*/
 
 /*-
@@ -97,7 +97,7 @@ struct cfdriver tlphy_cd = {
 int	tlphymatch(struct device *, void *, void *);
 void	tlphyattach(struct device *, struct device *, void *);
 
-struct cfattach tlphy_ca = {
+const struct cfattach tlphy_ca = {
 	sizeof(struct tlphy_softc), tlphymatch, tlphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index c258f805369..d18be6e1c3b 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tqphy.c,v 1.18 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: tqphy.c,v 1.19 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: tqphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ int	tqphymatch(struct device *, void *, void *);
 void	tqphyattach(struct device *, struct device *, void *);
 int	tqphydetach(struct device *, int);
 
-struct cfattach tqphy_ca = {
+const struct cfattach tqphy_ca = {
 	sizeof(struct mii_softc), tqphymatch, tqphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/txphy.c b/sys/dev/mii/txphy.c
index 24c8252785e..91595fa9a52 100644
--- a/sys/dev/mii/txphy.c
+++ b/sys/dev/mii/txphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: txphy.c,v 1.11 2013/12/28 03:30:41 deraadt Exp $	*/
+/*	$OpenBSD: txphy.c,v 1.12 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 1999 Jason L. Wright (jason@thought.net)
@@ -47,7 +47,7 @@
 int	txphymatch(struct device *, void *, void *);
 void	txphyattach(struct device *, struct device *, void *);
 
-struct cfattach txphy_ca = {
+const struct cfattach txphy_ca = {
 	sizeof(struct mii_softc), txphymatch, txphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index f7bcc95ea17..25186821a75 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ukphy.c,v 1.24 2016/07/11 09:50:02 kettenis Exp $	*/
+/*	$OpenBSD: ukphy.c,v 1.25 2022/04/06 18:59:29 naddy Exp $	*/
 /*	$NetBSD: ukphy.c,v 1.9 2000/02/02 23:34:57 thorpej Exp $	*/
 
 /*-
@@ -75,7 +75,7 @@
 int	ukphymatch(struct device *, void *, void *);
 void	ukphyattach(struct device *, struct device *, void *);
 
-struct cfattach ukphy_ca = {
+const struct cfattach ukphy_ca = {
 	sizeof(struct mii_softc), ukphymatch, ukphyattach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/urlphy.c b/sys/dev/mii/urlphy.c
index 6018d2b2a5e..2cf08469deb 100644
--- a/sys/dev/mii/urlphy.c
+++ b/sys/dev/mii/urlphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: urlphy.c,v 1.17 2015/03/14 03:38:48 jsg Exp $ */
+/*	$OpenBSD: urlphy.c,v 1.18 2022/04/06 18:59:29 naddy Exp $ */
 /*	$NetBSD: urlphy.c,v 1.1 2002/03/28 21:07:53 ichiro Exp $	*/
 /*
  * Copyright (c) 2001, 2002
@@ -61,7 +61,7 @@ int urlphydebug = URLPHY_DEBUG;
 int urlphy_match(struct device *, void *, void *);
 void urlphy_attach(struct device *, struct device *, void *);
 
-struct cfattach urlphy_ca = {
+const struct cfattach urlphy_ca = {
 	sizeof(struct mii_softc), urlphy_match, urlphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index b09a005f831..4256ade8aa8 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xmphy.c,v 1.23 2015/07/19 06:28:12 yuo Exp $	*/
+/*	$OpenBSD: xmphy.c,v 1.24 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2000
@@ -59,7 +59,7 @@
 int xmphy_probe(struct device *, void *, void *);
 void xmphy_attach(struct device *, struct device *, void *);
 
-struct cfattach xmphy_ca = {
+const struct cfattach xmphy_ca = {
 	sizeof(struct mii_softc), xmphy_probe, xmphy_attach, mii_phy_detach
 };
 
diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c
index 16c6796e16d..029dd00fe1d 100644
--- a/sys/dev/onewire/onewire.c
+++ b/sys/dev/onewire/onewire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: onewire.c,v 1.18 2019/11/30 18:14:47 cheloha Exp $	*/
+/*	$OpenBSD: onewire.c,v 1.19 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -71,7 +71,7 @@ void	onewire_thread(void *);
 void	onewire_createthread(void *);
 void	onewire_scan(struct onewire_softc *);
 
-struct cfattach onewire_ca = {
+const struct cfattach onewire_ca = {
 	sizeof(struct onewire_softc),
 	onewire_match,
 	onewire_attach,
diff --git a/sys/dev/onewire/owctr.c b/sys/dev/onewire/owctr.c
index 48b6d996e49..335c129fd6d 100644
--- a/sys/dev/onewire/owctr.c
+++ b/sys/dev/onewire/owctr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owctr.c,v 1.8 2015/08/27 05:49:23 deraadt Exp $	*/
+/*	$OpenBSD: owctr.c,v 1.9 2022/04/06 18:59:29 naddy Exp $	*/
 /*
  * Copyright (c) 2010 John L. Scarfone <john@scarfone.net>
  *
@@ -70,7 +70,7 @@ int	owctr_activate(struct device *, int);
 void	owctr_update(void *);
 void	owctr_update_counter(void *, int);
 
-struct cfattach owctr_ca = {
+const struct cfattach owctr_ca = {
 	sizeof(struct owctr_softc),
 	owctr_match,
 	owctr_attach,
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c
index 6d33f5e6e36..32589f71b91 100644
--- a/sys/dev/onewire/owid.c
+++ b/sys/dev/onewire/owid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owid.c,v 1.11 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: owid.c,v 1.12 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -46,7 +46,7 @@ void	owid_attach(struct device *, struct device *, void *);
 int	owid_detach(struct device *, int);
 int	owid_activate(struct device *, int);
 
-struct cfattach owid_ca = {
+const struct cfattach owid_ca = {
 	sizeof(struct owid_softc),
 	owid_match,
 	owid_attach,
diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c
index 5a2e55d581b..cee3c44407b 100644
--- a/sys/dev/onewire/owsbm.c
+++ b/sys/dev/onewire/owsbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owsbm.c,v 1.10 2015/03/14 03:38:48 jsg Exp $	*/
+/*	$OpenBSD: owsbm.c,v 1.11 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2007 Aaron Linville <aaron@linville.org>
@@ -79,7 +79,7 @@ int	owsbm_activate(struct device *, int);
 
 void	owsbm_update(void *);
 
-struct cfattach owsbm_ca = {
+const struct cfattach owsbm_ca = {
 	sizeof(struct owsbm_softc),
 	owsbm_match,
 	owsbm_attach,
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index 886adc590b4..8494790e9bf 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owtemp.c,v 1.17 2019/11/30 18:14:47 cheloha Exp $	*/
+/*	$OpenBSD: owtemp.c,v 1.18 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -64,7 +64,7 @@ int	owtemp_activate(struct device *, int);
 
 void	owtemp_update(void *);
 
-struct cfattach owtemp_ca = {
+const struct cfattach owtemp_ca = {
 	sizeof(struct owtemp_softc),
 	owtemp_match,
 	owtemp_attach,
diff --git a/sys/dev/pci/com_pci.c b/sys/dev/pci/com_pci.c
index 2179cdb8db6..2ae409d2246 100644
--- a/sys/dev/pci/com_pci.c
+++ b/sys/dev/pci/com_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_pci.c,v 1.1 2020/03/06 08:39:34 patrick Exp $ */
+/* $OpenBSD: com_pci.c,v 1.2 2022/04/06 18:59:29 naddy Exp $ */
 /*
  * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se>
  *
@@ -89,7 +89,7 @@ struct com_pci_softc {
 	uint32_t		 sc_priv[LPSS_REG_NUM];
 };
 
-struct cfattach com_pci_ca = {
+const struct cfattach com_pci_ca = {
 	sizeof(struct com_pci_softc), com_pci_match,
 	com_pci_attach, com_pci_detach, com_pci_activate,
 };
diff --git a/sys/dev/pci/if_aq_pci.c b/sys/dev/pci/if_aq_pci.c
index 35c5203374f..2d1304f82f1 100644
--- a/sys/dev/pci/if_aq_pci.c
+++ b/sys/dev/pci/if_aq_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aq_pci.c,v 1.15 2022/04/02 09:00:45 jmatthew Exp $ */
+/* $OpenBSD: if_aq_pci.c,v 1.16 2022/04/06 18:59:29 naddy Exp $ */
 /*	$NetBSD: if_aq.c,v 1.27 2021/06/16 00:21:18 riastradh Exp $	*/
 
 /*
@@ -937,7 +937,7 @@ const struct aq_firmware_ops aq_fw2x_ops = {
 	.get_stats = aq_fw2x_get_stats,
 };
 
-struct cfattach aq_ca = {
+const struct cfattach aq_ca = {
 	sizeof(struct aq_softc), aq_match, aq_attach, NULL,
 	aq_activate
 };
diff --git a/sys/dev/pci/if_igc.c b/sys/dev/pci/if_igc.c
index 8be693b7a58..6d7363f44c1 100644
--- a/sys/dev/pci/if_igc.c
+++ b/sys/dev/pci/if_igc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_igc.c,v 1.6 2022/01/09 23:28:19 patrick Exp $	*/
+/*	$OpenBSD: if_igc.c,v 1.7 2022/04/06 18:59:29 naddy Exp $	*/
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
@@ -150,7 +150,7 @@ struct cfdriver igc_cd = {
 	NULL, "igc", DV_IFNET
 };
 
-struct cfattach igc_ca = {
+const struct cfattach igc_ca = {
 	sizeof(struct igc_softc), igc_match, igc_attach, igc_detach
 };
 
diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 2e96219c0dc..11f582e6732 100644
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwx.c,v 1.140 2022/03/20 12:01:58 stsp Exp $	*/
+/*	$OpenBSD: if_iwx.c,v 1.141 2022/04/06 18:59:29 naddy Exp $	*/
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -9937,7 +9937,7 @@ struct cfdriver iwx_cd = {
 	NULL, "iwx", DV_IFNET
 };
 
-struct cfattach iwx_ca = {
+const struct cfattach iwx_ca = {
 	sizeof(struct iwx_softc), iwx_match, iwx_attach,
 	NULL, iwx_activate
 };
diff --git a/sys/dev/pci/trm_pci.c b/sys/dev/pci/trm_pci.c
index cc0830e7241..fa4b960aaf0 100644
--- a/sys/dev/pci/trm_pci.c
+++ b/sys/dev/pci/trm_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trm_pci.c,v 1.10 2020/07/20 14:41:14 krw Exp $
+/*	$OpenBSD: trm_pci.c,v 1.11 2022/04/06 18:59:29 naddy Exp $
  * ------------------------------------------------------------
  *       O.S     : OpenBSD
  *    FILE NAME  : trm_pci.c
@@ -57,7 +57,7 @@
 int	trm_pci_probe (struct device *, void *, void *);
 void	trm_pci_attach (struct device *, struct device *, void *);
 
-struct  cfattach trm_pci_ca = {
+const struct cfattach trm_pci_ca = {
 	sizeof(struct trm_softc),
 	trm_pci_probe,
 	trm_pci_attach,
diff --git a/sys/dev/pckbc/pckbd.c b/sys/dev/pckbc/pckbd.c
index ccead29ad79..4744ca55d8c 100644
--- a/sys/dev/pckbc/pckbd.c
+++ b/sys/dev/pckbc/pckbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbd.c,v 1.46 2022/01/09 05:42:58 jsg Exp $ */
+/* $OpenBSD: pckbd.c,v 1.47 2022/04/06 18:59:29 naddy Exp $ */
 /* $NetBSD: pckbd.c,v 1.24 2000/06/05 22:20:57 sommerfeld Exp $ */
 
 /*-
@@ -125,7 +125,7 @@ int pckbdprobe(struct device *, void *, void *);
 void pckbdattach(struct device *, struct device *, void *);
 int pckbdactivate(struct device *, int);
 
-struct cfattach pckbd_ca = {
+const struct cfattach pckbd_ca = {
 	sizeof(struct pckbd_softc), 
 	pckbdprobe, 
 	pckbdattach, 
diff --git a/sys/dev/pckbc/pms.c b/sys/dev/pckbc/pms.c
index 360ec47115c..0fc2910860e 100644
--- a/sys/dev/pckbc/pms.c
+++ b/sys/dev/pckbc/pms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pms.c,v 1.95 2020/10/23 22:06:27 bru Exp $ */
+/* $OpenBSD: pms.c,v 1.96 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: psm.c,v 1.11 2000/06/05 22:20:57 sommerfeld Exp $ */
 
 /*-
@@ -324,7 +324,7 @@ int	elantech_set_absolute_mode_v2(struct pms_softc *);
 int	elantech_set_absolute_mode_v3(struct pms_softc *);
 int	elantech_set_absolute_mode_v4(struct pms_softc *);
 
-struct cfattach pms_ca = {
+const struct cfattach pms_ca = {
 	sizeof(struct pms_softc), pmsprobe, pmsattach, NULL,
 	pmsactivate
 };
diff --git a/sys/dev/pcmcia/aic_pcmcia.c b/sys/dev/pcmcia/aic_pcmcia.c
index 33b87141a43..70afb04902f 100644
--- a/sys/dev/pcmcia/aic_pcmcia.c
+++ b/sys/dev/pcmcia/aic_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic_pcmcia.c,v 1.18 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: aic_pcmcia.c,v 1.19 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: aic_pcmcia.c,v 1.6 1998/07/19 17:28:15 christos Exp $	*/
 
 /*
@@ -61,7 +61,7 @@ struct aic_pcmcia_softc {
 	void *sc_ih;				/* interrupt handler */
 };
 
-struct cfattach aic_pcmcia_ca = {
+const struct cfattach aic_pcmcia_ca = {
 	sizeof(struct aic_pcmcia_softc), aic_pcmcia_match, aic_pcmcia_attach,
 	aic_pcmcia_detach
 };
diff --git a/sys/dev/pcmcia/cfxga.c b/sys/dev/pcmcia/cfxga.c
index 93a4333f179..11f6597992b 100644
--- a/sys/dev/pcmcia/cfxga.c
+++ b/sys/dev/pcmcia/cfxga.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cfxga.c,v 1.31 2020/05/25 09:55:49 jsg Exp $	*/
+/*	$OpenBSD: cfxga.c,v 1.32 2022/04/06 18:59:30 naddy Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, Matthieu Herrb and Miodrag Vallat
@@ -99,7 +99,7 @@ void	cfxga_attach(struct device *, struct device *, void *);
 int	cfxga_detach(struct device *, int);
 int	cfxga_activate(struct device *, int);
 
-struct cfattach cfxga_ca = {
+const struct cfattach cfxga_ca = {
 	sizeof(struct cfxga_softc), cfxga_match, cfxga_attach,
 	cfxga_detach, cfxga_activate
 };
diff --git a/sys/dev/pcmcia/com_pcmcia.c b/sys/dev/pcmcia/com_pcmcia.c
index c5e60a30ce8..9f957a34676 100644
--- a/sys/dev/pcmcia/com_pcmcia.c
+++ b/sys/dev/pcmcia/com_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_pcmcia.c,v 1.58 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: com_pcmcia.c,v 1.59 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: com_pcmcia.c,v 1.15 1998/08/22 17:47:58 msaitoh Exp $	*/
 
 /*
@@ -144,7 +144,7 @@ struct com_pcmcia_softc {
 	void *sc_ih;				/* interrupt handler */
 };
 
-struct cfattach com_pcmcia_ca = {
+const struct cfattach com_pcmcia_ca = {
 	sizeof(struct com_pcmcia_softc), com_pcmcia_match, com_pcmcia_attach,
 	com_pcmcia_detach, com_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_an_pcmcia.c b/sys/dev/pcmcia/if_an_pcmcia.c
index 182eafe4074..17dbb537c65 100644
--- a/sys/dev/pcmcia/if_an_pcmcia.c
+++ b/sys/dev/pcmcia/if_an_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_an_pcmcia.c,v 1.26 2015/11/24 17:11:40 mpi Exp $	*/
+/*	$OpenBSD: if_an_pcmcia.c,v 1.27 2022/04/06 18:59:30 naddy Exp $	*/
 
 /*
  * Copyright (c) 1999 Michael Shalayeff
@@ -65,7 +65,7 @@ struct an_pcmcia_softc {
 #define	AN_PCMCIA_ATTACHED	3
 };
 
-struct cfattach an_pcmcia_ca = {   
+const struct cfattach an_pcmcia_ca = {   
 	sizeof(struct an_pcmcia_softc), an_pcmcia_match, an_pcmcia_attach,
 	an_pcmcia_detach, an_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_ep_pcmcia.c b/sys/dev/pcmcia/if_ep_pcmcia.c
index 3b59b871078..5e8c7d6d94f 100644
--- a/sys/dev/pcmcia/if_ep_pcmcia.c
+++ b/sys/dev/pcmcia/if_ep_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pcmcia.c,v 1.49 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: if_ep_pcmcia.c,v 1.50 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: if_ep_pcmcia.c,v 1.16 1998/08/17 23:20:40 thorpej Exp $  */
 
 /*-
@@ -118,7 +118,7 @@ struct ep_pcmcia_softc {
 	struct pcmcia_function *sc_pf;		/* our PCMCIA function */
 };
 
-struct cfattach ep_pcmcia_ca = {
+const struct cfattach ep_pcmcia_ca = {
 	sizeof(struct ep_pcmcia_softc), ep_pcmcia_match, ep_pcmcia_attach,
 	ep_pcmcia_detach, ep_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c
index 755ac994080..76ec8dd53ef 100644
--- a/sys/dev/pcmcia/if_malo.c
+++ b/sys/dev/pcmcia/if_malo.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_malo.c,v 1.98 2022/02/14 23:02:15 jsg Exp $ */
+/*      $OpenBSD: if_malo.c,v 1.99 2022/04/06 18:59:30 naddy Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -132,7 +132,7 @@ struct malo_pcmcia_softc {
 	void			*sc_ih;
 };
 
-struct cfattach malo_pcmcia_ca = {
+const struct cfattach malo_pcmcia_ca = {
 	sizeof(struct malo_pcmcia_softc),
 	malo_pcmcia_match,
 	malo_pcmcia_attach,
diff --git a/sys/dev/pcmcia/if_ne_pcmcia.c b/sys/dev/pcmcia/if_ne_pcmcia.c
index f104002141c..62a5763588a 100644
--- a/sys/dev/pcmcia/if_ne_pcmcia.c
+++ b/sys/dev/pcmcia/if_ne_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ne_pcmcia.c,v 1.100 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: if_ne_pcmcia.c,v 1.101 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: if_ne_pcmcia.c,v 1.17 1998/08/15 19:00:04 thorpej Exp $	*/
 
 /*
@@ -91,7 +91,7 @@ u_int8_t *
 	    u_int8_t[ETHER_ADDR_LEN]);
 int	ne_pcmcia_ax88190_set_iobase(struct ne_pcmcia_softc *);
 
-struct cfattach ne_pcmcia_ca = {
+const struct cfattach ne_pcmcia_ca = {
 	sizeof(struct ne_pcmcia_softc), ne_pcmcia_match, ne_pcmcia_attach,
 	ne_pcmcia_detach, ne_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_sm_pcmcia.c b/sys/dev/pcmcia/if_sm_pcmcia.c
index c5a7fa25a6a..4d3c32fd006 100644
--- a/sys/dev/pcmcia/if_sm_pcmcia.c
+++ b/sys/dev/pcmcia/if_sm_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sm_pcmcia.c,v 1.38 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: if_sm_pcmcia.c,v 1.39 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: if_sm_pcmcia.c,v 1.11 1998/08/15 20:47:32 thorpej Exp $  */
 
 /*-
@@ -81,7 +81,7 @@ struct sm_pcmcia_softc {
 	struct	pcmcia_function *sc_pf;		/* our PCMCIA function */
 };
 
-struct cfattach sm_pcmcia_ca = {
+const struct cfattach sm_pcmcia_ca = {
 	sizeof(struct sm_pcmcia_softc), sm_pcmcia_match, sm_pcmcia_attach,
 	sm_pcmcia_detach, sm_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_wi_pcmcia.c b/sys/dev/pcmcia/if_wi_pcmcia.c
index 79d211a45f4..ac83d2d9a21 100644
--- a/sys/dev/pcmcia/if_wi_pcmcia.c
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_pcmcia.c,v 1.75 2019/12/31 10:05:33 mpi Exp $ */
+/* $OpenBSD: if_wi_pcmcia.c,v 1.76 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: if_wi_pcmcia.c,v 1.14 2001/11/26 04:34:56 ichiro Exp $ */
 
 /*
@@ -83,7 +83,7 @@ struct wi_pcmcia_softc {
 	struct pcmcia_function	*sc_pf;
 };
 
-struct cfattach wi_pcmcia_ca = {
+const struct cfattach wi_pcmcia_ca = {
 	sizeof (struct wi_pcmcia_softc), wi_pcmcia_match, wi_pcmcia_attach,
 	wi_pcmcia_detach, wi_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/if_xe.c b/sys/dev/pcmcia/if_xe.c
index 90f76a9d8a2..da1370af751 100644
--- a/sys/dev/pcmcia/if_xe.c
+++ b/sys/dev/pcmcia/if_xe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xe.c,v 1.61 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: if_xe.c,v 1.62 2022/04/06 18:59:30 naddy Exp $	*/
 
 /*
  * Copyright (c) 1999 Niklas Hallqvist, Brandon Creighton, Job de Haas
@@ -152,7 +152,7 @@ struct cfdriver xe_cd = {
 	NULL, "xe", DV_IFNET
 };
 
-struct cfattach xe_pcmcia_ca = {
+const struct cfattach xe_pcmcia_ca = {
 	sizeof (struct xe_pcmcia_softc), xe_pcmcia_match, xe_pcmcia_attach,
 	xe_pcmcia_detach, xe_pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/pcmcia.c b/sys/dev/pcmcia/pcmcia.c
index 6b4582f4d3b..9e5d0f95c1e 100644
--- a/sys/dev/pcmcia/pcmcia.c
+++ b/sys/dev/pcmcia/pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia.c,v 1.49 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: pcmcia.c,v 1.50 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: pcmcia.c,v 1.9 1998/08/13 02:10:55 eeh Exp $	*/
 
 /*
@@ -63,7 +63,7 @@ struct cfdriver pcmcia_cd = {
 	NULL, "pcmcia", DV_DULL
 };
 
-struct cfattach pcmcia_ca = {
+const struct cfattach pcmcia_ca = {
 	sizeof(struct pcmcia_softc), pcmcia_match, pcmcia_attach, NULL,
 	pcmcia_activate
 };
diff --git a/sys/dev/pcmcia/wdc_pcmcia.c b/sys/dev/pcmcia/wdc_pcmcia.c
index 19d95644cb9..d66fddd9343 100644
--- a/sys/dev/pcmcia/wdc_pcmcia.c
+++ b/sys/dev/pcmcia/wdc_pcmcia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc_pcmcia.c,v 1.33 2021/03/07 06:20:09 jsg Exp $	*/
+/*	$OpenBSD: wdc_pcmcia.c,v 1.34 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: wdc_pcmcia.c,v 1.19 1999/02/19 21:49:43 abs Exp $ */
 
 /*-
@@ -78,7 +78,7 @@ static void wdc_pcmcia_attach(struct device *, struct device *, void *);
 int    wdc_pcmcia_detach(struct device *, int);
 int    wdc_pcmcia_activate(struct device *, int);
 
-struct cfattach wdc_pcmcia_ca = {
+const struct cfattach wdc_pcmcia_ca = {
 	sizeof(struct wdc_pcmcia_softc), wdc_pcmcia_match, wdc_pcmcia_attach,
 	wdc_pcmcia_detach, wdc_pcmcia_activate
 };
diff --git a/sys/dev/puc/com_puc.c b/sys/dev/puc/com_puc.c
index 77e0ef13878..94d413143dc 100644
--- a/sys/dev/puc/com_puc.c
+++ b/sys/dev/puc/com_puc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_puc.c,v 1.26 2021/03/05 13:20:19 jsg Exp $	*/
+/*	$OpenBSD: com_puc.c,v 1.27 2022/04/06 18:59:30 naddy Exp $	*/
 
 /*
  * Copyright (c) 1997 - 1999, Jason Downs.  All rights reserved.
@@ -56,7 +56,7 @@ int	com_puc_match(struct device *, void *, void *);
 void	com_puc_attach(struct device *, struct device *, void *);
 int	com_puc_detach(struct device *, int);
 
-struct cfattach com_puc_ca = {
+const struct cfattach com_puc_ca = {
 	sizeof(struct com_softc), com_puc_match,
 	com_puc_attach, com_puc_detach, com_activate
 };
diff --git a/sys/dev/puc/lpt_puc.c b/sys/dev/puc/lpt_puc.c
index a9c8e21d8ff..d30f9ae948a 100644
--- a/sys/dev/puc/lpt_puc.c
+++ b/sys/dev/puc/lpt_puc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_puc.c,v 1.10 2021/03/05 13:20:19 jsg Exp $	*/
+/*	$OpenBSD: lpt_puc.c,v 1.11 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: lpt_puc.c,v 1.1 1998/06/26 18:52:41 cgd Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ int	lpt_puc_probe(struct device *, void *, void *);
 void	lpt_puc_attach(struct device *, struct device *, void *);
 int	lpt_puc_detach(struct device *, int);
 
-struct cfattach lpt_puc_ca = {
+const struct cfattach lpt_puc_ca = {
 	sizeof(struct lpt_softc), lpt_puc_probe, lpt_puc_attach, lpt_puc_detach,
 };
 
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
index fc08c25ddf4..b85e9a18dc7 100644
--- a/sys/dev/radio.c
+++ b/sys/dev/radio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: radio.c,v 1.12 2022/03/21 19:22:40 miod Exp $ */
+/* $OpenBSD: radio.c,v 1.13 2022/04/06 18:59:27 naddy Exp $ */
 /* $RuOBSD: radio.c,v 1.7 2001/12/04 06:03:05 tm Exp $ */
 
 /*
@@ -48,7 +48,7 @@ int	radiodetach(struct device *, int);
 int	radioactivate(struct device *, int);
 int	radioprint(void *, const char *);
 
-struct cfattach radio_ca = {
+const struct cfattach radio_ca = {
 	sizeof(struct radio_softc), radioprobe, radioattach,
 	radiodetach, radioactivate
 };
diff --git a/sys/dev/rd.c b/sys/dev/rd.c
index 7ca19cbbebc..c167f7b63f7 100644
--- a/sys/dev/rd.c
+++ b/sys/dev/rd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rd.c,v 1.13 2017/12/30 23:08:29 guenther Exp $	*/
+/*	$OpenBSD: rd.c,v 1.14 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2011 Matthew Dempsky <matthew@dempsky.org>
@@ -56,7 +56,7 @@ struct rd_softc {
 	struct disk	sc_dk;
 };
 
-struct cfattach rd_ca = {
+const struct cfattach rd_ca = {
 	sizeof(struct rd_softc),
 	rd_match,
 	rd_attach,
diff --git a/sys/dev/sdmmc/if_bwfm_sdio.c b/sys/dev/sdmmc/if_bwfm_sdio.c
index c19ec37e847..05cc4081689 100644
--- a/sys/dev/sdmmc/if_bwfm_sdio.c
+++ b/sys/dev/sdmmc/if_bwfm_sdio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bwfm_sdio.c,v 1.43 2022/03/18 11:09:39 miod Exp $ */
+/* $OpenBSD: if_bwfm_sdio.c,v 1.44 2022/04/06 18:59:30 naddy Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
  * Copyright (c) 2016,2017 Patrick Wildt <patrick@blueri.se>
@@ -188,7 +188,7 @@ struct bwfm_buscore_ops bwfm_sdio_buscore_ops = {
 	.bc_activate = bwfm_sdio_buscore_activate,
 };
 
-struct cfattach bwfm_sdio_ca = {
+const struct cfattach bwfm_sdio_ca = {
 	sizeof(struct bwfm_sdio_softc),
 	bwfm_sdio_match,
 	bwfm_sdio_attach,
diff --git a/sys/dev/sdmmc/sdmmc.c b/sys/dev/sdmmc/sdmmc.c
index 3923f4ac4a9..16225fcde3c 100644
--- a/sys/dev/sdmmc/sdmmc.c
+++ b/sys/dev/sdmmc/sdmmc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdmmc.c,v 1.58 2020/08/24 15:06:10 kettenis Exp $	*/
+/*	$OpenBSD: sdmmc.c,v 1.59 2022/04/06 18:59:30 naddy Exp $	*/
 
 /*
  * Copyright (c) 2006 Uwe Stuehler <uwe@openbsd.org>
@@ -78,7 +78,7 @@ void sdmmc_dump_command(struct sdmmc_softc *, struct sdmmc_command *);
 #define DPRINTF(n,s)	do {} while (0)
 #endif
 
-struct cfattach sdmmc_ca = {
+const struct cfattach sdmmc_ca = {
 	sizeof(struct sdmmc_softc), sdmmc_match, sdmmc_attach, sdmmc_detach,
 	sdmmc_activate
 };
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index bca68aa55f6..735a61e078e 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.422 2022/03/20 13:14:02 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.423 2022/04/06 18:59:27 naddy Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -83,7 +83,7 @@ void		sr_attach(struct device *, struct device *, void *);
 int		sr_detach(struct device *, int);
 void		sr_map_root(void);
 
-struct cfattach softraid_ca = {
+const struct cfattach softraid_ca = {
 	sizeof(struct sr_softc), sr_match, sr_attach, sr_detach,
 };
 
diff --git a/sys/dev/tc/asc_tc.c b/sys/dev/tc/asc_tc.c
index b7eb1069fbe..82319f0e55a 100644
--- a/sys/dev/tc/asc_tc.c
+++ b/sys/dev/tc/asc_tc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_tc.c,v 1.12 2014/01/18 22:33:59 dlg Exp $ */
+/* $OpenBSD: asc_tc.c,v 1.13 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: asc_tc.c,v 1.19 2001/11/15 09:48:19 lukem Exp $ */
 
 /*-
@@ -57,7 +57,7 @@ struct asc_tc_softc {
 int  asc_tc_match(struct device *, void *, void *);
 void asc_tc_attach(struct device *, struct device *, void *);
 
-struct cfattach asc_tc_ca = {
+const struct cfattach asc_tc_ca = {
 	sizeof(struct asc_tc_softc), asc_tc_match, asc_tc_attach
 };
 
diff --git a/sys/dev/tc/asc_tcds.c b/sys/dev/tc/asc_tcds.c
index 64a40a8035d..d06cc4fea8a 100644
--- a/sys/dev/tc/asc_tcds.c
+++ b/sys/dev/tc/asc_tcds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asc_tcds.c,v 1.8 2014/01/18 22:33:59 dlg Exp $ */
+/* $OpenBSD: asc_tcds.c,v 1.9 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: asc_tcds.c,v 1.5 2001/11/15 09:48:19 lukem Exp $ */
 
 /*-
@@ -83,7 +83,7 @@ int  asc_tcds_match (struct device *, void *, void *);
 void asc_tcds_attach(struct device *, struct device *, void *);
 
 /* Linkup to the rest of the kernel */
-struct cfattach asc_tcds_ca = {
+const struct cfattach asc_tcds_ca = {
 	sizeof(struct asc_tcds_softc), asc_tcds_match, asc_tcds_attach
 };
 
diff --git a/sys/dev/tc/if_le_ioasic.c b/sys/dev/tc/if_le_ioasic.c
index 89a1e368f87..d0915ba1b30 100644
--- a/sys/dev/tc/if_le_ioasic.c
+++ b/sys/dev/tc/if_le_ioasic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_ioasic.c,v 1.18 2017/10/13 08:58:42 mpi Exp $	*/
+/*	$OpenBSD: if_le_ioasic.c,v 1.19 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: if_le_ioasic.c,v 1.18 2001/11/13 06:26:10 lukem Exp $	*/
 
 /*
@@ -71,7 +71,7 @@ struct le_ioasic_softc {
 int  le_ioasic_match(struct device *, void *, void *);
 void le_ioasic_attach(struct device *, struct device *, void *);
 
-struct cfattach le_ioasic_ca = {
+const struct cfattach le_ioasic_ca = {
 	sizeof(struct le_softc), le_ioasic_match, le_ioasic_attach
 };
 
diff --git a/sys/dev/tc/if_le_tc.c b/sys/dev/tc/if_le_tc.c
index 3d5bc84875b..f68b19c817c 100644
--- a/sys/dev/tc/if_le_tc.c
+++ b/sys/dev/tc/if_le_tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le_tc.c,v 1.13 2022/02/21 08:27:51 jsg Exp $	*/
+/*	$OpenBSD: if_le_tc.c,v 1.14 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: if_le_tc.c,v 1.12 2001/11/13 06:26:10 lukem Exp $	*/
 
 /*
@@ -56,7 +56,7 @@
 int	le_tc_match(struct device *, void *, void *);
 void	le_tc_attach(struct device *, struct device *, void *);
 
-struct cfattach le_tc_ca = {
+const struct cfattach le_tc_ca = {
 	sizeof(struct le_softc), le_tc_match, le_tc_attach
 };
 
diff --git a/sys/dev/tc/tc.c b/sys/dev/tc/tc.c
index 399378b40b2..ed54cd40d7a 100644
--- a/sys/dev/tc/tc.c
+++ b/sys/dev/tc/tc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tc.c,v 1.20 2010/11/11 17:54:54 miod Exp $	*/
+/*	$OpenBSD: tc.c,v 1.21 2022/04/06 18:59:30 naddy Exp $	*/
 /*	$NetBSD: tc.c,v 1.29 2001/11/13 06:26:10 lukem Exp $	*/
 
 /*
@@ -40,7 +40,7 @@
 int	tcmatch(struct device *, void *, void *);
 void	tcattach(struct device *, struct device *, void *);
 
-struct cfattach tc_ca = {
+const struct cfattach tc_ca = {
 	sizeof(struct tc_softc), tcmatch, tcattach
 };
 
diff --git a/sys/dev/tc/tcds.c b/sys/dev/tc/tcds.c
index e988fe621c6..6409b95f197 100644
--- a/sys/dev/tc/tcds.c
+++ b/sys/dev/tc/tcds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcds.c,v 1.9 2017/10/27 20:21:53 mpi Exp $ */
+/* $OpenBSD: tcds.c,v 1.10 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: tcds.c,v 1.3 2001/11/13 06:26:10 lukem Exp $ */
 
 /*-
@@ -99,7 +99,7 @@ void	tcdsattach(struct device *, struct device *, void *);
 int     tcdsprint(void *, const char *);
 int	tcdssubmatch(struct device *, void *, void *);
 
-struct cfattach tcds_ca = {
+const struct cfattach tcds_ca = {
 	sizeof(struct tcds_softc), tcdsmatch, tcdsattach,
 };
 
diff --git a/sys/dev/video.c b/sys/dev/video.c
index 7319074c27b..f16c47eba76 100644
--- a/sys/dev/video.c
+++ b/sys/dev/video.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: video.c,v 1.55 2022/03/21 19:22:40 miod Exp $	*/
+/*	$OpenBSD: video.c,v 1.56 2022/04/06 18:59:27 naddy Exp $	*/
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -74,7 +74,7 @@ void	video_intr(void *);
 int	video_stop(struct video_softc *);
 int	video_claim(struct video_softc *, struct process *);
 
-struct cfattach video_ca = {
+const struct cfattach video_ca = {
 	sizeof(struct video_softc), videoprobe, videoattach,
 	videodetach, videoactivate
 };
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index 3c0224392db..cb6b475572c 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.58 2020/12/25 12:59:52 visa Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.59 2022/04/06 18:59:27 naddy Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -78,7 +78,7 @@ struct vscsi_softc {
 #define DEVNAME(_s) ((_s)->sc_dev.dv_xname)
 #define DEV2SC(_d) ((struct vscsi_softc *)device_lookup(&vscsi_cd, minor(_d)))
 
-struct cfattach vscsi_ca = {
+const struct cfattach vscsi_ca = {
 	sizeof(struct vscsi_softc),
 	vscsi_match,
 	vscsi_attach
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index b1fa71b5b15..7fbbf06cff9 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.143 2021/02/09 14:37:13 jcs Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.144 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -207,7 +207,7 @@ struct cfdriver wsdisplay_cd = {
 	NULL, "wsdisplay", DV_TTY
 };
 
-struct cfattach wsdisplay_emul_ca = {
+const struct cfattach wsdisplay_emul_ca = {
 	sizeof(struct wsdisplay_softc), wsdisplay_emul_match,
 	wsdisplay_emul_attach, wsdisplay_emul_detach, wsdisplay_activate
 };
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 0fb6ae6feac..62ba44a8d49 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.111 2022/02/16 06:23:42 anton Exp $ */
+/* $OpenBSD: wskbd.c,v 1.112 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
 
 /*
@@ -246,7 +246,7 @@ struct cfdriver wskbd_cd = {
 	NULL, "wskbd", DV_TTY
 };
 
-struct cfattach wskbd_ca = {
+const struct cfattach wskbd_ca = {
 	sizeof (struct wskbd_softc), wskbd_match, wskbd_attach,
 	wskbd_detach, wskbd_activate
 };
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
index 426e8de0755..20347cfcbf9 100644
--- a/sys/dev/wscons/wsmouse.c
+++ b/sys/dev/wscons/wsmouse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsmouse.c,v 1.67 2021/03/21 16:20:49 bru Exp $ */
+/* $OpenBSD: wsmouse.c,v 1.68 2022/04/06 18:59:30 naddy Exp $ */
 /* $NetBSD: wsmouse.c,v 1.35 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -158,7 +158,7 @@ struct cfdriver wsmouse_cd = {
 	NULL, "wsmouse", DV_TTY
 };
 
-struct cfattach wsmouse_ca = {
+const struct cfattach wsmouse_ca = {
 	sizeof (struct wsmouse_softc), wsmouse_match, wsmouse_attach,
 	wsmouse_detach, wsmouse_activate
 };