ar71xx: fix section mismatches

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

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 6e498395bdd8b36eb8495b99e5a3ce152a2286a1..4dc4647cc63dac30f4dea0d8a2d85b9f77cec509 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
@@ -23,6 +23,7 @@
 #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>
@@ -124,7 +125,7 @@ static struct ar8327_led_cfg rb2011_ar8327_led_cfg = {
        .open_drain = false,
 };
 
-static const struct ar8327_led_info rb2011_ar8327_leds[] __initconst = {
+static const struct ar8327_led_info rb2011_ar8327_leds[] = {
        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"),
@@ -188,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 },
@@ -195,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;