ar71xx: add v4.14 support

adds v4.14 patches for testing but leaves v4.9 as default for now.

Signed-off-by: John Crispin <john@phrozen.org>

73 files changed, 140 insertions, 78 deletions

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-a60.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-a60.c
index 2f0a75f7bb..084a4e4cc0 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-a60.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-a60.c
@@ -86,12 +86,12 @@ static struct at803x_platform_data a60_at803x_data = {
 static struct mdio_board_info a60_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &a60_at803x_data,
 	},
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 2,
+		.mdio_addr = 2,
 		.platform_data = &a60_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c
index 524f93d264..032261f751 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-alfa-ap120c.c
@@ -83,7 +83,7 @@ static struct ar8327_platform_data ap120c_ar8327_data = {
 static struct mdio_board_info ap120c_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &ap120c_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
index 86fd8bd7a9..2ebac057a7 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap132.c
@@ -98,7 +98,7 @@ static struct ar8327_platform_data ap132_ar8327_data = {
 static struct mdio_board_info ap132_mdio1_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.1",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &ap132_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap152.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap152.c
index e669325f50..277a934a18 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ap152.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ap152.c
@@ -97,7 +97,7 @@ static struct ar8327_platform_data ap152_ar8337_data = {
 static struct mdio_board_info ap152_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &ap152_ar8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
index bfd2b2e6b8..ee9ce49bcf 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v4.c
@@ -200,7 +200,7 @@ static struct ar8327_platform_data archer_c7_v4_ar8337_data = {
 static struct mdio_board_info archer_c7_v4_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &archer_c7_v4_ar8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v5.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v5.c
index a80e0bd941..0dec008314 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v5.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7-v5.c
@@ -155,7 +155,7 @@ static struct ar8327_platform_data archer_c7_v5_ar8337_data = {
 static struct mdio_board_info archer_c7_v5_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &archer_c7_v5_ar8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
index 46b49bc9ba..35e3c271f8 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c7.c
@@ -197,7 +197,7 @@ static struct ar8327_platform_data archer_c7_ar8327_data = {
 static struct mdio_board_info archer_c7_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &archer_c7_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-bhr-4grv2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-bhr-4grv2.c
index 5b4cf5ff2f..1630845cf8 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-bhr-4grv2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-bhr-4grv2.c
@@ -125,7 +125,7 @@ static struct ar8327_platform_data bhr_4grv2_ar8327_data = {
 static struct mdio_board_info bhr_4grv2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &bhr_4grv2_ar8327_data,
 	},
 };
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 144f5db740..f5b8d3065f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-c60.c
@@ -15,7 +15,11 @@
 #include <linux/pci.h>
 #include <linux/phy.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
@@ -115,7 +119,7 @@ static struct ar8327_platform_data c60_ar8327_data = {
 static struct mdio_board_info c60_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &c60_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
index 587e66d22d..82174ba935 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cf-e316n-v2.c
@@ -243,7 +243,7 @@ static struct ar8327_platform_data cf_e375ac_ar8337_data = {
 static struct mdio_board_info cf_e375ac_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &cf_e375ac_ar8337_data,
 	},
 };
@@ -323,7 +323,7 @@ static struct at803x_platform_data cf_e380ac_v1v2_at803x_data = {
 static struct mdio_board_info cf_e380ac_v1v2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &cf_e380ac_v1v2_at803x_data,
 	},
 };
@@ -681,7 +681,7 @@ static struct ar8327_platform_data cf_e385ac_qca8337_data = {
 static struct mdio_board_info cf_e385ac_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &cf_e385ac_qca8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cr5000.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cr5000.c
index 5124f71ec3..0851899b40 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cr5000.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cr5000.c
@@ -128,7 +128,7 @@ static struct ar8327_platform_data cr5000_ar8327_data = {
 static struct mdio_board_info cr5000_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &cr5000_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dap-2695-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dap-2695-a1.c
index f0ed911c81..2577dbffae 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dap-2695-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dap-2695-a1.c
@@ -119,7 +119,7 @@ static struct ar8327_platform_data dap2695_ar8327_data = {
 static struct mdio_board_info dap2695_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dap2695_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
index 91b554e527..f9f3f9e60d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dgl-5500-a1.c
@@ -104,7 +104,7 @@ static struct ar8327_platform_data dgl_5500_a1_ar8327_data = {
 static struct mdio_board_info dgl_5500_a1_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dgl_5500_a1_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
index ae477642c0..275d2a29a0 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dhp-1565-a1.c
@@ -114,7 +114,7 @@ static struct ar8327_platform_data dhp1565a1_ar8327_data = {
 static struct mdio_board_info dhp1565a1_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dhp1565a1_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
index 9c4c1a8b3f..0d586c27e4 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
@@ -160,7 +160,7 @@ static struct ar8327_platform_data dir825c1_ar8327_data = {
 static struct mdio_board_info dir825c1_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dir825c1_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-869-a1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-869-a1.c
index b0894e37cc..3841c3d5d5 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-869-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-869-a1.c
@@ -118,7 +118,7 @@ static struct ar8327_platform_data dir869a1_ar8327_data = {
 static struct mdio_board_info dir869a1_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dir869a1_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-1200-ac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-1200-ac.c
index 4dc7b994ff..2100a9608d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-1200-ac.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-1200-ac.c
@@ -135,7 +135,7 @@ static struct ar8327_platform_data dlan_pro_1200_ac_ar8327_data = {
 static struct mdio_board_info dlan_pro_1200_ac_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dlan_pro_1200_ac_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-500-wp.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-500-wp.c
index ae6f443dcb..931eafffcb 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-500-wp.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dlan-pro-500-wp.c
@@ -146,7 +146,7 @@ static struct ar8327_platform_data dlan_pro_500_wp_ar8327_data = {
 static struct mdio_board_info dlan_pro_500_wp_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dlan_pro_500_wp_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c
index 52d9da4792..4210646e24 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-domywifi-dw33d.c
@@ -21,7 +21,11 @@
 #include <linux/platform_device.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/platform/ar934x_nfc.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -131,7 +135,7 @@ static struct ar8327_platform_data dw33d_qca8337_data = {
 static struct mdio_board_info dw33d_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dw33d_qca8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dr344.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dr344.c
index 870adbe083..888c9c949f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dr344.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dr344.c
@@ -139,7 +139,7 @@ static struct at803x_platform_data dr34x_at803x_data = {
 static struct mdio_board_info dr34x_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &dr34x_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-e1700ac-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-e1700ac-v2.c
index 90bff1f2f7..1ba47a4255 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-e1700ac-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-e1700ac-v2.c
@@ -103,7 +103,7 @@ static struct ar8327_platform_data e1700ac_v2_qca8334_data = {
 static struct mdio_board_info e1700ac_v2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &e1700ac_v2_qca8334_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-e558-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-e558-v2.c
index c067d58bbb..cc08147209 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-e558-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-e558-v2.c
@@ -120,7 +120,7 @@ static struct ar8327_platform_data e558_v2_ar8327_data = {
 static struct mdio_board_info e558_v2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &e558_v2_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-e750g-v8.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-e750g-v8.c
index 72d1349123..9252d1d5ad 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-e750g-v8.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-e750g-v8.c
@@ -110,7 +110,7 @@ static struct ar8327_platform_data e750g_v8_ar8327_data = {
 static struct mdio_board_info e750g_v8_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &e750g_v8_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c
index 3d60afc408..89d6ec6fe3 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-epg5000.c
@@ -114,7 +114,7 @@ static struct ar8327_platform_data epg5000_ar8327_data = {
 static struct mdio_board_info epg5000_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &epg5000_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
index 2a34b3a2e9..c275ef6f1b 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr1750.c
@@ -113,7 +113,7 @@ static struct ar8327_platform_data esr1750_ar8327_data = {
 static struct mdio_board_info esr1750_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &esr1750_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
index aa2e7f7f4e..cf2ee9295a 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-esr900.c
@@ -136,7 +136,7 @@ static struct ar8327_platform_data esr900_ar8327_data = {
 static struct mdio_board_info esr900_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &esr900_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-f9k1115v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-f9k1115v2.c
index 69d005d795..232105e068 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-f9k1115v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-f9k1115v2.c
@@ -129,7 +129,7 @@ static struct ar8327_platform_data f9k1115v2_ar8327_data = {
 static struct mdio_board_info f9k1115v2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &f9k1115v2_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz450e.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz450e.c
index 4e99834d27..83127e4c64 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz450e.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz450e.c
@@ -129,7 +129,7 @@ static struct at803x_platform_data fritz450E_at803x_data = {
 static struct mdio_board_info fritz450E_mdio_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.1",
-		.phy_addr = FRITZ450E_PHY_ADDRESS,
+		.mdio_addr = FRITZ450E_PHY_ADDRESS,
 		.platform_data = &fritz450E_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750s.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750s.c
index b556f9b0be..cc5d759273 100755
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750s.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar750s.c
@@ -145,7 +145,7 @@ static struct ar8327_platform_data gl_ar750s_ar8327_data = {
 static struct mdio_board_info gl_ar750s_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &gl_ar750s_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap230.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap230.c
index f94e5b450c..de24db4d4b 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap230.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-jwap230.c
@@ -111,7 +111,7 @@ static struct ar8327_platform_data jwap230_qca8337_data = {
 static struct mdio_board_info jwap230_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &jwap230_qca8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c
index 48354b4d2c..41254a6d7a 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-koala.c
@@ -94,7 +94,7 @@ static struct at803x_platform_data koala_at803x_data = {
 static struct mdio_board_info koala_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 5,
+		.mdio_addr = 5,
 		.platform_data = &koala_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr1750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr1750.c
index 18101ce8e4..987ed4bd5d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr1750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr1750.c
@@ -103,7 +103,7 @@ static struct at803x_platform_data mr1750_at803x_data = {
 static struct mdio_board_info mr1750_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 5,
+		.mdio_addr = 5,
 		.platform_data = &mr1750_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
index b439f58892..6b83c4cdf4 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
@@ -105,7 +105,7 @@ static struct at803x_platform_data mr900_at803x_data = {
 static struct mdio_board_info mr900_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 5,
+		.mdio_addr = 5,
 		.platform_data = &mr900_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
index 0c9b197e88..a822b6c3e2 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-n750.c
@@ -144,7 +144,7 @@ static struct ar8327_platform_data mynet_n750_ar8327_data = {
 static struct mdio_board_info mynet_n750_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &mynet_n750_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
index 3d48ca8fa5..cfb075b681 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mynet-rext.c
@@ -135,7 +135,7 @@ static struct at803x_platform_data mynet_rext_at803x_data = {
 static struct mdio_board_info mynet_rext_mdio0_info[] = {
         {
                 .bus_id = "ag71xx-mdio.0",
-                .phy_addr = 4,
+                .mdio_addr = 4,
                 .platform_data = &mynet_rext_at803x_data,
         },
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
index c28a8a5118..3f5a404e6f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-nbg6716.c
@@ -24,7 +24,11 @@
 #include <linux/ar8216_platform.h>
 #include <linux/gpio.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/platform/ar934x_nfc.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -242,7 +246,7 @@ static struct ar8327_platform_data nbg6716_ar8327_data = {
 static struct mdio_board_info nbg6716_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &nbg6716_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
index 49acd3b67f..61ff6a755d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5p.c
@@ -160,7 +160,7 @@ static struct at803x_platform_data om5p_an_at803x_data = {
 static struct mdio_board_info om5p_an_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 7,
+		.mdio_addr = 7,
 		.platform_data = &om5p_an_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c
index f6974aff71..10771ea7b1 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pac.c
@@ -107,12 +107,12 @@ static struct at803x_platform_data om5pac_at803x_data = {
 static struct mdio_board_info om5pac_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &om5pac_at803x_data,
 	},
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 2,
+		.mdio_addr = 2,
 		.platform_data = &om5pac_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c
index 1ab24f9339..f72700138f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om5pacv2.c
@@ -119,12 +119,12 @@ static struct at803x_platform_data om5pacv2_an_at8031_data = {
 static struct mdio_board_info om5pacv2_an_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 4,
+		.mdio_addr = 4,
 		.platform_data = &om5pacv2_an_at803x_data,
 	},
 	{
 		.bus_id = "ag71xx-mdio.1",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &om5pacv2_an_at8031_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rambutan.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rambutan.c
index 103aeb44b9..36fde26c95 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rambutan.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rambutan.c
@@ -39,7 +39,7 @@ static struct at803x_platform_data rambutan_ar8032_data = {
 static struct mdio_board_info rambutan_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rambutan_ar8032_data,
 	},
 };
@@ -52,7 +52,7 @@ static struct at803x_platform_data rambutan_ar8033_data = {
 static struct mdio_board_info rambutan_mdio1_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.1",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rambutan_ar8033_data,
 	},
 };
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 4dc4647cc6..60c505b6dc 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb2011.c
@@ -17,7 +17,11 @@
 #include <linux/ath9k_platform.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
@@ -156,7 +160,7 @@ static struct ar8327_platform_data rb2011_ar8327_data = {
 static struct mdio_board_info rb2011_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rb2011_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
index c308f9521d..0ec94a80e3 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb750.c
@@ -199,7 +199,7 @@ static struct ar8327_platform_data rb750gr3_ar8327_data = {
 static struct mdio_board_info rb750g3_mdio_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rb750gr3_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
index 691566fa82..985ef72d78 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c
@@ -15,7 +15,11 @@
 #include <linux/platform_device.h>
 #include <linux/ath9k_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/74x164.h>
@@ -227,7 +231,7 @@ static struct at803x_platform_data rb91x_at803x_data = {
 static struct mdio_board_info rb91x_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rb91x_at803x_data,
 	},
 };
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 2f54d029f6..10cbdd56b6 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb922.c
@@ -13,7 +13,11 @@
 #include <linux/platform_device.h>
 #include <linux/ath9k_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
@@ -108,7 +112,7 @@ static struct at803x_platform_data rb922gs_at803x_data = {
 static struct mdio_board_info rb922gs_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = RB922_PHY_ADDR,
+		.mdio_addr = RB922_PHY_ADDR,
 		.platform_data = &rb922gs_at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
index 5e24694d5c..adf23fa68b 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb95x.c
@@ -18,7 +18,11 @@
 #include <linux/ath9k_platform.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
@@ -114,7 +118,7 @@ static struct ar8327_platform_data rb95x_ar8327_data = {
 static struct mdio_board_info rb95x_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &rb95x_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c
index cff69092c4..96511a4080 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbspi.c
@@ -328,7 +328,7 @@ static struct ar8327_platform_data rb962_ar8327_data = {
 static struct mdio_board_info rb962_mdio0_info[] = {
 		{
 				.bus_id = "ag71xx-mdio.0",
-				.phy_addr = 0,
+				.mdio_addr = 0,
 				.platform_data = &rb962_ar8327_data,
 		},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
index d2edfc9c71..9f3f8ecd47 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rbsxtlite.c
@@ -17,7 +17,11 @@
 #include <linux/platform_device.h>
 #include <linux/ath9k_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc1750.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc1750.c
index 653d6423b0..3a7d654b85 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc1750.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc1750.c
@@ -95,7 +95,7 @@ static struct at803x_platform_data at803x_data = {
 static struct mdio_board_info sc1750_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc300m.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc300m.c
index 2830bcf276..6dd81ecd5a 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc300m.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc300m.c
@@ -82,7 +82,7 @@ static struct at803x_platform_data at803x_data = {
 static struct mdio_board_info sc300m_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc450.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc450.c
index 9cd0815156..dee183e790 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-sc450.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sc450.c
@@ -99,7 +99,7 @@ static struct at803x_platform_data at803x_data = {
 static struct mdio_board_info sc450_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &at803x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c
index 51fcccfaca..72d46c0c47 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sr3200.c
@@ -114,7 +114,7 @@ static struct ar8327_platform_data sr3200_xd3200_qca833x_data = {
 static struct mdio_board_info sr3200_xd3200_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &sr3200_xd3200_qca833x_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-823dru.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-823dru.c
index cf863ac666..e631828a65 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-823dru.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-823dru.c
@@ -122,7 +122,7 @@ static struct ar8327_platform_data tew_823dru_ar8327_data = {
 static struct mdio_board_info tew_823dru_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &tew_823dru_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
index cb5dc1dd21..972cb7960d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
@@ -148,7 +148,7 @@ static struct ar8327_platform_data wdr4300_ar8327_data = {
 static struct mdio_board_info wdr4300_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wdr4300_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c
index 73b563d313..a95a11c122 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wpa8630.c
@@ -128,7 +128,7 @@ static struct ar8327_platform_data tl_wpa8630_qca8337_data = {
 static struct mdio_board_info tl_wpa8630_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &tl_wpa8630_qca8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
index f79f155862..c98dd4ff00 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1041n-v2.c
@@ -115,7 +115,7 @@ static struct ar8327_platform_data db120_ar8327_data = {
 static struct mdio_board_info db120_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &db120_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
index abdbde08d2..90b649957d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v2.c
@@ -159,7 +159,7 @@ static struct ar8327_platform_data wr1043nd_v2_ar8327_data = {
 static struct mdio_board_info wr1043nd_v2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wr1043nd_v2_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
index f4af652cf0..04ea49c753 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
@@ -157,7 +157,7 @@ static struct ar8327_platform_data tl_wr1043nd_v4_ar8327_data = {
 static struct mdio_board_info tl_wr1043nd_v4_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &tl_wr1043nd_v4_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
index 38195a466b..5ea0028df8 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
@@ -131,7 +131,7 @@ static struct ar8327_platform_data ubnt_unifiac_pro_ar8327_data = {
 static struct mdio_board_info ubnt_unifiac_pro_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &ubnt_unifiac_pro_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
index 8dc0be41a3..ba79537b37 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-xm.c
@@ -342,7 +342,7 @@ static struct ar8327_platform_data uap_pro_ar8327_data = {
 static struct mdio_board_info uap_pro_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &uap_pro_ar8327_data,
 	},
 };
@@ -489,7 +489,7 @@ static struct at803x_platform_data ubnt_loco_m_xw_at803x_data = {
 static struct mdio_board_info ubnt_loco_m_xw_mdio_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 1,
+		.mdio_addr = 1,
 		.platform_data = &ubnt_loco_m_xw_at803x_data,
 	},
 };
@@ -596,7 +596,7 @@ static struct at803x_platform_data ubnt_rocket_m_ti_at803_data = {
 static struct mdio_board_info ubnt_rocket_m_ti_mdio_info[] = {
         {
                 .bus_id = "ag71xx-mdio.0",
-                .phy_addr = 4,
+                .mdio_addr = 4,
                 .platform_data = &ubnt_rocket_m_ti_at803_data,
         },
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
index 2374c4539f..04b12fc7cc 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wlr8100.c
@@ -126,7 +126,7 @@ static struct ar8327_platform_data wlr8100_ar8327_data = {
 static struct mdio_board_info wlr8100_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wlr8100_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
index 2a00a0ed96..a50239da15 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wndr4300.c
@@ -16,7 +16,11 @@
 #include <linux/ath9k_platform.h>
 #include <linux/ar8216_platform.h>
 #include <linux/mtd/mtd.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 #include <linux/mtd/nand.h>
+#else
+#include <linux/mtd/rawnand.h>
+#endif
 #include <linux/platform/ar934x_nfc.h>
 
 #include <asm/mach-ath79/ar71xx_regs.h>
@@ -158,7 +162,7 @@ static struct ar8327_platform_data wndr4300_ar8327_data = {
 static struct mdio_board_info wndr4300_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wndr4300_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj342.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj342.c
index 8cc1e70f82..65d6478867 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj342.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj342.c
@@ -130,7 +130,7 @@ static struct ar8327_platform_data wpj342_ar8327_data = {
 static struct mdio_board_info wpj342_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wpj342_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c
index 9f52279f5f..ffb9ef6dfa 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj344.c
@@ -124,7 +124,7 @@ static struct ar8327_platform_data wpj344_ar8327_data = {
 static struct mdio_board_info wpj344_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wpj344_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj558.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj558.c
index 910a962e16..1839cc6676 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj558.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj558.c
@@ -127,7 +127,7 @@ static struct ar8327_platform_data wpj558_ar8327_data = {
 static struct mdio_board_info wpj558_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wpj558_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c
index 70593d8168..d884be916b 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wpj563.c
@@ -106,7 +106,7 @@ static struct ar8327_platform_data WPJ563_ar8337_data = {
 static struct mdio_board_info WPJ563_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &WPJ563_ar8337_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
index 428876fccb..ca45309487 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-450hp2.c
@@ -168,7 +168,7 @@ static struct ar8327_platform_data wzr_450hp2_ar8327_data = {
 static struct mdio_board_info wzr_450hp2_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = 0,
+		.mdio_addr = 0,
 		.platform_data = &wzr_450hp2_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-z1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-z1.c
index 552d646370..912e9b2a6f 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-z1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-z1.c
@@ -114,7 +114,7 @@ static struct ar8327_platform_data z1_ar8327_data = {
 static struct mdio_board_info z1_mdio0_info[] = {
 	{
 		.bus_id = "ag71xx-mdio.0",
-		.phy_addr = Z1_ETH_SWITCH_PHY,
+		.mdio_addr = Z1_ETH_SWITCH_PHY,
 		.platform_data = &z1_ar8327_data,
 	},
 };
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
index a135e0f52f..0b6ba1fcec 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
@@ -13,7 +13,7 @@
 #include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index 5bbe9789fb..262e3fa09d 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -15,7 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
index dbada68dd0..d12be88520 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -10,7 +10,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
index c808f39989..ac50b87fd5 100644
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb91x_nand.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
diff --git a/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c b/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
index 5b6da713f4..71ecd61c80 100644
--- a/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
+++ b/target/linux/ar71xx/files/drivers/net/dsa/mv88e6063.c
@@ -182,7 +182,11 @@ static int mv88e6063_setup_port(struct dsa_switch *ds, int p)
 #else
 				ds->enabled_port_mask :
 #endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 				(1 << ds->dst->cpu_port)));
+#else
+				(1 << ds->dst->cpu_dp->index)));
+#endif
 
 	/*
 	 * Port Association Vector: when learning source addresses
@@ -275,15 +279,29 @@ static struct dsa_switch_ops mv88e6063_switch_ops = {
 	.phy_write	= mv88e6063_phy_write,
 };
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4,13,0)
+static struct dsa_switch_driver mv88e6063_switch_drv = {
+	.ops = &mv88e6063_switch_ops,
+};
+#endif
+
 static int __init mv88e6063_init(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 	register_switch_driver(&mv88e6063_switch_ops);
+#else
+	register_switch_driver(&mv88e6063_switch_drv);
+#endif
 	return 0;
 }
 module_init(mv88e6063_init);
 
 static void __exit mv88e6063_cleanup(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 	unregister_switch_driver(&mv88e6063_switch_ops);
+#else
+	unregister_switch_driver(&mv88e6063_switch_drv);
+#endif
 }
 module_exit(mv88e6063_cleanup);
diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
index f0e102152f..a8fd5c7209 100644
--- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
+++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_ethtool.c
@@ -22,7 +22,11 @@ static int ag71xx_ethtool_get_settings(struct net_device *dev,
 	if (!phydev)
 		return -ENODEV;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 	return phy_ethtool_gset(phydev, cmd);
+#else
+	return phy_ethtool_ioctl(phydev, cmd);
+#endif
 }
 
 static int ag71xx_ethtool_set_settings(struct net_device *dev,
@@ -34,7 +38,11 @@ static int ag71xx_ethtool_set_settings(struct net_device *dev,
 	if (!phydev)
 		return -ENODEV;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,14,0)
 	return phy_ethtool_sset(phydev, cmd);
+#else
+	return phy_ethtool_ioctl(phydev, cmd);
+#endif
 }
 
 static void ag71xx_ethtool_get_drvinfo(struct net_device *dev,