X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Fath79%2Fmach-rb2011.c;h=afd56085c7bb9411a76b7420e5afab7ae4b412f7;hb=b134648a1a3bdda2d64b4e97f6fa2b7a2a5e5f49;hp=19661029e93110d7f1de28c4d6c18b7072419f3b;hpb=c62a189e9cbf5878e790d60ebee453312ff5f3f5;p=openwrt.git 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 19661029e9..afd56085c7 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c @@ -21,10 +21,10 @@ #include #include #include -#include #include #include +#include #include #include @@ -32,6 +32,7 @@ #include "dev-eth.h" #include "dev-m25p80.h" #include "dev-nfc.h" +#include "dev-usb.h" #include "dev-wmac.h" #include "machtypes.h" #include "routerboot.h" @@ -49,6 +50,10 @@ #define RB_ART_SIZE 0x10000 +#define RB2011_FLAG_SFP BIT(0) +#define RB2011_FLAG_USB BIT(1) +#define RB2011_FLAG_WLAN BIT(2) + static struct mtd_partition rb2011_spi_partitions[] = { { .name = "routerboot", @@ -69,25 +74,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", @@ -124,13 +117,27 @@ static struct ar8327_pad_cfg rb2011_ar8327_pad6_cfg; static struct ar8327_sgmii_cfg rb2011_ar8327_sgmii_cfg; static struct ar8327_led_cfg rb2011_ar8327_led_cfg = { - .led_ctrl0 = 0x0000c731, + .led_ctrl0 = 0xc731c731, .led_ctrl1 = 0x00000000, .led_ctrl2 = 0x00000000, .led_ctrl3 = 0x0030c300, .open_drain = false, }; +static const struct ar8327_led_info rb2011_ar8327_leds[] __initconst = { + AR8327_LED_INFO(PHY0_0, HW, "rb:green:eth1"), + AR8327_LED_INFO(PHY1_0, HW, "rb:green:eth2"), + AR8327_LED_INFO(PHY2_0, HW, "rb:green:eth3"), + AR8327_LED_INFO(PHY3_0, HW, "rb:green:eth4"), + AR8327_LED_INFO(PHY4_0, HW, "rb:green:eth5"), + AR8327_LED_INFO(PHY0_1, SW, "rb:green:eth6"), + AR8327_LED_INFO(PHY1_1, SW, "rb:green:eth7"), + AR8327_LED_INFO(PHY2_1, SW, "rb:green:eth8"), + AR8327_LED_INFO(PHY3_1, SW, "rb:green:eth9"), + AR8327_LED_INFO(PHY4_1, SW, "rb:green:eth10"), + AR8327_LED_INFO(PHY4_2, SW, "rb:green:usr"), +}; + static struct ar8327_platform_data rb2011_ar8327_data = { .pad0_cfg = &rb2011_ar8327_pad0_cfg, .port0_cfg = { @@ -141,6 +148,8 @@ static struct ar8327_platform_data rb2011_ar8327_data = { .rxpause = 1, }, .led_cfg = &rb2011_ar8327_led_cfg, + .num_leds = ARRAY_SIZE(rb2011_ar8327_leds), + .leds = rb2011_ar8327_leds, }; static struct mdio_board_info rb2011_mdio0_info[] = { @@ -153,38 +162,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); } @@ -264,9 +251,20 @@ 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(u32 flags) { - rb2011_init_partitions(); + const struct rb_info *info; + char buf[64]; + + info = rb_init_info((void *) KSEG1ADDR(0x1f000000), 0x10000); + if (!info) + return -ENODEV; + + scnprintf(buf, sizeof(buf), "Mikrotik RouterBOARD %s", + (info->board_name) ? info->board_name : ""); + mips_set_machine_name(buf); + + rb2011_init_partitions(info); ath79_register_m25p80(&rb2011_spi_flash_data); rb2011_nand_init(); @@ -296,26 +294,45 @@ static void __init rb2011_setup(void) ath79_eth1_data.duplex = DUPLEX_FULL; ath79_register_eth(1); + + if (flags & RB2011_FLAG_SFP) + rb2011_sfp_init(); + + if (flags & RB2011_FLAG_WLAN) + rb2011_wlan_init(); + + if (flags & RB2011_FLAG_USB) + ath79_register_usb(); + + return 0; } -MIPS_MACHINE(ATH79_MACH_RB_2011L, "2011L", "MikroTik RouterBOARD 2011L", - rb2011_setup); +static void __init rb2011l_setup(void) +{ + rb2011_setup(0); +} + +MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011L, "2011L", rb2011l_setup); static void __init rb2011us_setup(void) { - rb2011_setup(); - rb2011_sfp_init(); + rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB); +} + +MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup); + +static void __init rb2011r5_setup(void) +{ + rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB | RB2011_FLAG_WLAN); } -MIPS_MACHINE(ATH79_MACH_RB_2011US, "2011US", "MikroTik RouterBOARD 2011UAS", - rb2011us_setup); +MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011R5, "2011r5", rb2011r5_setup); static void __init rb2011g_setup(void) { - rb2011_setup(); - rb2011_sfp_init(); - rb2011_wlan_init(); + rb2011_setup(RB2011_FLAG_SFP | + RB2011_FLAG_USB | + RB2011_FLAG_WLAN); } -MIPS_MACHINE(ATH79_MACH_RB_2011G, "2011G", "MikroTik RouterBOARD 2011UAS-2HnD", - rb2011g_setup); +MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011G, "2011G", rb2011g_setup);