aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-04-19 21:31:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-04-19 21:31:48 +0000
commit408de8588325333aa127661b1de8bb00dd82572b (patch)
tree081ef28c1c9011ff543237965c774e2d29db2c81
parent0a9832b50de820cc54fcf813d371cafc8cf8cefc (diff)
downloadupstream-408de8588325333aa127661b1de8bb00dd82572b.tar.gz
upstream-408de8588325333aa127661b1de8bb00dd82572b.tar.bz2
upstream-408de8588325333aa127661b1de8bb00dd82572b.zip
ar71xx: use ap91_pci_init for RB751{,G}
SVN-Revision: 31356
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c46
-rw-r--r--target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751GL-support.patch3
-rw-r--r--target/linux/ar71xx/patches-3.3/614-MIPS-ath79-RB751GL-support.patch3
3 files changed, 20 insertions, 32 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
index 4d02eb2d89..7a24b57fb5 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
@@ -22,11 +22,10 @@
#include <asm/mach-ath79/mach-rb750.h>
#include "common.h"
+#include "dev-ap9x-pci.h"
#include "dev-usb.h"
#include "dev-eth.h"
#include "machtypes.h"
-#include "pci-ath9k-fixup.h"
-#include "pci.h"
static struct rb750_led_data rb750_leds[] = {
{
@@ -278,23 +277,6 @@ static void __init rb750gr3_setup(void)
MIPS_MACHINE(ATH79_MACH_RB_750G_R3, "750Gr3", "MikroTik RouterBOARD 750GL",
rb750gr3_setup);
-static struct ath9k_platform_data rb751_wmac_data = {
- .led_pin = -1,
-};
-
-static u8 rb751_wmac_mac[6];
-
-static int rb751_pci_plat_dev_init(struct pci_dev *dev)
-{
- switch (PCI_SLOT(dev->devfn)) {
- case 0:
- dev->dev.platform_data = &rb751_wmac_data;
- break;
- }
-
- return 0;
-}
-
static int decode_rle(char *output, int len, char *in)
{
char *ptr = output;
@@ -332,20 +314,24 @@ static int decode_rle(char *output, int len, char *in)
static void __init rb751_wlan_setup(void)
{
u8 *hardconfig = (u8 *) KSEG1ADDR(RB751_HARDCONFIG);
+ struct ath9k_platform_data *wmac_data;
+ int dec_size;
- ath79_pci_set_plat_dev_init(rb751_pci_plat_dev_init);
- ath79_register_pci();
-
- rb751_wmac_data.macaddr = memcpy(rb751_wmac_mac,
- hardconfig + RB751_MAC_ADDRESS_OFFSET, 6);
+ wmac_data = ap9x_pci_get_wmac_data(0);
+ if (!wmac_data) {
+ pr_err("rb75x: unable to get address of wlan data\n");
+ return;
+ }
- if (decode_rle((char *)rb751_wmac_data.eeprom_data,
- sizeof(rb751_wmac_data.eeprom_data),
- hardconfig + RB751_CALDATA_OFFSET) ==
- sizeof(rb751_wmac_data.eeprom_data)) {
- pr_info("rb7xx: calibration data found\n");
- pci_enable_ath9k_fixup(0, rb751_wmac_data.eeprom_data);
+ dec_size = decode_rle((char *) wmac_data->eeprom_data,
+ sizeof(wmac_data->eeprom_data),
+ hardconfig + RB751_CALDATA_OFFSET);
+ if (dec_size != sizeof(wmac_data->eeprom_data)) {
+ pr_err("rb75x: unable to decode wlan eeprom data\n");
+ return;
}
+
+ ap91_pci_init(NULL, hardconfig + RB751_MAC_ADDRESS_OFFSET);
}
static void __init rb751_setup(void)
diff --git a/target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751GL-support.patch b/target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751GL-support.patch
index 80689c6a90..14d3a2dc5f 100644
--- a/target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751GL-support.patch
+++ b/target/linux/ar71xx/patches-3.2/614-MIPS-ath79-RB751GL-support.patch
@@ -1,9 +1,10 @@
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -300,6 +300,7 @@ config ATH79_MACH_RB750
+@@ -300,6 +300,8 @@ config ATH79_MACH_RB750
bool "MikroTik RouterBOARD 750 support"
select SOC_AR724X
select ATH79_DEV_ETH
++ select ATH79_DEV_AP9X_PCI if PCI
+ select ATH79_DEV_USB
config ATH79_MACH_WNDR3700
diff --git a/target/linux/ar71xx/patches-3.3/614-MIPS-ath79-RB751GL-support.patch b/target/linux/ar71xx/patches-3.3/614-MIPS-ath79-RB751GL-support.patch
index 80689c6a90..14d3a2dc5f 100644
--- a/target/linux/ar71xx/patches-3.3/614-MIPS-ath79-RB751GL-support.patch
+++ b/target/linux/ar71xx/patches-3.3/614-MIPS-ath79-RB751GL-support.patch
@@ -1,9 +1,10 @@
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -300,6 +300,7 @@ config ATH79_MACH_RB750
+@@ -300,6 +300,8 @@ config ATH79_MACH_RB750
bool "MikroTik RouterBOARD 750 support"
select SOC_AR724X
select ATH79_DEV_ETH
++ select ATH79_DEV_AP9X_PCI if PCI
+ select ATH79_DEV_USB
config ATH79_MACH_WNDR3700