mvebu: code refactoring of rb5009upr+s+in support

It fixes indentation with width 8 to match standard Linux style.

It removes commented pin setting not called anywhere.

It changes patch to full git am appliable.

It refreshes the patches.

Signed-off-by: Carlo Filippi <carlo2007@gmail.com>

Author: carlo2007

package/boot/uboot-mvebu/Makefile

@@ -63,7 +63,7 @@ endef
 define U-Boot/rb5009
   NAME:=MikroTik RB5009
   BUILD_SUBTARGET:=cortexa72
-  BUILD_DEVICES:=mikrotik_rb5009 mikrotik_rb5009ug mikrotik_rb5009upr
+  BUILD_DEVICES:=mikrotik_rb5009ug mikrotik_rb5009upr
   UBOOT_CONFIG:=mvebu_rb5009
   UBOOT_IMAGE:=u-boot.elf
 endef

package/boot/uboot-mvebu/patches/102-arm-mvebu-add-support-for-MikroTik-RB5009UG-S-IN.patch

@@ -29,8 +29,6 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
  create mode 100644 board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
  create mode 100644 configs/mvebu_rb5009_defconfig
 
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 2d931c23fc..08d0189357 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -177,6 +177,7 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\
@@ -41,9 +39,6 @@ index 2d931c23fc..08d0189357 100644
  	armada-8040-clearfog-gt-8k.dtb		\
  	armada-8040-db.dtb			\
  	armada-8040-mcbin.dtb			\
-diff --git a/arch/arm/dts/armada-7040-rb5009.dts b/arch/arm/dts/armada-7040-rb5009.dts
-new file mode 100644
-index 0000000000..54574bf551
 --- /dev/null
 +++ b/arch/arm/dts/armada-7040-rb5009.dts
 @@ -0,0 +1,241 @@
@@ -288,8 +283,6 @@ index 0000000000..54574bf551
 +	status = "okay";
 +	phy-mode = "10gbase-r";
 +};
-diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c
-index 63a12f7d77..1e9781ada9 100644
 --- a/arch/arm/mach-mvebu/arm64-common.c
 +++ b/arch/arm/mach-mvebu/arm64-common.c
 @@ -62,9 +62,13 @@ __weak int dram_init_banksize(void)
@@ -309,13 +302,10 @@ index 63a12f7d77..1e9781ada9 100644
  	}
 
  	if (IS_ENABLED(CONFIG_ARMADA_3700))
-diff --git a/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env b/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
-new file mode 100644
-index 0000000000..acdc785433
 --- /dev/null
 +++ b/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
 @@ -0,0 +1,52 @@
-+openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009-initramfs-uImage.itb
++openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009ug-initramfs-uImage.itb
 +boot_devices=ubi usb net
 +recovery_boot_devices=usb net
 +
@@ -367,9 +357,6 @@ index 0000000000..acdc785433
 +	dhcp;
 +	tftpboot ${loadaddr} ${openwrt_initramfs};
 +	bootm ${loadaddr};
-diff --git a/configs/mvebu_rb5009_defconfig b/configs/mvebu_rb5009_defconfig
-new file mode 100644
-index 0000000000..6f6035cab8
 --- /dev/null
 +++ b/configs/mvebu_rb5009_defconfig
 @@ -0,0 +1,96 @@
@@ -469,35 +456,3 @@ index 0000000000..6f6035cab8
 +CONFIG_USB_ETHER_RTL8152=y
 +# CONFIG_SHA256 is not set
 +# CONFIG_EFI_LOADER is not set
-
-base-commit: f919c3a889f0ec7d63a48b5d0ed064386b0980bd
-prerequisite-patch-id: 6b50204d7e2371480224c274f5c7c79a7764e99c
--- 
-2.39.5
-
-
-From 4d23360e318ef164dbb81db81a2c56d8ea18e928 Mon Sep 17 00:00:00 2001
-From: Przemek Rudy <prudy@protonmail.com>
-Date: Mon, 23 Dec 2024 17:45:51 +0100
-Subject: [PATCH 4/4] arm: mvebu: rename img from generic rb5009 to rb5009ug
-
-This prepares for further adaptation of different RB5009 models.
-
-Signed-off-by: Przemek Rudy <prudy@protonmail.com>
----
- board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env b/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
-index acdc785433..eac4358ff7 100644
---- a/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
-+++ b/board/Marvell/mvebu_armada-8k/mikrotik-rb5009.env
-@@ -1,4 +1,4 @@
--openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009-initramfs-uImage.itb
-+openwrt_initramfs=openwrt-mvebu-cortexa72-mikrotik_rb5009ug-initramfs-uImage.itb
- boot_devices=ubi usb net
- recovery_boot_devices=usb net
- 
--- 
-2.39.5
-

