From 81fdb4235e4e5efe7f0fde06b908a4f6ce6a96f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Fri, 7 Aug 2020 09:14:15 +0200
Subject: bcm63xx: refactor board patches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Current board patches format is crazy.
Let's try to put some order.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 .../bcm63xx/patches-5.4/553-board_VR-3026e.patch   | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 deletions(-)

(limited to 'target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch')

diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
index 607e49d957..27195ddd45 100644
--- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
+++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1990,6 +1990,59 @@ static struct board_info __initdata boar
+@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,53 +14,53 @@
 +};
 +
 +static struct board_info __initdata board_VR3026e = {
-+	.name					= "96368MT-1341N1",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MT-1341N1",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3026e_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3026e_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3026e_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3026e_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2277,6 +2330,7 @@ static const struct board_info __initcon
+@@ -2215,6 +2268,7 @@ static const struct board_info __initcon
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
@@ -68,7 +68,7 @@
  	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2377,6 +2431,7 @@ static struct of_device_id const bcm963x
+@@ -2315,6 +2369,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
-- 
cgit v1.2.3