From: Sungbo Eo <mans0n@gorani.run>
Date: Wed, 17 Feb 2021 12:36:25 +0000 (+0900)
Subject: kirkwood: refresh patches for kernel 5.10
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=58ebc507241d4f1b9c4505c4b47acbf51f12d3ec;p=openwrt%2Fstaging%2Fadrian.git

kirkwood: refresh patches for kernel 5.10

Refresh patches to make them apply to kernel 5.10.
The removed patch has been merged upstream.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---

diff --git a/target/linux/kirkwood/patches-5.10/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch b/target/linux/kirkwood/patches-5.10/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch
deleted file mode 100644
index 52caee7b40..0000000000
--- a/target/linux/kirkwood/patches-5.10/001-ARM-dts-kirkwood-Add-Check-Point-L-50-board.patch
+++ /dev/null
@@ -1,485 +0,0 @@
-From efa968c18abab78c5e0c40a853caf286c3629a59 Mon Sep 17 00:00:00 2001
-From: Pawel Dembicki <paweldembicki@gmail.com>
-Date: Tue, 17 Mar 2020 21:28:01 +0100
-Subject: [PATCH v3] ARM: dts: kirkwood: Add Check Point L-50 board
-
-This patch adds dts for the Check Point L-50 from 600/1100 series
-routers.
-
-Specification:
--CPU: Marvell Kirkwood 88F6821 1200MHz
--RAM: 512MB
--Flash: NAND 512MB
--WiFi: mPCIe card based on Atheros AR9287 b/g/n
--WAN: 1 Gigabit Port (Marvell 88E1116R PHY)
--LAN: 9 Gigabit Ports (2x Marvell 88E6171(5+3))
--USB: 2x USB2.0
--Express card slot
--SD card slot
--Serial console: RJ-45 115200 8n1
--Unsupported DSL
-
-Reviewed-by: Andrew Lunn <andrew@lunn.ch>
-Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
----
-Changes in v3:
-- fix typo and code style issues pointed by OpenWrt guys
-Changes in v2:
-- none
-
- arch/arm/boot/dts/Makefile          |   1 +
- arch/arm/boot/dts/kirkwood-l-50.dts | 438 ++++++++++++++++++++++++++++
- 2 files changed, 439 insertions(+)
- create mode 100644 arch/arm/boot/dts/kirkwood-l-50.dts
-
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -270,6 +270,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
- 	kirkwood-iomega_ix2_200.dtb \
- 	kirkwood-is2.dtb \
- 	kirkwood-km_kirkwood.dtb \
-+	kirkwood-l-50.dtb \
- 	kirkwood-laplug.dtb \
- 	kirkwood-linkstation-lsqvl.dtb \
- 	kirkwood-linkstation-lsvl.dtb \
---- /dev/null
-+++ b/arch/arm/boot/dts/kirkwood-l-50.dts
-@@ -0,0 +1,438 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Check Point L-50 Board Description
-+ * Copyright 2020 Pawel Dembicki <paweldembicki@gmail.com>
-+ */
-+
-+/dts-v1/;
-+
-+#include "kirkwood.dtsi"
-+#include "kirkwood-6281.dtsi"
-+
-+/ {
-+	model = "Check Point L-50";
-+	compatible = "checkpoint,l-50", "marvell,kirkwood-88f6281", "marvell,kirkwood";
-+
-+	memory {
-+		device_type = "memory";
-+		reg = <0x00000000 0x20000000>;
-+	};
-+
-+	chosen {
-+		bootargs = "console=ttyS0,115200n8";
-+		stdout-path = &uart0;
-+	};
-+
-+	ocp@f1000000 {
-+		pinctrl: pin-controller@10000 {
-+			pinctrl-0 = <&pmx_led38 &pmx_sysrst &pmx_button29>;
-+			pinctrl-names = "default";
-+
-+			pmx_sysrst: pmx-sysrst {
-+				marvell,pins = "mpp6";
-+				marvell,function = "sysrst";
-+			};
-+
-+			pmx_button29: pmx_button29 {
-+				marvell,pins = "mpp29";
-+				marvell,function = "gpio";
-+			};
-+
-+			pmx_led38: pmx_led38 {
-+				marvell,pins = "mpp38";
-+				marvell,function = "gpio";
-+			};
-+
-+			pmx_sdio_cd: pmx-sdio-cd {
-+				marvell,pins = "mpp46";
-+				marvell,function = "gpio";
-+			};
-+		};
-+
-+		serial@12000 {
-+			status = "okay";
-+		};
-+
-+		mvsdio@90000 {
-+			status = "okay";
-+			cd-gpios = <&gpio1 14 9>;
-+		};
-+
-+		i2c@11000 {
-+			status = "okay";
-+			clock-frequency = <400000>;
-+
-+			gpio2: gpio-expander@20{
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				compatible = "semtech,sx1505q";
-+				reg = <0x20>;
-+
-+				gpio-controller;
-+			};
-+
-+			/* Three GPIOs from 0x21 exp. are undescribed in dts:
-+			 * 1: DSL module reset (active low)
-+			 * 5: mPCIE reset (active low)
-+			 * 6: Express card reset (active low)
-+			 */
-+			gpio3: gpio-expander@21{
-+				#gpio-cells = <2>;
-+				#interrupt-cells = <2>;
-+				compatible = "semtech,sx1505q";
-+				reg = <0x21>;
-+
-+				gpio-controller;
-+			};
-+
-+			rtc@30 {
-+				compatible = "s35390a";
-+				reg = <0x30>;
-+			};
-+		};
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		status_green {
-+			label = "l-50:green:status";
-+			gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		status_red {
-+			label = "l-50:red:status";
-+			gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		wifi {
-+			label = "l-50:green:wifi";
-+			gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "phy0tpt";
-+		};
-+
-+		internet_green {
-+			label = "l-50:green:internet";
-+			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		internet_red {
-+			label = "l-50:red:internet";
-+			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		usb1_green {
-+			label = "l-50:green:usb1";
-+			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "usbport";
-+			trigger-sources = <&hub_port3>;
-+		};
-+
-+		usb1_red {
-+			label = "l-50:red:usb1";
-+			gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
-+		};
-+
-+		usb2_green {
-+			label = "l-50:green:usb2";
-+			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "usbport";
-+			trigger-sources = <&hub_port1>;
-+		};
-+
-+		usb2_red {
-+			label = "l-50:red:usb2";
-+			gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
-+		};
-+	};
-+
-+	usb2_pwr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "usb2_pwr";
-+
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		gpio = <&gpio3 3 GPIO_ACTIVE_LOW>;
-+		regulator-always-on;
-+	};
-+
-+	usb1_pwr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "usb1_pwr";
-+
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		gpio = <&gpio3 4 GPIO_ACTIVE_LOW>;
-+		regulator-always-on;
-+	};
-+
-+	mpcie_pwr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "mpcie_pwr";
-+
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-always-on;
-+	};
-+
-+	express_card_pwr {
-+		compatible = "regulator-fixed";
-+		regulator-name = "express_card_pwr";
-+
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		gpio = <&gpio3 7 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-always-on;
-+	};
-+
-+	keys {
-+		compatible = "gpio-keys";
-+
-+		factory_defaults {
-+			label = "factory_defaults";
-+			gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
-+			linux,code = <KEY_RESTART>;
-+		};
-+	};
-+};
-+
-+&mdio {
-+	status = "okay";
-+
-+	ethphy8: ethernet-phy@8 {
-+		reg = <0x08>;
-+	};
-+
-+	switch0: switch@10 {
-+		compatible = "marvell,mv88e6085";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x10>;
-+		dsa,member = <0 0>;
-+
-+		ports {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			port@0 {
-+				reg = <0>;
-+				label = "lan5";
-+			};
-+
-+			port@1 {
-+			       reg = <1>;
-+			       label = "lan1";
-+			};
-+
-+			port@2 {
-+			       reg = <2>;
-+			       label = "lan6";
-+			};
-+
-+			port@3 {
-+			       reg = <3>;
-+			       label = "lan2";
-+			};
-+
-+			port@4 {
-+				reg = <4>;
-+				label = "lan7";
-+			};
-+
-+			switch0port5: port@5 {
-+				reg = <5>;
-+				phy-mode = "rgmii-txid";
-+				link = <&switch1port5>;
-+				fixed-link {
-+					speed = <1000>;
-+					full-duplex;
-+				};
-+			};
-+
-+			port@6 {
-+				reg = <6>;
-+				label = "cpu";
-+				phy-mode = "rgmii-id";
-+				ethernet = <&eth1port>;
-+				fixed-link {
-+					speed = <1000>;
-+					full-duplex;
-+				};
-+			};
-+		};
-+	};
-+
-+	switch@11 {
-+		compatible = "marvell,mv88e6085";
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <0x11>;
-+		dsa,member = <0 1>;
-+
-+		ports {
-+			#address-cells = <1>;
-+			#size-cells = <0>;
-+
-+			port@0 {
-+				reg = <0>;
-+				label = "lan3";
-+			};
-+
-+			port@1 {
-+			       reg = <1>;
-+			       label = "lan8";
-+			};
-+
-+			port@2 {
-+			       reg = <2>;
-+			       label = "lan4";
-+			};
-+
-+			port@3 {
-+			       reg = <3>;
-+			       label = "dmz";
-+			};
-+
-+			switch1port5: port@5 {
-+				reg = <5>;
-+				phy-mode = "rgmii-txid";
-+				link = <&switch0port5>;
-+				fixed-link {
-+					speed = <1000>;
-+					full-duplex;
-+				};
-+			};
-+
-+			port@6 {
-+				reg = <6>;
-+				label = "dsl";
-+				fixed-link {
-+					speed = <100>;
-+					full-duplex;
-+				};
-+			};
-+		};
-+	};
-+};
-+
-+&eth0 {
-+	status = "okay";
-+	ethernet0-port@0 {
-+		phy-handle = <&ethphy8>;
-+	};
-+};
-+
-+&eth1 {
-+	status = "okay";
-+	ethernet1-port@0 {
-+		speed = <1000>;
-+		duplex = <1>;
-+	};
-+};
-+
-+&nand {
-+	status = "okay";
-+	pinctrl-0 = <&pmx_nand>;
-+	pinctrl-names = "default";
-+
-+	partition@0 {
-+		label = "u-boot";
-+		reg = <0x00000000 0x000c0000>;
-+	};
-+
-+	partition@a0000 {
-+		label = "bootldr-env";
-+		reg = <0x000c0000 0x00040000>;
-+	};
-+
-+	partition@100000 {
-+		label = "kernel-1";
-+		reg = <0x00100000 0x00800000>;
-+	};
-+
-+	partition@900000 {
-+		label = "rootfs-1";
-+		reg = <0x00900000 0x07100000>;
-+	};
-+
-+	partition@7a00000 {
-+		label = "kernel-2";
-+		reg = <0x07a00000 0x00800000>;
-+	};
-+
-+	partition@8200000 {
-+		label = "rootfs-2";
-+		reg = <0x08200000 0x07100000>;
-+	};
-+
-+	partition@f300000 {
-+		label = "default_sw";
-+		reg = <0x0f300000 0x07900000>;
-+	};
-+
-+	partition@16c00000 {
-+		label = "logs";
-+		reg = <0x16c00000 0x01800000>;
-+	};
-+
-+	partition@18400000 {
-+		label = "preset_cfg";
-+		reg = <0x18400000 0x00100000>;
-+	};
-+
-+	partition@18500000 {
-+		label = "adsl";
-+		reg = <0x18500000 0x00100000>;
-+	};
-+
-+	partition@18600000 {
-+		label = "storage";
-+		reg = <0x18600000 0x07a00000>;
-+	};
-+};
-+
-+&rtc {
-+	status = "disabled";
-+};
-+
-+&pciec {
-+	status = "okay";
-+};
-+
-+&pcie0 {
-+	status = "okay";
-+};
-+
-+&sata_phy0 {
-+	status = "disabled";
-+};
-+
-+&sata_phy1 {
-+	status = "disabled";
-+};
-+
-+&usb0 {
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	status = "okay";
-+
-+	port@1 {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		reg = <1>;
-+		#trigger-source-cells = <0>;
-+
-+		hub_port1: port@1 {
-+			reg = <1>;
-+			#trigger-source-cells = <0>;
-+		};
-+
-+		hub_port3: port@3 {
-+			reg = <3>;
-+			#trigger-source-cells = <0>;
-+		};
-+	};
-+};
diff --git a/target/linux/kirkwood/patches-5.10/201-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-5.10/201-enable-sata-port-specific-led-triggers.patch
index c1645367a4..35db065727 100644
--- a/target/linux/kirkwood/patches-5.10/201-enable-sata-port-specific-led-triggers.patch
+++ b/target/linux/kirkwood/patches-5.10/201-enable-sata-port-specific-led-triggers.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/mach-mvebu/Kconfig
 +++ b/arch/arm/mach-mvebu/Kconfig
-@@ -119,6 +119,7 @@ config MACH_DOVE
+@@ -116,6 +116,7 @@ config MACH_DOVE
  config MACH_KIRKWOOD
  	bool "Marvell Kirkwood boards"
  	depends on ARCH_MULTI_V5
diff --git a/target/linux/kirkwood/patches-5.10/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-5.10/202-linksys-find-active-root.patch
index b7e7f50271..18c03efa8f 100644
--- a/target/linux/kirkwood/patches-5.10/202-linksys-find-active-root.patch
+++ b/target/linux/kirkwood/patches-5.10/202-linksys-find-active-root.patch
@@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  		parts[i].name = partname;
  
  		if (of_get_property(pp, "read-only", &len))
-@@ -215,6 +224,18 @@ static int __init ofpart_parser_init(voi
+@@ -218,6 +227,18 @@ static int __init ofpart_parser_init(voi
  	return 0;
  }