target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network

@@ -32,7 +32,6 @@ marvell,armada7040-db)
 marvell,armada8040-clearfog-gt-8k)
 	ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 eth2" "eth0 eth1"
 	;;
-mikrotik,rb5009|\
 mikrotik,rb5009ug|\
 mikrotik,rb5009upr)
 	ucidef_set_interfaces_lan_wan "p2 p3 p4 p5 p6 p7 p8 sfp" "p1"

target/linux/mvebu/cortexa72/base-files/lib/upgrade/platform.sh

@@ -37,7 +37,6 @@ platform_do_upgrade() {
 	solidrun,clearfog-pro)
 		legacy_sdcard_do_upgrade "$1"
 		;;
-	mikrotik,rb5009|\
 	mikrotik,rb5009ug|\
 	mikrotik,rb5009upr)
 		nand_do_upgrade "$1"

target/linux/mvebu/files-6.6/arch/arm64/boot/dts/marvell/armada-7040-rb5009.dtsi

@@ -8,10 +8,6 @@
 #include <dt-bindings/leds/common.h>
 
 / {
-	model = "MikroTik RB5009";
-	compatible = "mikrotik,rb5009", "marvell,armada7040",
-		     "marvell,armada-ap806-quad", "marvell,armada-ap806";
-
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};

target/linux/mvebu/files-6.6/arch/arm64/boot/dts/marvell/armada-7040-rb5009ug.dts

@@ -7,5 +7,5 @@
 / {
 	model = "MikroTik RB5009UG";
 	compatible = "mikrotik,rb5009ug", "mikrotik,rb5009", "marvell,armada7040",
-		     "marvell,armada-ap806-quad", "marvell,armada-ap806";
+	"marvell,armada-ap806-quad", "marvell,armada-ap806";
 };

target/linux/mvebu/files-6.6/arch/arm64/boot/dts/marvell/armada-7040-rb5009upr.dts

@@ -7,7 +7,7 @@
 / {
 	model = "MikroTik RB5009UPr";
 	compatible = "mikrotik,rb5009upr", "mikrotik,rb5009", "marvell,armada7040",
-		     "marvell,armada-ap806-quad", "marvell,armada-ap806";
+	"marvell,armada-ap806-quad", "marvell,armada-ap806";
 };
 
 &cp0_gpio1 {
@@ -24,12 +24,6 @@
 		marvell,pins = "mpp47", "mpp48", "mpp49", "mpp50";
 		marvell,function = "spi1";
 	};
-
-	/* PoE already enabled by enable-poe-power hog
-	cp0_spi1_poe_cs_pins: cp0-spi1-poe-cs-pins {
-		marvell,pins = "mpp8";
-		marvell,function = "gpio";
-	}; */
 };
 
 &cp0_spi1 {

target/linux/mvebu/image/cortexa72.mk

@@ -81,7 +81,7 @@ define Device/mikrotik_rb5009ug
   $(call Device/mikrotik_rb5009)
   DEVICE_DTS := armada-7040-rb5009ug
   DEVICE_MODEL := RB5009UG+S+IN
-  SUPPORTED_DEVICES += mikrotik,rb5009ug
+  SUPPORTED_DEVICES += mikrotik,rb5009
 endef
 TARGET_DEVICES += mikrotik_rb5009ug
 

target/linux/mvebu/patches-6.6/913-drivers_spi_add_mtpoe_device_compatible.patch

@@ -1,15 +1,3 @@
-From 14f37a22f520f963d4fbbd0ef99c073100029ac3 Mon Sep 17 00:00:00 2001
-From: Przemek Rudy <prudy@protonmail.com>
-Date: Mon, 23 Dec 2024 17:29:32 +0100
-Subject: [PATCH] kernel: add compatible string for the mtpoe spi device
-
-Device listed in spidev allows referring it in DT.
-
-Signed-off-by: Przemek Rudy <prudy@protonmail.com>
----
- drivers/spi/spidev.c | 2 ++
- 1 file changed, 2 insertions(+)
-
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
 @@ -711,6 +711,7 @@ static const struct spi_device_id spidev