Commit 164a9748 authored by Sergey Ryazanov's avatar Sergey Ryazanov Committed by Ralf Baechle

ath5k: update dependencies

- Use config symbol defined in the driver instead of arch specific one for
  conditional compilation.
- Rename the ATHEROS_AR231X config symbol to ATH25.
- Fix include (ar231x_platform.h -> ath25_platform.h).
- Some of AR231x SoCs (e.g. AR2315) have PCI bus support, so remove !PCI
  dependency, which block AHB support build.
Signed-off-by: default avatarSergey Ryazanov <ryazanov.s.a@gmail.com>
Acked-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
Cc: linux-wireless@vger.kernel.org
Cc: ath5k-devel@lists.ath5k.org
Cc: Linux MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/8248/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 0e5d3ab5
config ATH5K config ATH5K
tristate "Atheros 5xxx wireless cards support" tristate "Atheros 5xxx wireless cards support"
depends on (PCI || ATHEROS_AR231X) && MAC80211 depends on (PCI || ATH25) && MAC80211
select ATH_COMMON select ATH_COMMON
select MAC80211_LEDS select MAC80211_LEDS
select LEDS_CLASS select LEDS_CLASS
select NEW_LEDS select NEW_LEDS
select AVERAGE select AVERAGE
select ATH5K_AHB if (ATHEROS_AR231X && !PCI) select ATH5K_AHB if ATH25
select ATH5K_PCI if (!ATHEROS_AR231X && PCI) select ATH5K_PCI if !ATH25
---help--- ---help---
This module adds support for wireless adapters based on This module adds support for wireless adapters based on
Atheros 5xxx chipset. Atheros 5xxx chipset.
...@@ -54,14 +54,14 @@ config ATH5K_TRACER ...@@ -54,14 +54,14 @@ config ATH5K_TRACER
config ATH5K_AHB config ATH5K_AHB
bool "Atheros 5xxx AHB bus support" bool "Atheros 5xxx AHB bus support"
depends on (ATHEROS_AR231X && !PCI) depends on ATH25
---help--- ---help---
This adds support for WiSoC type chipsets of the 5xxx Atheros This adds support for WiSoC type chipsets of the 5xxx Atheros
family. family.
config ATH5K_PCI config ATH5K_PCI
bool "Atheros 5xxx PCI bus support" bool "Atheros 5xxx PCI bus support"
depends on (!ATHEROS_AR231X && PCI) depends on (!ATH25 && PCI)
---help--- ---help---
This adds support for PCI type chipsets of the 5xxx Atheros This adds support for PCI type chipsets of the 5xxx Atheros
family. family.
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/export.h> #include <linux/export.h>
#include <ar231x_platform.h> #include <ath25_platform.h>
#include "ath5k.h" #include "ath5k.h"
#include "debug.h" #include "debug.h"
#include "base.h" #include "base.h"
......
...@@ -1647,7 +1647,7 @@ static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah) ...@@ -1647,7 +1647,7 @@ static inline struct ath_regulatory *ath5k_hw_regulatory(struct ath5k_hw *ah)
return &(ath5k_hw_common(ah)->regulatory); return &(ath5k_hw_common(ah)->regulatory);
} }
#ifdef CONFIG_ATHEROS_AR231X #ifdef CONFIG_ATH5K_AHB
#define AR5K_AR2315_PCI_BASE ((void __iomem *)0xb0100000) #define AR5K_AR2315_PCI_BASE ((void __iomem *)0xb0100000)
static inline void __iomem *ath5k_ahb_reg(struct ath5k_hw *ah, u16 reg) static inline void __iomem *ath5k_ahb_reg(struct ath5k_hw *ah, u16 reg)
......
...@@ -99,7 +99,7 @@ static int ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan, ...@@ -99,7 +99,7 @@ static int ath5k_reset(struct ath5k_hw *ah, struct ieee80211_channel *chan,
/* Known SREVs */ /* Known SREVs */
static const struct ath5k_srev_name srev_names[] = { static const struct ath5k_srev_name srev_names[] = {
#ifdef CONFIG_ATHEROS_AR231X #ifdef CONFIG_ATH5K_AHB
{ "5312", AR5K_VERSION_MAC, AR5K_SREV_AR5312_R2 }, { "5312", AR5K_VERSION_MAC, AR5K_SREV_AR5312_R2 },
{ "5312", AR5K_VERSION_MAC, AR5K_SREV_AR5312_R7 }, { "5312", AR5K_VERSION_MAC, AR5K_SREV_AR5312_R7 },
{ "2313", AR5K_VERSION_MAC, AR5K_SREV_AR2313_R8 }, { "2313", AR5K_VERSION_MAC, AR5K_SREV_AR2313_R8 },
...@@ -142,7 +142,7 @@ static const struct ath5k_srev_name srev_names[] = { ...@@ -142,7 +142,7 @@ static const struct ath5k_srev_name srev_names[] = {
{ "5413", AR5K_VERSION_RAD, AR5K_SREV_RAD_5413 }, { "5413", AR5K_VERSION_RAD, AR5K_SREV_RAD_5413 },
{ "5424", AR5K_VERSION_RAD, AR5K_SREV_RAD_5424 }, { "5424", AR5K_VERSION_RAD, AR5K_SREV_RAD_5424 },
{ "5133", AR5K_VERSION_RAD, AR5K_SREV_RAD_5133 }, { "5133", AR5K_VERSION_RAD, AR5K_SREV_RAD_5133 },
#ifdef CONFIG_ATHEROS_AR231X #ifdef CONFIG_ATH5K_AHB
{ "2316", AR5K_VERSION_RAD, AR5K_SREV_RAD_2316 }, { "2316", AR5K_VERSION_RAD, AR5K_SREV_RAD_2316 },
{ "2317", AR5K_VERSION_RAD, AR5K_SREV_RAD_2317 }, { "2317", AR5K_VERSION_RAD, AR5K_SREV_RAD_2317 },
#endif #endif
......
...@@ -163,7 +163,7 @@ int ath5k_init_leds(struct ath5k_hw *ah) ...@@ -163,7 +163,7 @@ int ath5k_init_leds(struct ath5k_hw *ah)
{ {
int ret = 0; int ret = 0;
struct ieee80211_hw *hw = ah->hw; struct ieee80211_hw *hw = ah->hw;
#ifndef CONFIG_ATHEROS_AR231X #ifndef CONFIG_ATH5K_AHB
struct pci_dev *pdev = ah->pdev; struct pci_dev *pdev = ah->pdev;
#endif #endif
char name[ATH5K_LED_MAX_NAME_LEN + 1]; char name[ATH5K_LED_MAX_NAME_LEN + 1];
...@@ -172,7 +172,7 @@ int ath5k_init_leds(struct ath5k_hw *ah) ...@@ -172,7 +172,7 @@ int ath5k_init_leds(struct ath5k_hw *ah)
if (!ah->pdev) if (!ah->pdev)
return 0; return 0;
#ifdef CONFIG_ATHEROS_AR231X #ifdef CONFIG_ATH5K_AHB
match = NULL; match = NULL;
#else #else
match = pci_match_id(&ath5k_led_devices[0], pdev); match = pci_match_id(&ath5k_led_devices[0], pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment