ar71xx: Add kernel 4.9 support

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
index e78e311d2e1e6dd1c1608ac5168698014ba66799..7b01af515b34dfce7d6271b56a72d68a249d20ed 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
@@ -22,6 +22,7 @@
 #include <linux/platform/ar934x_nfc.h>
 #include <linux/ar8216_platform.h>
 #include <linux/ath9k_platform.h>
+#include <linux/version.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
 
@@ -119,6 +120,7 @@ static struct mdio_board_info c60_mdio0_info[] = {
        },
 };
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
 static struct nand_ecclayout c60_nand_ecclayout = {
        .eccbytes       = 7,
        .eccpos         = { 4, 8, 9, 10, 13, 14, 15 },
@@ -126,13 +128,67 @@ static struct nand_ecclayout c60_nand_ecclayout = {
        .oobfree        = { { 0, 3 }, { 6, 2 }, { 11, 2 }, }
 };
 
+#else
+
+static int c60_ooblayout_ecc(struct mtd_info *mtd, int section,
+                            struct mtd_oob_region *oobregion)
+{
+       switch (section) {
+       case 0:
+               oobregion->offset = 4;
+               oobregion->length = 1;
+               return 0;
+       case 1:
+               oobregion->offset = 8;
+               oobregion->length = 3;
+               return 0;
+       case 2:
+               oobregion->offset = 13;
+               oobregion->length = 3;
+               return 0;
+       default:
+               return -ERANGE;
+       }
+}
+
+static int c60_ooblayout_free(struct mtd_info *mtd, int section,
+                             struct mtd_oob_region *oobregion)
+{
+       switch (section) {
+       case 0:
+               oobregion->offset = 0;
+               oobregion->length = 3;
+               return 0;
+       case 1:
+               oobregion->offset = 6;
+               oobregion->length = 2;
+               return 0;
+       case 2:
+               oobregion->offset = 11;
+               oobregion->length = 2;
+               return 0;
+       default:
+               return -ERANGE;
+       }
+}
+
+static const struct mtd_ooblayout_ops c60_nand_ecclayout_ops = {
+       .ecc = c60_ooblayout_ecc,
+       .free = c60_ooblayout_free,
+};
+#endif /* < 4.6 */
+
 static int c60_nand_scan_fixup(struct mtd_info *mtd)
 {
        struct nand_chip *chip = mtd->priv;
 
        chip->ecc.size = 512;
        chip->ecc.strength = 4;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
        chip->ecc.layout = &c60_nand_ecclayout;
+#else
+       mtd_set_ooblayout(mtd, &c60_nand_ecclayout_ops);
+#endif
        return 0;
 }