aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-12-16 10:28:41 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-12-16 10:28:41 +0000
commit59b6cf1e7001295d4ec5fd0e106dc7140e55c2c0 (patch)
treed690bc51ebb5d12e4db61aae46138b8edb49ea22
parent6218da5a411d4992235e5b3afdf5a28666cf8b9a (diff)
downloadupstream-59b6cf1e7001295d4ec5fd0e106dc7140e55c2c0.tar.gz
upstream-59b6cf1e7001295d4ec5fd0e106dc7140e55c2c0.tar.bz2
upstream-59b6cf1e7001295d4ec5fd0e106dc7140e55c2c0.zip
ar71xx: rb2011: use the new RouterBOOT helpers
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 39094
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c75
1 files changed, 29 insertions, 46 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
index 9b0145875b..44a1aa79b2 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
@@ -21,7 +21,6 @@
#include <linux/mtd/partitions.h>
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
-#include <linux/rle.h>
#include <linux/routerboot.h>
#include <linux/gpio.h>
@@ -70,25 +69,13 @@ static struct mtd_partition rb2011_spi_partitions[] = {
}
};
-
-static void __init rb2011_init_partitions(void)
+static void __init rb2011_init_partitions(const struct rb_info *info)
{
- u8 *addr = (u8 *) KSEG1ADDR(0x1f000000);
- u32 next = RB_ROUTERBOOT_MIN_SIZE;
-
- if (routerboot_find_magic(addr, 0x10000, &next, true))
- printk(KERN_ERR "Warning: could not find a valid RouterBOOT hard config\n");
- rb2011_spi_partitions[0].size = next;
- rb2011_spi_partitions[1].offset = next;
-
- next = RB_BIOS_OFFSET + RB_BIOS_SIZE;
- if (routerboot_find_magic(addr, 0x10000, &next, false))
- printk(KERN_ERR "Warning: could not find a valid RouterBOOT soft config\n");
-
- rb2011_spi_partitions[3].offset = next;
+ rb2011_spi_partitions[0].size = info->hard_cfg_offs;
+ rb2011_spi_partitions[1].offset = info->hard_cfg_offs;
+ rb2011_spi_partitions[3].offset = info->soft_cfg_offs;
}
-
static struct mtd_partition rb2011_nand_partitions[] = {
{
.name = "booter",
@@ -154,38 +141,16 @@ static struct mdio_board_info rb2011_mdio0_info[] = {
static void __init rb2011_wlan_init(void)
{
- u8 *hard_cfg = (u8 *) KSEG1ADDR(0x1f000000);
- u16 tag_len;
- u8 *tag;
char *art_buf;
u8 wlan_mac[ETH_ALEN];
- int err;
- hard_cfg += rb2011_spi_partitions[1].offset;
- err = routerboot_find_tag(hard_cfg, RB_HARD_CFG_SIZE, RB_ID_WLAN_DATA,
- &tag, &tag_len);
- if (err) {
- pr_err("no calibration data found\n");
+ art_buf = rb_get_wlan_data();
+ if (art_buf == NULL)
return;
- }
-
- art_buf = kmalloc(RB_ART_SIZE, GFP_KERNEL);
- if (art_buf == NULL) {
- pr_err("no memory for calibration data\n");
- return;
- }
-
- err = rle_decode((char *) tag, tag_len, art_buf, RB_ART_SIZE,
- NULL, NULL);
- if (err) {
- pr_err("unable to decode calibration data\n");
- goto free;
- }
ath79_init_mac(wlan_mac, ath79_mac_base, 11);
ath79_register_wmac(art_buf + 0x1000, wlan_mac);
-free:
kfree(art_buf);
}
@@ -265,9 +230,15 @@ static void __init rb2011_sfp_init(void)
rb2011_ar8327_data.get_port_link = rb2011_get_port_link;
}
-static void __init rb2011_setup(void)
+static int __init rb2011_setup(void)
{
- rb2011_init_partitions();
+ const struct rb_info *info;
+
+ info = rb_init_info((void *) KSEG1ADDR(0x1f000000), 0x10000);
+ if (!info)
+ return -ENODEV;
+
+ rb2011_init_partitions(info);
ath79_register_m25p80(&rb2011_spi_flash_data);
rb2011_nand_init();
@@ -297,14 +268,24 @@ static void __init rb2011_setup(void)
ath79_eth1_data.duplex = DUPLEX_FULL;
ath79_register_eth(1);
+
+ return 0;
}
+static void __init rb2011l_setup(void)
+{
+ rb2011_setup();
+}
+
+
MIPS_MACHINE(ATH79_MACH_RB_2011L, "2011L", "MikroTik RouterBOARD 2011L",
- rb2011_setup);
+ rb2011l_setup);
static void __init rb2011us_setup(void)
{
- rb2011_setup();
+ if (rb2011_setup())
+ return;
+
rb2011_sfp_init();
ath79_register_usb();
@@ -315,7 +296,9 @@ MIPS_MACHINE(ATH79_MACH_RB_2011US, "2011US", "MikroTik RouterBOARD 2011UAS",
static void __init rb2011g_setup(void)
{
- rb2011_setup();
+ if (rb2011_setup())
+ return;
+
rb2011_sfp_init();
rb2011_wlan_init();