ar71xx: add support for MikroTik RouterBOARD 921GS-5HPacD r2 (mANTBox 15s)

[openwrt/openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-rb922.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
index 986bfd274efeb0935a64a2bf28bb973114f2a4ad..2f54d029f67898ab1b6ab5d8838d9515c11e719f 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
@@ -20,6 +20,7 @@
 #include <linux/routerboot.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/phy-at803x.h>
+#include <linux/version.h>
 
 #include <asm/prom.h>
 #include <asm/mach-ath79/ath79.h>
@@ -132,6 +133,7 @@ static void rb922gs_nand_select_chip(int chip_no)
        ndelay(500);
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
 static struct nand_ecclayout rb922gs_nand_ecclayout = {
        .eccbytes       = 6,
        .eccpos         = { 8, 9, 10, 13, 14, 15 },
@@ -139,18 +141,78 @@ static struct nand_ecclayout rb922gs_nand_ecclayout = {
        .oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
 };
 
+#else
+
+static int rb922gs_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 rb922gs_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 rb922gs_nand_ecclayout_ops = {
+       .ecc = rb922gs_ooblayout_ecc,
+       .free = rb922gs_ooblayout_free,
+};
+#endif /* < 4.6 */
+
 static int rb922gs_nand_scan_fixup(struct mtd_info *mtd)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
        struct nand_chip *chip = mtd->priv;
+#else
+       struct nand_chip *chip = mtd_to_nand(mtd);
+#endif /* < 4.6.0 */
 
        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 = &rb922gs_nand_ecclayout;
+#else
+               mtd_set_ooblayout(mtd, &rb922gs_nand_ecclayout_ops);
+#endif
        }
 
+       chip->options = NAND_NO_SUBPAGE_WRITE;
+
        return 0;
 }
 
@@ -167,7 +229,7 @@ static struct mtd_partition rb922gs_nand_partitions[] = {
                .size   = (4 * 1024 * 1024) - (256 * 1024),
        },
        {
-               .name   = "rootfs",
+               .name   = "ubi",
                .offset = MTDPART_OFS_NXTBLK,
                .size   = MTDPART_SIZ_FULL,
        },
@@ -194,7 +256,7 @@ static void __init rb922gs_setup(void)
        if (!info)
                return;
 
-       scnprintf(buf, sizeof(buf), "Mikrotik RouterBOARD %s",
+       scnprintf(buf, sizeof(buf), "MikroTik RouterBOARD %s",
                  (info->board_name) ? info->board_name : "");
        mips_set_machine_name(buf);
 
@@ -203,7 +265,7 @@ static void __init rb922gs_setup(void)
 
        rb922gs_nand_init();
 
-       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN, 3, 3, 0, 0);
+       ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
 
        ath79_register_mdio(0, 0x0);
 
@@ -214,9 +276,16 @@ static void __init rb922gs_setup(void)
        ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
        ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ath79_eth0_data.phy_mask = BIT(RB922_PHY_ADDR);
-       ath79_eth0_pll_data.pll_10 = 0x81001313;
-       ath79_eth0_pll_data.pll_100 = 0x81000101;
-       ath79_eth0_pll_data.pll_1000 = 0x8f000000;
+       if (strcmp(info->board_name, "921GS-5HPacD r2") == 0) {
+               ath79_eth0_pll_data.pll_10 = 0xa0001313;
+               ath79_eth0_pll_data.pll_100 = 0xa0000101;
+               ath79_eth0_pll_data.pll_1000 = 0x8f000000;
+       }
+       else {
+               ath79_eth0_pll_data.pll_10 = 0x81001313;
+               ath79_eth0_pll_data.pll_100 = 0x81000101;
+               ath79_eth0_pll_data.pll_1000 = 0x8f000000;
+       }
 
        ath79_register_eth(0);