ar71xx: Add kernel 4.9 support
[openwrt/staging/dedeckeh.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-rb2011.c
index 44a1aa79b22499626cb5ad31247f2d87f9cb3b03..9100a5977afa97fb1536f542fa061cdc01979d9b 100644 (file)
@@ -23,7 +23,9 @@
 #include <linux/spi/flash.h>
 #include <linux/routerboot.h>
 #include <linux/gpio.h>
+#include <linux/version.h>
 
+#include <asm/prom.h>
 #include <asm/mach-ath79/ath79.h>
 #include <asm/mach-ath79/ar71xx_regs.h>
 
 
 #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",
@@ -89,7 +95,7 @@ static struct mtd_partition rb2011_nand_partitions[] = {
                .size   = (4 * 1024 * 1024) - (256 * 1024),
        },
        {
-               .name   = "rootfs",
+               .name   = "ubi",
                .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
@@ -112,13 +118,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 = {
@@ -129,6 +149,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[] = {
@@ -167,6 +189,7 @@ static void rb2011_nand_select_chip(int chip_no)
        ndelay(500);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
 static struct nand_ecclayout rb2011_nand_ecclayout = {
        .eccbytes       = 6,
        .eccpos         = { 8, 9, 10, 13, 14, 15 },
@@ -174,16 +197,72 @@ static struct nand_ecclayout rb2011_nand_ecclayout = {
        .oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
 };
 
+#else
+
+static int rb2011_ooblayout_ecc(struct mtd_info *mtd, int section,
+                               struct mtd_oob_region *oobregion)
+{
+       switch (section) {
+       case 0:
+               oobregion->offset = 8;
+               oobregion->length = 3;
+               return 0;
+       case 1:
+               oobregion->offset = 13;
+               oobregion->length = 3;
+               return 0;
+       default:
+               return -ERANGE;
+       }
+}
+
+static int rb2011_ooblayout_free(struct mtd_info *mtd, int section,
+                                struct mtd_oob_region *oobregion)
+{
+       switch (section) {
+       case 0:
+               oobregion->offset = 0;
+               oobregion->length = 4;
+               return 0;
+       case 1:
+               oobregion->offset = 4;
+               oobregion->length = 1;
+               return 0;
+       case 2:
+               oobregion->offset = 6;
+               oobregion->length = 2;
+               return 0;
+       case 3:
+               oobregion->offset = 11;
+               oobregion->length = 2;
+               return 0;
+       default:
+               return -ERANGE;
+       }
+}
+
+static const struct mtd_ooblayout_ops rb2011_nand_ecclayout_ops = {
+       .ecc = rb2011_ooblayout_ecc,
+       .free = rb2011_ooblayout_free,
+};
+#endif /* < 4.6 */
+
 static int rb2011_nand_scan_fixup(struct mtd_info *mtd)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
        struct nand_chip *chip = mtd->priv;
+#endif
 
        if (mtd->writesize == 512) {
                /*
                 * Use the OLD Yaffs-1 OOB layout, otherwise RouterBoot
                 * will not be able to find the kernel that we load.
                 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
                chip->ecc.layout = &rb2011_nand_ecclayout;
+#else
+               mtd_set_ooblayout(mtd, &rb2011_nand_ecclayout_ops);
+#endif
        }
 
        return 0;
@@ -230,20 +309,26 @@ static void __init rb2011_sfp_init(void)
        rb2011_ar8327_data.get_port_link = rb2011_get_port_link;
 }
 
-static int __init rb2011_setup(void)
+static int __init rb2011_setup(u32 flags)
 {
        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();
 
        ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_RGMII_GMAC0 |
+                                  AR934X_ETH_CFG_RXD_DELAY |
                                   AR934X_ETH_CFG_SW_ONLY_MODE);
 
        ath79_register_mdio(1, 0x0);
@@ -257,7 +342,7 @@ static int __init rb2011_setup(void)
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ath79_eth0_data.phy_mask = BIT(0);
        ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
-       ath79_eth0_pll_data.pll_1000 = 0x06000000;
+       ath79_eth0_pll_data.pll_1000 = 0x6f000000;
 
        ath79_register_eth(0);
 
@@ -269,41 +354,44 @@ static int __init rb2011_setup(void)
 
        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;
 }
 
 static void __init rb2011l_setup(void)
 {
-       rb2011_setup();
+       rb2011_setup(0);
 }
 
-
-MIPS_MACHINE(ATH79_MACH_RB_2011L, "2011L", "MikroTik RouterBOARD 2011L",
-            rb2011l_setup);
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011L, "2011L", rb2011l_setup);
 
 static void __init rb2011us_setup(void)
 {
-       if (rb2011_setup())
-               return;
+       rb2011_setup(RB2011_FLAG_SFP | RB2011_FLAG_USB);
+}
 
-       rb2011_sfp_init();
+MIPS_MACHINE_NONAME(ATH79_MACH_RB_2011US, "2011US", rb2011us_setup);
 
-       ath79_register_usb();
+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)
 {
-       if (rb2011_setup())
-               return;
-
-       rb2011_sfp_init();
-       rb2011_wlan_init();
-
-       ath79_register_usb();
+       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);