MFC

3 files changed, 7 insertions, 3 deletions

diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
index b28b97f..e4e73d4 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9285_phy.c
@@ -87,10 +87,8 @@ ar9285_check_div_comb(struct ath_hal *ah)
 	HAL_EEPROM_v4k *ee = AH_PRIVATE(ah)->ah_eeprom;
         const MODAL_EEP4K_HEADER *pModal = &ee->ee_base.modalHeader;
 
-#if 0
 	/* For now, simply disable this until it's better debugged. -adrian */
 	return AH_FALSE;
-#endif
 
 	if (! AR_SREV_KITE(ah))
 		return AH_FALSE;
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9287.c b/sys/dev/ath/ath_hal/ar9002/ar9287.c
index 92501ca..9b874b3 100644
--- a/sys/dev/ath/ath_hal/ar9002/ar9287.c
+++ b/sys/dev/ath/ath_hal/ar9002/ar9287.c
@@ -36,7 +36,7 @@ struct ar9287State {
 	RF_HAL_FUNCS	base;		/* public state, must be first */
 	uint16_t	pcdacTable[1];	/* XXX */
 };
-#define	AR9280(ah)	((struct ar9287State *) AH5212(ah)->ah_rfHal)
+#define	AR9287(ah)	((struct ar9287State *) AH5212(ah)->ah_rfHal)
 
 static HAL_BOOL ar9287GetChannelMaxMinPower(struct ath_hal *,
 	const struct ieee80211_channel *, int16_t *maxPow,int16_t *minPow);
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 83b02ea..3869786 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -1292,6 +1292,12 @@ puc_config_timedia(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
 	uint16_t subdev;
 
 	switch (cmd) {
+	case PUC_CFG_GET_CLOCK:
+		if (port < 2)
+			*res = DEFAULT_RCLK * 8;
+		else
+			*res = DEFAULT_RCLK;
+		return (0);
 	case PUC_CFG_GET_DESC:
 		snprintf(desc, sizeof(desc),
 		    "Timedia technology %d Port Serial", (int)sc->sc_cfg_data);