diff --git a/sys/mips/conf/QCA955X_BASE.hints b/sys/mips/conf/QCA955X_BASE.hints
index 12d9393ef389..2b0fcdeeb873 100644
--- a/sys/mips/conf/QCA955X_BASE.hints
+++ b/sys/mips/conf/QCA955X_BASE.hints
@@ -12,6 +12,10 @@ hint.apb.0.at="nexus0"
 # the irq ranges appropriately.
 hint.apb.0.irq=4
 
+# ART calibration data mapping device
+hint.ar71xx_caldata.0.at="nexus0"
+hint.ar71xx_caldata.0.order=0
+
 # uart0
 hint.uart.0.at="apb0"
 # NB: This isn't an ns8250 UART
@@ -59,9 +63,13 @@ hint.ath.0.msize=0x20000
 hint.ath.0.irq=0
 hint.ath.0.vendor_id=0x168c
 hint.ath.0.device_id=0x0039
-# Set this to define where the ath calibration data
-# should be fetched from in physical memory.
-# hint.ath.0.eepromaddr=0x1fff1000
+
+# Where the ART is - last 64k in the first 8MB of flash
+#hint.ar71xx_caldata.0.map.0.ath_fixup_addr=0x1fff0000
+#hint.ar71xx_caldata.0.map.0.ath_fixup_size=16384
+
+# And now tell the ath(4) driver where to look!
+#hint.ath.0.eeprom_firmware="ar71xx_caldata.0.map.0.eeprom_firmware"
 
 # SPI flash
 hint.spi.0.at="nexus0"
diff --git a/sys/mips/conf/std.QCA955X b/sys/mips/conf/std.QCA955X
index 36b0ab019367..8200c79250e1 100644
--- a/sys/mips/conf/std.QCA955X
+++ b/sys/mips/conf/std.QCA955X
@@ -50,7 +50,17 @@ options 	NO_FFS_SNAPSHOT		# We don't require snapshot support
 include 	"std.AR_MIPS_BASE"
 makeoptions 	MODULES_OVERRIDE+="hwpmc_mips74k"
 
+# EEPROM caldata for AHB connected device
+options 	AR71XX_ATH_EEPROM
+device 		ar71xx_caldata
+device 		firmware
+
+# Support QCA955x in the HAL
 option		AH_SUPPORT_QCA9550	# Chipset support
+
+# Support EEPROM caldata in AHB devices
+options 	ATH_EEPROM_FIRMWARE
+
 device		uart_ar71xx
 
 device		ar71xx_apb