Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3762561a authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files

ath9k: add MAC revision detection for AR9330 



The AR9330 1.0 and 1.1 are using the same revision,
thus it is not possible to distinguish the two chips.
The platform setup code can distinguish the chips based
on the SoC revision.

Add a callback function to ath9k_platform_data in order
to allow getting the revision number from the platform code.

Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 03689301

drivers/net/wireless/ath/ath9k/hw.c

+9 −0
Original line number Diff line number Diff line
@@ -251,6 +251,15 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah) 
	case AR5416_AR9100_DEVID:

		ah->hw_version.macVersion = AR_SREV_VERSION_9100;

		break;

	case AR9300_DEVID_AR9330:

		ah->hw_version.macVersion = AR_SREV_VERSION_9330;

		if (ah->get_mac_revision) {

			ah->hw_version.macRev = ah->get_mac_revision();

		} else {

			val = REG_READ(ah, AR_SREV);

			ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);

		}

		return;

	case AR9300_DEVID_AR9340:

		ah->hw_version.macVersion = AR_SREV_VERSION_9340;

		val = REG_READ(ah, AR_SREV);

drivers/net/wireless/ath/ath9k/hw.h

+1 −0
Original line number Diff line number Diff line
@@ -862,6 +862,7 @@ struct ath_hw { 
	u32 ent_mode;



	bool is_clk_25mhz;

	int (*get_mac_revision)(void);

};



struct ath_bus_ops {

drivers/net/wireless/ath/ath9k/init.c

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
		sc->sc_ah->gpio_val = pdata->gpio_val;

		sc->sc_ah->led_pin = pdata->led_pin;

		ah->is_clk_25mhz = pdata->is_clk_25mhz;

		ah->get_mac_revision = pdata->get_mac_revision;

	}



	common = ath9k_hw_common(ah);

include/linux/ath9k_platform.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ struct ath9k_platform_data { 
	u32 gpio_val;



	bool is_clk_25mhz;

	int (*get_mac_revision)(void);

};



#endif /* _LINUX_ATH9K_PLATFORM_H */