From 56e91aa977801f0b0caf1f172f73b2affd283221 Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 23 Jul 2017 07:10:41 +0000
Subject: [PATCH] [ar933x] make carambola2 work again!

* Add in the hints needed for AR933x ath(4) support - this is the nicer way
  that allows ath to be a module;
* ATH_EEPROM_FIRMWARE is also required for all AR933x chipsets.

Tested:

* Carambola2, AR933x
---
 sys/mips/conf/CARAMBOLA2.hints | 14 ++++++++++----
 sys/mips/conf/std.AR933X       |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/sys/mips/conf/CARAMBOLA2.hints b/sys/mips/conf/CARAMBOLA2.hints
index 34f4865b8b64..f1bb912c7816 100644
--- a/sys/mips/conf/CARAMBOLA2.hints
+++ b/sys/mips/conf/CARAMBOLA2.hints
@@ -31,10 +31,16 @@ hint.arge.1.media=1000
 hint.arge.1.fduplex=1
 hint.arge.1.eeprommac=0x1fff0006
 
-# Where the ART is - last 64k in the flash
-# 0x9fff1000 ?
-hint.ath.0.eepromaddr=0x1fff0000
-hint.ath.0.eepromsize=16384
+
+# ART calibration data mapping
+hint.ar71xx_caldata.0.at="nexus0"
+hint.ar71xx_caldata.0.order=0
+# 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"
 
 # The AP121 16MB flash layout:
 #
diff --git a/sys/mips/conf/std.AR933X b/sys/mips/conf/std.AR933X
index d91c434f8c23..5bc3980bddd4 100644
--- a/sys/mips/conf/std.AR933X
+++ b/sys/mips/conf/std.AR933X
@@ -57,7 +57,10 @@ include		"std.AR_MIPS_BASE"
 
 makeoptions	MODULES_OVERRIDE+="hwpmc_mips24k"
 
+# AR9330 support - everything shipping uses EEPROM for calibration data,
+# so always include this.
 option		AH_SUPPORT_AR9330	# Chipset support
+option 		ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 
 device		usb
 device		ehci