bmips: backport accepted pinctrl patches

These patches have been accepted for linux v5.13.
External interrupts not supported for now.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

39 files changed, 3446 insertions, 2892 deletions

diff --git a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
index 1a0226f3c3..e2c05f9e6f 100644
--- a/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
+++ b/target/linux/bmips/dts/bcm63168-comtrend-vr-3032u.dts
@@ -21,14 +21,14 @@
 
 		reset {
 			label = "reset";
-			gpios = <&pinctrl 32 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 32 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&pinctrl 33 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WPS_BUTTON>;
 			debounce-interval = <60>;
 		};
diff --git a/target/linux/bmips/dts/bcm6318.dtsi b/target/linux/bmips/dts/bcm6318.dtsi
index 6064c9ac4c..9f613ad47a 100644
--- a/target/linux/bmips/dts/bcm6318.dtsi
+++ b/target/linux/bmips/dts/bcm6318.dtsi
@@ -142,110 +142,115 @@
 			};
 		};
 
-		gpio: syscon@10000080 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@10000080 {
+			compatible = "brcm,bcm6318-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0x10000080 0x80>;
+			ranges = <0 0x10000080 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm6318-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm6318-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 50>;
 				#gpio-cells = <2>;
+			};
 
-				interrupts-extended = <&ext_intc 0 0>,
-						      <&ext_intc 1 0>;
-				interrupt-names = "gpio33",
-						  "gpio34";
+			pinctrl: pinctrl@18 {
+				compatible = "brcm,bcm6318-pinctrl";
+				reg = <0x18 0x10>, <0x54 0x18>;
 
-				pinctrl_ephy0_spd_led: ephy0_spd_led {
+				pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
 					function = "ephy0_spd_led";
 					pins = "gpio0";
 				};
 
-				pinctrl_ephy1_spd_led: ephy1_spd_led {
+				pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
 					function = "ephy1_spd_led";
 					pins = "gpio1";
 				};
 
-				pinctrl_ephy2_spd_led: ephy2_spd_led {
+				pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
 					function = "ephy2_spd_led";
 					pins = "gpio2";
 				};
 
-				pinctrl_ephy3_spd_led: ephy3_spd_led {
+				pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
 					function = "ephy3_spd_led";
 					pins = "gpio3";
 				};
 
-				pinctrl_ephy0_act_led: ephy0_act_led {
+				pinctrl_ephy0_act_led: ephy0_act_led-pins {
 					function = "ephy0_act_led";
 					pins = "gpio4";
 				};
 
-				pinctrl_ephy1_act_led: ephy1_act_led {
+				pinctrl_ephy1_act_led: ephy1_act_led-pins {
 					function = "ephy1_act_led";
 					pins = "gpio5";
 				};
 
-				pinctrl_ephy2_act_led: ephy2_act_led {
+				pinctrl_ephy2_act_led: ephy2_act_led-pins {
 					function = "ephy2_act_led";
 					pins = "gpio6";
 				};
 
-				pinctrl_ephy3_act_led: ephy3_act_led {
+				pinctrl_ephy3_act_led: ephy3_act_led-pins {
 					function = "ephy3_act_led";
 					pins = "gpio7";
 				};
 
-				pinctrl_serial_led: serial_led {
-					pinctrl_serial_led_data: serial_led_data {
+				pinctrl_serial_led: serial_led-pins {
+					pinctrl_serial_led_data: serial_led_data-pins {
 						function = "serial_led_data";
 						pins = "gpio6";
 					};
 
-					pinctrl_serial_led_clk: serial_led_clk {
+					pinctrl_serial_led_clk: serial_led_clk-pins {
 						function = "serial_led_clk";
 						pins = "gpio7";
 					};
 				};
 
-				pinctrl_inet_act_led: inet_act_led {
+				pinctrl_inet_act_led: inet_act_led-pins {
 					function = "inet_act_led";
 					pins = "gpio8";
 				};
 
-				pinctrl_inet_fail_led: inet_fail_led {
+				pinctrl_inet_fail_led: inet_fail_led-pins {
 					function = "inet_fail_led";
 					pins = "gpio9";
 				};
 
-				pinctrl_dsl_led: dsl_led {
+				pinctrl_dsl_led: dsl_led-pins {
 					function = "dsl_led";
 					pins = "gpio10";
 				};
 
-				pinctrl_post_fail_led: post_fail_led {
+				pinctrl_post_fail_led: post_fail_led-pins {
 					function = "post_fail_led";
 					pins = "gpio11";
 				};
 
-				pinctrl_wlan_wps_led: wlan_wps_led {
+				pinctrl_wlan_wps_led: wlan_wps_led-pins {
 					function = "wlan_wps_led";
 					pins = "gpio12";
 				};
 
-				pinctrl_usb_pwron: usb_pwron {
+				pinctrl_usb_pwron: usb_pwron-pins {
 					function = "usb_pwron";
 					pins = "gpio13";
 				};
 
-				pinctrl_usb_device_led: usb_device_led {
+				pinctrl_usb_device_led: usb_device_led-pins {
 					function = "usb_device_led";
 					pins = "gpio13";
 				};
 
-				pinctrl_usb_active: usb_active {
+				pinctrl_usb_active: usb_active-pins {
 					function = "usb_active";
 					pins = "gpio40";
 				};
diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index d71cef4ccd..2ab14e5a33 100644
--- a/target/linux/bmips/dts/bcm63268.dtsi
+++ b/target/linux/bmips/dts/bcm63268.dtsi
@@ -153,131 +153,132 @@
 			#reset-cells = <1>;
 		};
 
-		gpio: syscon@100000c0 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@100000c0 {
+			compatible = "brcm,bcm63268-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0x100000c0 0x80>;
+			ranges = <0 0x100000c0 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm63268-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm63268-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 52>;
 				#gpio-cells = <2>;
+			};
+
+			pinctrl: pinctrl@10 {
+				compatible = "brcm,bcm63268-pinctrl";
+				reg = <0x10 0x4>, <0x18 0x8>, <0x38 0x4>;
 
-				interrupts-extended = <&ext_intc 0 0>,
-						      <&ext_intc 1 0>,
-						      <&ext_intc 2 0>,
-						      <&ext_intc 3 0>;
-				interrupt-names = "gpio32",
-						  "gpio33",
-						  "gpio34",
-						  "gpio35";
-
-				pinctrl_serial_led: serial_led {
-					pinctrl_serial_led_clk: serial_led_clk {
+				pinctrl_serial_led: serial_led-pins {
+					pinctrl_serial_led_clk: serial_led_clk-pins {
 						function = "serial_led_clk";
 						pins = "gpio0";
 					};
 
-					pinctrl_serial_led_data: serial_led_data {
+					pinctrl_serial_led_data: serial_led_data-pins {
 						function = "serial_led_data";
 						pins = "gpio1";
 					};
 				};
 
-				pinctrl_hsspi_cs4: hsspi_cs4 {
+				pinctrl_hsspi_cs4: hsspi_cs4-pins {
 					function = "hsspi_cs4";
 					pins = "gpio16";
 				};
 
-				pinctrl_hsspi_cs5: hsspi_cs5 {
+				pinctrl_hsspi_cs5: hsspi_cs5-pins {
 					function = "hsspi_cs5";
 					pins = "gpio17";
 				};
 
-				pinctrl_hsspi_cs6: hsspi_cs6 {
+				pinctrl_hsspi_cs6: hsspi_cs6-pins {
 					function = "hsspi_cs6";
 					pins = "gpio8";
 				};
 
-				pinctrl_hsspi_cs7: hsspi_cs7 {
+				pinctrl_hsspi_cs7: hsspi_cs7-pins {
 					function = "hsspi_cs7";
 					pins = "gpio9";
 				};
 
 				pinctrl_adsl_spi: adsl_spi {
-					pinctrl_adsl_spi_miso: adsl_spi_miso {
+					pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
 						function = "adsl_spi_miso";
 						pins = "gpio18";
 					};
 
-					pinctrl_adsl_spi_mosi: adsl_spi_mosi {
+					pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
 						function = "adsl_spi_mosi";
 						pins = "gpio19";
 					};
 				};
 
-				pinctrl_vreq_clk: vreq_clk {
+				pinctrl_vreq_clk: vreq_clk-pins {
 					function = "vreq_clk";
 					pins = "gpio22";
 				};
 
-				pinctrl_pcie_clkreq_b: pcie_clkreq_b {
+				pinctrl_pcie_clkreq_b: pcie_clkreq_b-pins {
 					function = "pcie_clkreq_b";
 					pins = "gpio23";
 				};
 
-				pinctrl_robosw_led_clk: robosw_led_clk {
+				pinctrl_robosw_led_clk: robosw_led_clk-pins {
 					function = "robosw_led_clk";
 					pins = "gpio30";
 				};
 
-				pinctrl_robosw_led_data: robosw_led_data {
+				pinctrl_robosw_led_data: robosw_led_data-pins {
 					function = "robosw_led_data";
 					pins = "gpio31";
 				};
 
-				pinctrl_nand: nand {
+				pinctrl_nand: nand-pins {
 					function = "nand";
 					group = "nand_grp";
 				};
 
-				pinctrl_gpio35_alt: gpio35_alt {
+				pinctrl_gpio35_alt: gpio35_alt-pins {
 					function = "gpio35_alt";
 					pin = "gpio35";
 				};
 
-				pinctrl_dectpd: dectpd {
+				pinctrl_dectpd: dectpd-pins {
 					function = "dectpd";
 					group = "dectpd_grp";
 				};
 
-				pinctrl_vdsl_phy_override_0: vdsl_phy_override_0 {
+				pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
 					function = "vdsl_phy_override_0";
 					group = "vdsl_phy_override_0_grp";
 				};
 
-				pinctrl_vdsl_phy_override_1: vdsl_phy_override_1 {
+				pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
 					function = "vdsl_phy_override_1";
 					group = "vdsl_phy_override_1_grp";
 				};
 
-				pinctrl_vdsl_phy_override_2: vdsl_phy_override_2 {
+				pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
 					function = "vdsl_phy_override_2";
 					group = "vdsl_phy_override_2_grp";
 				};
 
-				pinctrl_vdsl_phy_override_3: vdsl_phy_override_3 {
+				pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
 					function = "vdsl_phy_override_3";
 					group = "vdsl_phy_override_3_grp";
 				};
 
-				pinctrl_dsl_gpio8: dsl_gpio8 {
+				pinctrl_dsl_gpio8: dsl_gpio8-pins {
 					function = "dsl_gpio8";
 					group = "dsl_gpio8";
 				};
 
-				pinctrl_dsl_gpio9: dsl_gpio9 {
+				pinctrl_dsl_gpio9: dsl_gpio9-pins {
 					function = "dsl_gpio9";
 					group = "dsl_gpio9";
 				};
diff --git a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
index 14608fedb1..c10c3ae2fc 100644
--- a/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
+++ b/target/linux/bmips/dts/bcm6328-comtrend-ar-5387un.dts
@@ -19,7 +19,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&pinctrl 23 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 			debounce-interval = <60>;
 		};
diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi
index 6ca7e4d9a6..c8e9138ccb 100644
--- a/target/linux/bmips/dts/bcm6328.dtsi
+++ b/target/linux/bmips/dts/bcm6328.dtsi
@@ -145,99 +145,100 @@
 			};
 		};
 
-		gpio: syscon@10000080 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@10000080 {
+			compatible = "brcm,bcm6328-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0x10000080 0x80>;
+			ranges = <0 0x10000080 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm6328-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm6328-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 32>;
 				#gpio-cells = <2>;
+			};
+
+			pinctrl: pinctrl@18 {
+				compatible = "brcm,bcm6328-pinctrl";
+				reg = <0x18 0x10>;
 
-				interrupts-extended = <&ext_intc 3 0>,
-						      <&ext_intc 2 0>,
-						      <&ext_intc 1 0>,
-						      <&ext_intc 0 0>;
-				interrupt-names = "gpio12",
-						  "gpio15",
-						  "gpio23",
-						  "gpio24";
-
-				pinctrl_serial_led: serial_led {
-					pinctrl_serial_led_data: serial_led_data {
+				pinctrl_serial_led: serial_led-pins {
+					pinctrl_serial_led_data: serial_led_data-pins {
 						function = "serial_led_data";
 						pins = "gpio6";
 					};
 
-					pinctrl_serial_led_clk: serial_led_clk {
+					pinctrl_serial_led_clk: serial_led_clk-pins {
 						function = "serial_led_clk";
 						pins = "gpio7";
 					};
 				};
 
-				pinctrl_inet_act_led: inet_act_led {
+				pinctrl_inet_act_led: inet_act_led-pins {
 					function = "inet_act_led";
 					pins = "gpio11";
 				};
 
-				pinctrl_pcie_clkreq: pcie_clkreq {
+				pinctrl_pcie_clkreq: pcie_clkreq-pins {
 					function = "pcie_clkreq";
 					pins = "gpio16";
 				};
 
-				pinctrl_ephy0_spd_led: ephy0_spd_led {
+				pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
 					function = "led";
 					pins = "gpio17";
 				};
 
-				pinctrl_ephy1_spd_led: ephy1_spd_led {
+				pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
 					function = "led";
 					pins = "gpio18";
 				};
 
-				pinctrl_ephy2_spd_led: ephy2_spd_led {
+				pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
 					function = "led";
 					pins = "gpio19";
 				};
 
-				pinctrl_ephy3_spd_led: ephy3_spd_led {
+				pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
 					function = "led";
 					pins = "gpio20";
 				};
 
-				pinctrl_ephy0_act_led: ephy0_act_led {
+				pinctrl_ephy0_act_led: ephy0_act_led-pins {
 					function = "ephy0_act_led";
 					pins = "gpio25";
 				};
 
-				pinctrl_ephy1_act_led: ephy1_act_led {
+				pinctrl_ephy1_act_led: ephy1_act_led-pins {
 					function = "ephy1_act_led";
 					pins = "gpio26";
 				};
 
-				pinctrl_ephy2_act_led: ephy2_act_led {
+				pinctrl_ephy2_act_led: ephy2_act_led-pins {
 					function = "ephy2_act_led";
 					pins = "gpio27";
 				};
 
-				pinctrl_ephy3_act_led: ephy3_act_led {
+				pinctrl_ephy3_act_led: ephy3_act_led-pins {
 					function = "ephy3_act_led";
 					pins = "gpio28";
 				};
 
-				pinctrl_hsspi_cs1: hsspi_cs1 {
+				pinctrl_hsspi_cs1: hsspi_cs1-pins {
 					function = "hsspi_cs1";
 					pins = "hsspi_cs1";
 				};
 
-				pinctrl_usb_port1_device: usb_port1_device {
+				pinctrl_usb_port1_device: usb_port1_device-pins {
 					function = "usb_device_port";
 					pins = "usb_port1";
 				};
 
-				pinctrl_usb_port1_host: usb_port1_host {
+				pinctrl_usb_port1_host: usb_port1_host-pins {
 					function = "usb_host_port";
 					pins = "usb_port1";
 				};
diff --git a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
index 65b4480ee1..9658e2abca 100644
--- a/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
+++ b/target/linux/bmips/dts/bcm6358-huawei-hg556a-b.dts
@@ -23,28 +23,28 @@
 
 		help {
 			label = "help";
-			gpios = <&pinctrl 8 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_HELP>;
 			debounce-interval = <60>;
 		};
 
 		wlan {
 			label = "wlan";
-			gpios = <&pinctrl 9 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WLAN>;
 			debounce-interval = <60>;
 		};
 
 		restart {
 			label = "restart";
-			gpios = <&pinctrl 10 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
-			gpios = <&pinctrl 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_CONFIG>;
 			debounce-interval = <60>;
 		};
@@ -55,68 +55,68 @@
 
 		led@0 {
 			label = "red:message";
-			gpios = <&pinctrl 0 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
 		};
 
 		hspa_red: led@1 {
 			label = "red:hspa";
-			gpios = <&pinctrl 1 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
 		};
 
 		dsl_red: led@2 {
 			label = "red:dsl";
-			gpios = <&pinctrl 2 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		power_red: led@3 {
 			label = "red:power";
-			gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 
 		led@6 {
 			label = "all";
-			gpios = <&pinctrl 6 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led@12 {
 			label = "green:lan1";
-			gpios = <&pinctrl 12 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
 		};
 
 		led@13 {
 			label = "red:lan1";
-			gpios = <&pinctrl 13 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		led@15 {
 			label = "green:lan2";
-			gpios = <&pinctrl 15 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 
 		led@22 {
 			label = "red:lan2";
-			gpios = <&pinctrl 22 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
 		};
 
 		led@23 {
 			label = "green:lan3";
-			gpios = <&pinctrl 23 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
 		};
 
 		led@26 {
 			label = "red:lan3";
-			gpios = <&pinctrl 26 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 26 GPIO_ACTIVE_LOW>;
 		};
 
 		led@27 {
 			label = "green:lan4";
-			gpios = <&pinctrl 27 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
 		};
 
 		led@28 {
 			label = "red:lan4";
-			gpios = <&pinctrl 28 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 	};
 
diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi
index 3ebbf74613..34334df9ba 100644
--- a/target/linux/bmips/dts/bcm6358.dtsi
+++ b/target/linux/bmips/dts/bcm6358.dtsi
@@ -157,71 +157,68 @@
 			timeout-sec = <30>;
 		};
 
-		gpio: syscon@fffe0080 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@fffe0080 {
+			compatible = "brcm,bcm6358-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0xfffe0080 0x50>;
+			ranges = <0 0xfffe0080 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm6358-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm6358-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 40>;
 				#gpio-cells = <2>;
+			};
+
+			pinctrl: pinctrl@18 {
+				compatible = "brcm,bcm6358-pinctrl";
+				reg = <0x18 0x4>;
 
-				interrupts-extended = <&ext_intc1 0 0>,
-						      <&ext_intc1 1 0>,
-						      <&ext_intc0 0 0>,
-						      <&ext_intc0 1 0>,
-						      <&ext_intc0 2 0>,
-						      <&ext_intc0 3 0>;
-				interrupt-names = "gpio32",
-						  "gpio33",
-						  "gpio34",
-						  "gpio35",
-						  "gpio36",
-						  "gpio37";
-
-				pinctrl_ebi_cs: ebi_cs {
+				pinctrl_ebi_cs: ebi_cs-pins {
 					function = "ebi_cs";
 					groups = "ebi_cs_grp";
 				};
 
-				pinctrl_uart1: uart1 {
+				pinctrl_uart1: uart1-pins {
 					function = "uart1";
 					groups = "uart1_grp";
 				};
 
-				pinctrl_serial_led: serial_led {
+				pinctrl_serial_led: serial_led-pins {
 					function = "serial_led";
 					groups = "serial_led_grp";
 				};
 
-				pinctrl_legacy_led: legacy_led {
+				pinctrl_legacy_led: legacy_led-pins {
 					function = "legacy_led";
 					groups = "legacy_led_grp";
 				};
 
-				pinctrl_led: led {
+				pinctrl_led: led-pins {
 					function = "led";
 					groups = "led_grp";
 				};
 
-				pinctrl_spi_cs_23: spi_cs {
+				pinctrl_spi_cs_23: spi_cs-pins {
 					function = "spi_cs";
 					groups = "spi_cs_grp";
 				};
 
-				pinctrl_utopia: utopia {
+				pinctrl_utopia: utopia-pins {
 					function = "utopia";
 					groups = "utopia_grp";
 				};
 
-				pinctrl_pwm_syn_clk: pwm_syn_clk {
+				pinctrl_pwm_syn_clk: pwm_syn_clk-pins {
 					function = "pwm_syn_clk";
 					groups = "pwm_syn_clk_grp";
 				};
 
-				pinctrl_sys_irq: sys_irq {
+				pinctrl_sys_irq: sys_irq-pins {
 					function = "sys_irq";
 					groups = "sys_irq_grp";
 				};
diff --git a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
index 52000ba487..e4c7c7b3cc 100644
--- a/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
+++ b/target/linux/bmips/dts/bcm6362-netgear-dgnd3700-v2.dts
@@ -23,21 +23,21 @@
 
 		wlan {
 			label = "wlan";
-			gpios = <&pinctrl 11 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WLAN>;
 			debounce-interval = <60>;
 		};
 
 		wps {
 			label = "wps";
-			gpios = <&pinctrl 25 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WPS_BUTTON>;
 			debounce-interval = <60>;
 		};
 
 		reset {
 			label = "reset";
-			gpios = <&pinctrl 31 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 31 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 			debounce-interval = <60>;
 		};
@@ -48,12 +48,12 @@
 
 		led@28 {
 			label = "green:dsl";
-			gpios = <&pinctrl 28 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 28 GPIO_ACTIVE_LOW>;
 		};
 
 		led@34 {
 			label = "red:power";
-			gpios = <&pinctrl 34 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 		};
 	};
 };
diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi
index 04df06c0db..77473c22bb 100644
--- a/target/linux/bmips/dts/bcm6362.dtsi
+++ b/target/linux/bmips/dts/bcm6362.dtsi
@@ -146,173 +146,174 @@
 			timeout-sec = <30>;
 		};
 
-		gpio: syscon@10000080 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@10000080 {
+			compatible = "brcm,bcm6362-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0x10000080 0x80>;
+			ranges = <0 0x10000080 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm6362-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm6362-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 48>;
 				#gpio-cells = <2>;
+			};
 
-				interrupts-extended = <&ext_intc 0 0>,
-						      <&ext_intc 1 0>,
-						      <&ext_intc 2 0>,
-						      <&ext_intc 3 0>;
-				interrupt-names = "gpio24",
-						  "gpio25",
-						  "gpio26",
-						  "gpio27";
+			pinctrl: pinctrl@18 {
+				compatible = "brcm,bcm6362-pinctrl";
+				reg = <0x18 0x10>, <0x38 0x4>;
 
-				pinctrl_usb_device_led: usb_device_led {
+				pinctrl_usb_device_led: usb_device_led-pins {
 					function = "usb_device_led";
 					pins = "gpio0";
 				};
 
-				pinctrl_sys_irq: sys_irq {
+				pinctrl_sys_irq: sys_irq-pins {
 					function = "sys_irq";
 					pins = "gpio1";
 				};
 
-				pinctrl_serial_led: serial_led {
-					pinctrl_serial_led_clk: serial_led_clk {
+				pinctrl_serial_led: serial_led-pins {
+					pinctrl_serial_led_clk: serial_led_clk-pins {
 						function = "serial_led_clk";
 						pins = "gpio2";
 					};
 
-					pinctrl_serial_led_data: serial_led_data {
+					pinctrl_serial_led_data: serial_led_data-pins {
 						function = "serial_led_data";
 						pins = "gpio3";
 					};
 				};
 
-				pinctrl_robosw_led_data: robosw_led_data {
+				pinctrl_robosw_led_data: robosw_led_data-pins {
 					function = "robosw_led_data";
 					pins = "gpio4";
 				};
 
-				pinctrl_robosw_led_clk: robosw_led_clk {
+				pinctrl_robosw_led_clk: robosw_led_clk-pins {
 					function = "robosw_led_clk";
 					pins = "gpio5";
 				};
 
-				pinctrl_robosw_led0: robosw_led0 {
+				pinctrl_robosw_led0: robosw_led0-pins {
 					function = "robosw_led0";
 					pins = "gpio6";
 				};
 
-				pinctrl_robosw_led1: robosw_led1 {
+				pinctrl_robosw_led1: robosw_led1-pins {
 					function = "robosw_led1";
 					pins = "gpio7";
 				};
 
-				pinctrl_inet_led: inet_led {
+				pinctrl_inet_led: inet_led-pins {
 					function = "inet_led";
 					pins = "gpio8";
 				};
 
-				pinctrl_spi_cs2: spi_cs2 {
+				pinctrl_spi_cs2: spi_cs2-pins {
 					function = "spi_cs2";
 					pins = "gpio9";
 				};
 
-				pinctrl_spi_cs3: spi_cs3 {
+				pinctrl_spi_cs3: spi_cs3-pins {
 					function = "spi_cs3";
 					pins = "gpio10";
 				};
 
-				pinctrl_ntr_pulse: ntr_pulse {
+				pinctrl_ntr_pulse: ntr_pulse-pins {
 					function = "ntr_pulse";
 					pins = "gpio11";
 				};
 
-				pinctrl_uart1_scts: uart1_scts {
+				pinctrl_uart1_scts: uart1_scts-pins {
 					function = "uart1_scts";
 					pins = "gpio12";
 				};
 
-				pinctrl_uart1_srts: uart1_srts {
+				pinctrl_uart1_srts: uart1_srts-pins {
 					function = "uart1_srts";
 					pins = "gpio13";
 				};
 
-				pinctrl_uart1: uart1 {
-					pinctrl_uart1_sdin: uart1_sdin {
+				pinctrl_uart1: uart1-pins {
+					pinctrl_uart1_sdin: uart1_sdin-pins {
 						function = "uart1_sdin";
 						pins = "gpio14";
 					};
 
-					pinctrl_uart1_sdout: uart1_sdout {
+					pinctrl_uart1_sdout: uart1_sdout-pins {
 						function = "uart1_sdout";
 						pins = "gpio15";
 					};
 				};
 
-				pinctrl_adsl_spi: adsl_spi {
-					pinctrl_adsl_spi_miso: adsl_spi_miso {
+				pinctrl_adsl_spi: adsl_spi-pins {
+					pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
 						function = "adsl_spi_miso";
 						pins = "gpio16";
 					};
 
-					pinctrl_adsl_spi_mosi: adsl_spi_mosi {
+					pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
 						function = "adsl_spi_mosi";
 						pins = "gpio17";
 					};
 
-					pinctrl_adsl_spi_clk: adsl_spi_clk {
+					pinctrl_adsl_spi_clk: adsl_spi_clk-pins {
 						function = "adsl_spi_clk";
 						pins = "gpio18";
 					};
 
-					pinctrl_adsl_spi_cs: adsl_spi_cs {
+					pinctrl_adsl_spi_cs: adsl_spi_cs-pins {
 						function = "adsl_spi_cs";
 						pins = "gpio19";
 					};
 				};
 
-				pinctrl_ephy0_led: ephy0_led {
+				pinctrl_ephy0_led: ephy0_led-pins {
 					function = "ephy0_led";
 					pins = "gpio20";
 				};
 
-				pinctrl_ephy1_led: ephy1_led {
+				pinctrl_ephy1_led: ephy1_led-pins {
 					function = "ephy1_led";
 					pins = "gpio21";
 				};
 
-				pinctrl_ephy2_led: ephy2_led {
+				pinctrl_ephy2_led: ephy2_led-pins {
 					function = "ephy2_led";
 					pins = "gpio22";
 				};
 
-				pinctrl_ephy3_led: ephy3_led {
+				pinctrl_ephy3_led: ephy3_led-pins {
 					function = "ephy3_led";
 					pins = "gpio23";
 				};
 
-				pinctrl_ext_irq0: ext_irq0 {
+				pinctrl_ext_irq0: ext_irq0-pins {
 					function = "ext_irq0";
 					pins = "gpio24";
 				};
 
-				pinctrl_ext_irq1: ext_irq1 {
+				pinctrl_ext_irq1: ext_irq1-pins {
 					function = "ext_irq1";
 					pins = "gpio25";
 				};
 
-				pinctrl_ext_irq2: ext_irq2 {
+				pinctrl_ext_irq2: ext_irq2-pins {
 					function = "ext_irq2";
 					pins = "gpio26";
 				};
 
-				pinctrl_ext_irq3: ext_irq3 {
+				pinctrl_ext_irq3: ext_irq3-pins {
 					function = "ext_irq3";
 					pins = "gpio27";
 				};
 
-				pinctrl_nand: nand {
+				pinctrl_nand: nand-pins {
 					function = "nand";
 					group = "nand_grp";
 				};
diff --git a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
index 6466cb3aca..4c00df32b9 100644
--- a/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
+++ b/target/linux/bmips/dts/bcm6368-comtrend-vr-3025u.dts
@@ -19,7 +19,7 @@
 
 		reset {
 			label = "reset";
-			gpios = <&pinctrl 34 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 34 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_RESTART>;
 			debounce-interval = <60>;
 		};
@@ -30,27 +30,27 @@
 
 		led@2 {
 			label = "green:dsl";
-			gpios = <&pinctrl 2 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 		};
 
 		led@5 {
 			label = "green:internet";
-			gpios = <&pinctrl 5 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power_green: led@22 {
 			label = "green:power";
-			gpios = <&pinctrl 22 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
 		};
 
 		led_power_red: led@24 {
 			label = "red:power";
-			gpios = <&pinctrl 24 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
 		};
 
 		led@31 {
 			label = "red:internet";
-			gpios = <&pinctrl 31 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 31 GPIO_ACTIVE_HIGH>;
 		};
 	};
 
diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index afdf3c5dc0..b50a572fd0 100644
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -148,198 +148,190 @@
 			timeout-sec = <30>;
 		};
 
-		gpio: syscon@10000080 {
-			compatible = "syscon", "simple-mfd";
+		gpio_cntl: syscon@10000080 {
+			compatible = "brcm,bcm6368-gpio-sysctl",
+				     "syscon", "simple-mfd";
 			reg = <0x10000080 0x80>;
+			ranges = <0 0x10000080 0x80>;
 			native-endian;
 
-			pinctrl: pin-controller {
-				compatible = "brcm,bcm6368-pinctrl";
+			gpio: gpio@0 {
+				compatible = "brcm,bcm6368-gpio";
+				reg-names = "dirout", "dat";
+				reg = <0x0 0x8>, <0x8 0x8>;
 
 				gpio-controller;
+				gpio-ranges = <&pinctrl 0 0 38>;
 				#gpio-cells = <2>;
+			};
 
-				interrupts-extended = <&ext_intc1 0 0>,
-						      <&ext_intc1 1 0>,
-						      <&ext_intc0 0 0>,
-						      <&ext_intc0 1 0>,
-						      <&ext_intc0 2 0>,
-						      <&ext_intc0 3 0>;
-				interrupt-names = "gpio32",
-						  "gpio33",
-						  "gpio34",
-						  "gpio35",
-						  "gpio36",
-						  "gpio37";
-
-				pinctrl_analog_afe_0: analog_afe_0 {
+			pinctrl: pinctrl@18 {
+				compatible = "brcm,bcm6368-pinctrl";
+				reg = <0x18 0x4>, <0x38 0x4>;
+
+				pinctrl_analog_afe_0: analog_afe_0-pins {
 					function = "analog_afe_0";
 					pins = "gpio0";
 				};
 
-				pinctrl_analog_afe_1: analog_afe_1 {
+				pinctrl_analog_afe_1: analog_afe_1-pins {
 					function = "analog_afe_1";
 					pins = "gpio1";
 				};
 
-				pinctrl_sys_irq: sys_irq {
+				pinctrl_sys_irq: sys_irq-pins {
 					function = "sys_irq";
 					pins = "gpio2";
 				};
 
-				pinctrl_serial_led: serial_led {
-					pinctrl_serial_led_data: serial_led_data {
+				pinctrl_serial_led: serial_led-pins {
+					pinctrl_serial_led_data: serial_led_data-pins {
 						function = "serial_led_data";
 						pins = "gpio3";
 					};
 
-					pinctrl_serial_led_clk: serial_led_clk {
+					pinctrl_serial_led_clk: serial_led_clk-pins {
 						function = "serial_led_clk";
 						pins = "gpio4";
 					};
 				};
 
-				pinctrl_inet_led: inet_led {
+				pinctrl_inet_led: inet_led-pins {
 					function = "inet_led";
 					pins = "gpio5";
 				};
 
-				pinctrl_ephy0_led: ephy0_led {
+				pinctrl_ephy0_led: ephy0_led-pins {
 					function = "ephy0_led";
 					pins = "gpio6";
 				};
 
-				pinctrl_ephy1_led: ephy1_led {
+				pinctrl_ephy1_led: ephy1_led-pins {
 					function = "ephy1_led";
 					pins = "gpio7";
 				};
 
-				pinctrl_ephy2_led: ephy2_led {
+				pinctrl_ephy2_led: ephy2_led-pins {
 					function = "ephy2_led";
 					pins = "gpio8";
 				};
 
-				pinctrl_ephy3_led: ephy3_led {
+				pinctrl_ephy3_led: ephy3_led-pins {
 					function = "ephy3_led";
 					pins = "gpio9";
 				};
 
-				pinctrl_robosw_led_data: robosw_led_data {
+				pinctrl_robosw_led_data: robosw_led_data-pins {
 					function = "robosw_led_data";
 					pins = "gpio10";
 				};
 
-				pinctrl_robosw_led_clk: robosw_led_clk {
+				pinctrl_robosw_led_clk: robosw_led_clk-pins {
 					function = "robosw_led_clk";
 					pins = "gpio11";
 				};
 
-				pinctrl_robosw_led0: robosw_led0 {
+				pinctrl_robosw_led0: robosw_led0-pins {
 					function = "robosw_led0";
 					pins = "gpio12";
 				};
 
-				pinctrl_robosw_led1: robosw_led1 {
+				pinctrl_robosw_led1: robosw_led1-pins {
 					function = "robosw_led1";
 					pins = "gpio13";
 				};
 
-				pinctrl_usb_device_led: usb_device_led {
+				pinctrl_usb_device_led: usb_device_led-pins {
 					function = "usb_device_led";
 					pins = "gpio14";
 				};
 
-				pinctrl_pci: pci {
-					pinctrl_pci_req1: pci_req1 {
+				pinctrl_pci: pci-pins {
+					pinctrl_pci_req1: pci_req1-pins {
 						function = "pci_req1";
 						pins = "gpio16";
 					};
 
-					pinctrl_pci_gnt1: pci_gnt1 {
+					pinctrl_pci_gnt1: pci_gnt1-pins {
 						function = "pci_gnt1";
 						pins = "gpio17";
 					};
 
-					pinctrl_pci_intb: pci_intb {
+					pinctrl_pci_intb: pci_intb-pins {
 						function = "pci_intb";
 						pins = "gpio18";
 					};
 
-					pinctrl_pci_req0: pci_req0 {
+					pinctrl_pci_req0: pci_req0-pins {
 						function = "pci_req0";
 						pins = "gpio19";
 					};
 
-					pinctrl_pci_gnt0: pci_gnt0 {
+					pinctrl_pci_gnt0: pci_gnt0-pins {
 						function = "pci_gnt0";
 						pins = "gpio20";
 					};
 				};
 
-				pinctrl_pcmcia: pcmcia {
-					pinctrl_pcmcia_cd1: pcmcia_cd1 {
+				pinctrl_pcmcia: pcmcia-pins {
+					pinctrl_pcmcia_cd1: pcmcia_cd1-pins {
 						function = "pcmcia_cd1";
 						pins = "gpio22";
 					};
 
-					pinctrl_pcmcia_cd2: pcmcia_cd2 {
+					pinctrl_pcmcia_cd2: pcmcia_cd2-pins {
 						function = "pcmcia_cd2";
 						pins = "gpio23";
 					};
 
-					pinctrl_pcmcia_vs1: pcmcia_vs1 {
+					pinctrl_pcmcia_vs1: pcmcia_vs1-pins {
 						function = "pcmcia_vs1";
 						pins = "gpio24";
 					};
 
-					pinctrl_pcmcia_vs2: pcmcia_vs2 {
+					pinctrl_pcmcia_vs2: pcmcia_vs2-pins {
 						function = "pcmcia_vs2";
 						pins = "gpio25";
 					};
 				};
 
-				pinctrl_ebi_cs2: ebi_cs2 {
+				pinctrl_ebi_cs2: ebi_cs2-pins {
 					function = "ebi_cs2";
 					pins = "gpio26";
 				};
 
-				pinctrl_ebi_cs3: ebi_cs3 {
+				pinctrl_ebi_cs3: ebi_cs3-pins {
 					function = "ebi_cs3";
 					pins = "gpio27";
 				};
 
-				pinctrl_spi_cs2: spi_cs2 {
+				pinctrl_spi_cs2: spi_cs2-pins {
 					function = "spi_cs2";
 					pins = "gpio28";
 				};
 
-				pinctrl_spi_cs3: spi_cs3 {
+				pinctrl_spi_cs3: spi_cs3-pins {
 					function = "spi_cs3";
 					pins = "gpio29";
 				};
 
-				pinctrl_spi_cs4: spi_cs4 {
+				pinctrl_spi_cs4: spi_cs4-pins {
 					function = "spi_cs4";
 					pins = "gpio30";
 				};
 
-				pinctrl_spi_cs5: spi_cs5 {
+				pinctrl_spi_cs5: spi_cs5-pins {
 					function = "spi_cs5";
 					pins = "gpio31";
 				};
 
-				pinctrl_uart1: uart1 {
+				pinctrl_uart1: uart1-pins {
 					function = "uart1";
 					group = "uart1_grp";
 				};
 			};
 		};
 
-		gpiobasemode: gpiobasemode@100000b8 {
-			compatible = "brcm,bcm6368-gpiobasemode", "syscon";
-			reg = <0x100000b8 0x4>;
-		};
-
 		leds: led-controller@100000d0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
diff --git a/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch b/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch
new file mode 100644
index 0000000000..b0093e9216
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/052-v5.13-gpio-guard-gpiochip_irqchip_add_domain-with-GPIOLIB_.patch
@@ -0,0 +1,45 @@
+From 9c7d24693d864f90b27aad5d15fbfe226c02898b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:02 +0100
+Subject: [PATCH 01/22] gpio: guard gpiochip_irqchip_add_domain() with
+ GPIOLIB_IRQCHIP
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The current code doesn't check if GPIOLIB_IRQCHIP is enabled, which results in
+a compilation error when trying to build gpio-regmap if CONFIG_GPIOLIB_IRQCHIP
+isn't enabled.
+
+Fixes: 6a45b0e2589f ("gpiolib: Introduce gpiochip_irqchip_add_domain()")
+Suggested-by: Michael Walle <michael@walle.cc>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Reviewed-by: Michael Walle <michael@walle.cc>
+Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-2-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ include/linux/gpio/driver.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/include/linux/gpio/driver.h
++++ b/include/linux/gpio/driver.h
+@@ -637,8 +637,17 @@ int gpiochip_irqchip_add_key(struct gpio
+ bool gpiochip_irqchip_irq_valid(const struct gpio_chip *gc,
+ 				unsigned int offset);
+ 
++#ifdef CONFIG_GPIOLIB_IRQCHIP
+ int gpiochip_irqchip_add_domain(struct gpio_chip *gc,
+ 				struct irq_domain *domain);
++#else
++static inline int gpiochip_irqchip_add_domain(struct gpio_chip *gc,
++					      struct irq_domain *domain)
++{
++	WARN_ON(1);
++	return -EINVAL;
++}
++#endif
+ 
+ #ifdef CONFIG_LOCKDEP
+ 
diff --git a/target/linux/bmips/patches-5.10/053-v5.13-gpio-regmap-set-gpio_chip-of_node.patch b/target/linux/bmips/patches-5.10/053-v5.13-gpio-regmap-set-gpio_chip-of_node.patch
new file mode 100644
index 0000000000..58dfaff8bd
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/053-v5.13-gpio-regmap-set-gpio_chip-of_node.patch
@@ -0,0 +1,63 @@
+From d46bf9ec4596654f36245e3b14765bcb422be6ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:03 +0100
+Subject: [PATCH 02/22] gpio: regmap: set gpio_chip of_node
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is needed for properly registering GPIO regmap as a child of a regmap
+pin controller.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Michael Walle <michael@walle.cc>
+Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
+Acked-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-3-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ drivers/gpio/gpio-regmap.c  | 5 +++++
+ include/linux/gpio/regmap.h | 4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/drivers/gpio/gpio-regmap.c
++++ b/drivers/gpio/gpio-regmap.c
+@@ -254,6 +254,11 @@ struct gpio_regmap *gpio_regmap_register
+ 	chip->names = config->names;
+ 	chip->label = config->label ?: dev_name(config->parent);
+ 
++#if defined(CONFIG_OF_GPIO)
++	/* gpiolib will use of_node of the parent if chip->of_node is NULL */
++	chip->of_node = to_of_node(config->fwnode);
++#endif /* CONFIG_OF_GPIO */
++
+ 	/*
+ 	 * If our regmap is fast_io we should probably set can_sleep to false.
+ 	 * Right now, the regmap doesn't save this property, nor is there any
+--- a/include/linux/gpio/regmap.h
++++ b/include/linux/gpio/regmap.h
+@@ -4,6 +4,7 @@
+ #define _LINUX_GPIO_REGMAP_H
+ 
+ struct device;
++struct fwnode_handle;
+ struct gpio_regmap;
+ struct irq_domain;
+ struct regmap;
+@@ -16,6 +17,8 @@ struct regmap;
+  * @parent:		The parent device
+  * @regmap:		The regmap used to access the registers
+  *			given, the name of the device is used
++ * @fwnode:		(Optional) The firmware node.
++ *			If not given, the fwnode of the parent is used.
+  * @label:		(Optional) Descriptive name for GPIO controller.
+  *			If not given, the name of the device is used.
+  * @ngpio:		Number of GPIOs
+@@ -57,6 +60,7 @@ struct regmap;
+ struct gpio_regmap_config {
+ 	struct device *parent;
+ 	struct regmap *regmap;
++	struct fwnode_handle *fwnode;
+ 
+ 	const char *label;
+ 	int ngpio;
diff --git a/target/linux/bmips/patches-5.10/054-v5.13-dt-bindings-improve-BCM6345-GPIO-binding-documentati.patch b/target/linux/bmips/patches-5.10/054-v5.13-dt-bindings-improve-BCM6345-GPIO-binding-documentati.patch
new file mode 100644
index 0000000000..85b751df05
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/054-v5.13-dt-bindings-improve-BCM6345-GPIO-binding-documentati.patch
@@ -0,0 +1,163 @@
+From fb9da17bd26552f48cda4f2f658379e7f5860691 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:04 +0100
+Subject: [PATCH 03/22] dt-bindings: improve BCM6345 GPIO binding documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Convert existing BCM6345 GPIO binding documentation to YAML and add binding
+documentation for the GPIO controller found in BCM6318, BCM6328, BCM6358,
+BCM6362, BCM6368 and BCM63268 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-4-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../bindings/gpio/brcm,bcm6345-gpio.txt       | 46 ----------
+ .../bindings/gpio/brcm,bcm6345-gpio.yaml      | 86 +++++++++++++++++++
+ 2 files changed, 86 insertions(+), 46 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml
+
+--- a/Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.txt
++++ /dev/null
+@@ -1,46 +0,0 @@
+-Bindings for the Broadcom's brcm,bcm6345-gpio memory-mapped GPIO controllers.
+-
+-These bindings can be used on any BCM63xx SoC. However, BCM6338 and BCM6345
+-are the only ones which don't need a pinctrl driver.
+-BCM6338 have 8-bit data and dirout registers, where GPIO state can be read
+-and/or written, and the direction changed from input to output.
+-BCM6345 have 16-bit data and dirout registers, where GPIO state can be read
+-and/or written, and the direction changed from input to output.
+-
+-Required properties:
+-	- compatible: should be "brcm,bcm6345-gpio"
+-	- reg-names: must contain
+-		"dat" - data register
+-		"dirout" - direction (output) register
+-	- reg: address + size pairs describing the GPIO register sets;
+-		order must correspond with the order of entries in reg-names
+-	- #gpio-cells: must be set to 2. The first cell is the pin number and
+-			the second cell is used to specify the gpio polarity:
+-			0 = active high
+-			1 = active low
+-	- gpio-controller: Marks the device node as a gpio controller.
+-
+-Optional properties:
+-	- native-endian: use native endian memory.
+-
+-Examples:
+-	- BCM6338:
+-	gpio: gpio-controller@fffe0407 {
+-		compatible = "brcm,bcm6345-gpio";
+-		reg-names = "dirout", "dat";
+-		reg = <0xfffe0407 1>, <0xfffe040f 1>;
+-
+-		#gpio-cells = <2>;
+-		gpio-controller;
+-	};
+-
+-	- BCM6345:
+-	gpio: gpio-controller@fffe0406 {
+-		compatible = "brcm,bcm6345-gpio";
+-		reg-names = "dirout", "dat";
+-		reg = <0xfffe0406 2>, <0xfffe040a 2>;
+-		native-endian;
+-
+-		#gpio-cells = <2>;
+-		gpio-controller;
+-	};
+--- /dev/null
++++ b/Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml
+@@ -0,0 +1,86 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/gpio/brcm,bcm6345-gpio.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6345 GPIO controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description: |+
++  Bindings for Broadcom's BCM63xx memory-mapped GPIO controllers.
++
++  These bindings can be used on any BCM63xx SoC. However, BCM6338 and BCM6345
++  are the only ones which don't need a pinctrl driver.
++
++  BCM6338 have 8-bit data and dirout registers, where GPIO state can be read
++  and/or written, and the direction changed from input to output.
++  BCM6345 have 16-bit data and dirout registers, where GPIO state can be read
++  and/or written, and the direction changed from input to output.
++  BCM6318, BCM6328, BCM6358, BCM6362, BCM6368 and BCM63268 have 32-bit data
++  and dirout registers, where GPIO state can be read and/or written, and the
++  direction changed from input to output.
++
++properties:
++  compatible:
++    enum:
++      - brcm,bcm6318-gpio
++      - brcm,bcm6328-gpio
++      - brcm,bcm6345-gpio
++      - brcm,bcm6358-gpio
++      - brcm,bcm6362-gpio
++      - brcm,bcm6368-gpio
++      - brcm,bcm63268-gpio
++
++  gpio-controller: true
++
++  "#gpio-cells":
++    const: 2
++
++  gpio-ranges:
++    maxItems: 1
++
++  native-endian: true
++
++  reg:
++    maxItems: 2
++
++  reg-names:
++    items:
++      - const: dirout
++      - const: dat
++
++required:
++  - compatible
++  - reg
++  - reg-names
++  - gpio-controller
++  - '#gpio-cells'
++
++additionalProperties: false
++
++examples:
++  - |
++    gpio@fffe0406 {
++      compatible = "brcm,bcm6345-gpio";
++      reg-names = "dirout", "dat";
++      reg = <0xfffe0406 2>, <0xfffe040a 2>;
++      native-endian;
++
++      gpio-controller;
++      #gpio-cells = <2>;
++    };
++
++  - |
++    gpio@0 {
++      compatible = "brcm,bcm63268-gpio";
++      reg-names = "dirout", "dat";
++      reg = <0x0 0x8>, <0x8 0x8>;
++
++      gpio-controller;
++      gpio-ranges = <&pinctrl 0 0 52>;
++      #gpio-cells = <2>;
++    };
diff --git a/target/linux/bmips/patches-5.10/055-v5.13-pinctrl-bcm-add-bcm63xx-base-code.patch b/target/linux/bmips/patches-5.10/055-v5.13-pinctrl-bcm-add-bcm63xx-base-code.patch
new file mode 100644
index 0000000000..eec8b98a49
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/055-v5.13-pinctrl-bcm-add-bcm63xx-base-code.patch
@@ -0,0 +1,208 @@
+From 132f95016db0a0a0659e99b471a7d3fd0c60f961 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:05 +0100
+Subject: [PATCH 04/22] pinctrl: bcm: add bcm63xx base code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add a helper for registering BCM63XX pin controllers.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-5-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ drivers/pinctrl/bcm/Kconfig           |   7 ++
+ drivers/pinctrl/bcm/Makefile          |   1 +
+ drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 109 ++++++++++++++++++++++++++
+ drivers/pinctrl/bcm/pinctrl-bcm63xx.h |  43 ++++++++++
+ 4 files changed, 160 insertions(+)
+ create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.c
+ create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63xx.h
+
+--- a/drivers/pinctrl/bcm/Kconfig
++++ b/drivers/pinctrl/bcm/Kconfig
+@@ -29,6 +29,13 @@ config PINCTRL_BCM2835
+ 	help
+ 	   Say Y here to enable the Broadcom BCM2835 GPIO driver.
+ 
++config PINCTRL_BCM63XX
++	bool
++	select GENERIC_PINCONF
++	select GPIO_REGMAP
++	select PINCONF
++	select PINMUX
++
+ config PINCTRL_IPROC_GPIO
+ 	bool "Broadcom iProc GPIO (with PINCONF) driver"
+ 	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
+--- a/drivers/pinctrl/bcm/Makefile
++++ b/drivers/pinctrl/bcm/Makefile
+@@ -3,6 +3,7 @@
+ 
+ obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
+ obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
++obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctrl-bcm63xx.o
+ obj-$(CONFIG_PINCTRL_IPROC_GPIO)	+= pinctrl-iproc-gpio.o
+ obj-$(CONFIG_PINCTRL_CYGNUS_MUX)	+= pinctrl-cygnus-mux.o
+ obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
+--- /dev/null
++++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.c
+@@ -0,0 +1,109 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Driver for BCM63xx GPIO unit (pinctrl + GPIO)
++ *
++ * Copyright (C) 2021 Álvaro Fernández Rojas <noltari@gmail.com>
++ * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
++ */
++
++#include <linux/gpio/regmap.h>
++#include <linux/mfd/syscon.h>
++#include <linux/mod_devicetable.h>
++#include <linux/of.h>
++#include <linux/platform_device.h>
++
++#include "pinctrl-bcm63xx.h"
++
++#define BCM63XX_BANK_SIZE	4
++
++#define BCM63XX_DIROUT_REG	0x04
++#define BCM63XX_DATA_REG	0x0c
++
++static int bcm63xx_reg_mask_xlate(struct gpio_regmap *gpio,
++				  unsigned int base, unsigned int offset,
++				  unsigned int *reg, unsigned int *mask)
++{
++	unsigned int line = offset % BCM63XX_BANK_GPIOS;
++	unsigned int stride = offset / BCM63XX_BANK_GPIOS;
++
++	*reg = base - stride * BCM63XX_BANK_SIZE;
++	*mask = BIT(line);
++
++	return 0;
++}
++
++static const struct of_device_id bcm63xx_gpio_of_match[] = {
++	{ .compatible = "brcm,bcm6318-gpio", },
++	{ .compatible = "brcm,bcm6328-gpio", },
++	{ .compatible = "brcm,bcm6358-gpio", },
++	{ .compatible = "brcm,bcm6362-gpio", },
++	{ .compatible = "brcm,bcm6368-gpio", },
++	{ .compatible = "brcm,bcm63268-gpio", },
++	{ /* sentinel */ }
++};
++
++static int bcm63xx_gpio_probe(struct device *dev, struct device_node *node,
++			      const struct bcm63xx_pinctrl_soc *soc,
++			      struct bcm63xx_pinctrl *pc)
++{
++	struct gpio_regmap_config grc = {0};
++
++	grc.parent = dev;
++	grc.fwnode = &node->fwnode;
++	grc.ngpio = soc->ngpios;
++	grc.ngpio_per_reg = BCM63XX_BANK_GPIOS;
++	grc.regmap = pc->regs;
++	grc.reg_dat_base = BCM63XX_DATA_REG;
++	grc.reg_dir_out_base = BCM63XX_DIROUT_REG;
++	grc.reg_set_base = BCM63XX_DATA_REG;
++	grc.reg_mask_xlate = bcm63xx_reg_mask_xlate;
++
++	return PTR_ERR_OR_ZERO(devm_gpio_regmap_register(dev, &grc));
++}
++
++int bcm63xx_pinctrl_probe(struct platform_device *pdev,
++			  const struct bcm63xx_pinctrl_soc *soc,
++			  void *driver_data)
++{
++	struct device *dev = &pdev->dev;
++	struct bcm63xx_pinctrl *pc;
++	struct device_node *node;
++	int err;
++
++	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
++	if (!pc)
++		return -ENOMEM;
++
++	platform_set_drvdata(pdev, pc);
++
++	pc->dev = dev;
++	pc->driver_data = driver_data;
++
++	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
++	if (IS_ERR(pc->regs))
++		return PTR_ERR(pc->regs);
++
++	pc->pctl_desc.name = dev_name(dev);
++	pc->pctl_desc.pins = soc->pins;
++	pc->pctl_desc.npins = soc->npins;
++	pc->pctl_desc.pctlops = soc->pctl_ops;
++	pc->pctl_desc.pmxops = soc->pmx_ops;
++	pc->pctl_desc.owner = THIS_MODULE;
++
++	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
++	if (IS_ERR(pc->pctl_dev))
++		return PTR_ERR(pc->pctl_dev);
++
++	for_each_child_of_node(dev->parent->of_node, node) {
++		if (of_match_node(bcm63xx_gpio_of_match, node)) {
++			err = bcm63xx_gpio_probe(dev, node, soc, pc);
++			if (err) {
++				dev_err(dev, "could not add GPIO chip\n");
++				of_node_put(node);
++				return err;
++			}
++		}
++	}
++
++	return 0;
++}
+--- /dev/null
++++ b/drivers/pinctrl/bcm/pinctrl-bcm63xx.h
+@@ -0,0 +1,43 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Copyright (C) 2021 Álvaro Fernández Rojas <noltari@gmail.com>
++ * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
++ */
++
++#ifndef __PINCTRL_BCM63XX_H__
++#define __PINCTRL_BCM63XX_H__
++
++#include <linux/pinctrl/pinctrl.h>
++
++#define BCM63XX_BANK_GPIOS 32
++
++struct bcm63xx_pinctrl_soc {
++	struct pinctrl_ops *pctl_ops;
++	struct pinmux_ops *pmx_ops;
++
++	const struct pinctrl_pin_desc *pins;
++	unsigned npins;
++
++	unsigned int ngpios;
++};
++
++struct bcm63xx_pinctrl {
++	struct device *dev;
++	struct regmap *regs;
++
++	struct pinctrl_desc pctl_desc;
++	struct pinctrl_dev *pctl_dev;
++
++	void *driver_data;
++};
++
++static inline unsigned int bcm63xx_bank_pin(unsigned int pin)
++{
++	return pin % BCM63XX_BANK_GPIOS;
++}
++
++int bcm63xx_pinctrl_probe(struct platform_device *pdev,
++			  const struct bcm63xx_pinctrl_soc *soc,
++			  void *driver_data);
++
++#endif /* __PINCTRL_BCM63XX_H__ */
diff --git a/target/linux/bmips/patches-5.10/056-v5.13-dt-bindings-add-BCM6328-pincontroller-binding-docume.patch b/target/linux/bmips/patches-5.10/056-v5.13-dt-bindings-add-BCM6328-pincontroller-binding-docume.patch
new file mode 100644
index 0000000000..af15da971f
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/056-v5.13-dt-bindings-add-BCM6328-pincontroller-binding-docume.patch
@@ -0,0 +1,152 @@
+From 44dbcd8eb08a0febbb46ac7b9331f28a320bdf9a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:06 +0100
+Subject: [PATCH 05/22] dt-bindings: add BCM6328 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in BCM6328 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-6-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm6328-pinctrl.yaml         | 127 ++++++++++++++++++
+ 1 file changed, 127 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml
+@@ -0,0 +1,127 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6328-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6328 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM6328 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm6328-pinctrl
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ serial_led_data, serial_led_clk, inet_act_led, pcie_clkreq,
++                led, ephy0_act_led, ephy1_act_led, ephy2_act_led,
++                ephy3_act_led, hsspi_cs1, usb_device_port, usb_host_port ]
++
++      pins:
++        enum: [ gpio6, gpio7, gpio11, gpio16, gpio17, gpio18, gpio19,
++                gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1,
++                usb_port1 ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@18 {
++      compatible = "brcm,bcm6328-pinctrl";
++      reg = <0x18 0x10>;
++
++      pinctrl_serial_led: serial_led-pins {
++        pinctrl_serial_led_data: serial_led_data-pins {
++          function = "serial_led_data";
++          pins = "gpio6";
++        };
++
++        pinctrl_serial_led_clk: serial_led_clk-pins {
++          function = "serial_led_clk";
++          pins = "gpio7";
++        };
++      };
++
++      pinctrl_inet_act_led: inet_act_led-pins {
++        function = "inet_act_led";
++        pins = "gpio11";
++      };
++
++      pinctrl_pcie_clkreq: pcie_clkreq-pins {
++        function = "pcie_clkreq";
++        pins = "gpio16";
++      };
++
++      pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
++        function = "led";
++        pins = "gpio17";
++      };
++
++      pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
++        function = "led";
++        pins = "gpio18";
++      };
++
++      pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
++        function = "led";
++        pins = "gpio19";
++      };
++
++      pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
++        function = "led";
++        pins = "gpio20";
++      };
++
++      pinctrl_ephy0_act_led: ephy0_act_led-pins {
++        function = "ephy0_act_led";
++        pins = "gpio25";
++      };
++
++      pinctrl_ephy1_act_led: ephy1_act_led-pins {
++        function = "ephy1_act_led";
++        pins = "gpio26";
++      };
++
++      pinctrl_ephy2_act_led: ephy2_act_led-pins {
++        function = "ephy2_act_led";
++        pins = "gpio27";
++      };
++
++      pinctrl_ephy3_act_led: ephy3_act_led-pins {
++        function = "ephy3_act_led";
++        pins = "gpio28";
++      };
++
++      pinctrl_hsspi_cs1: hsspi_cs1-pins {
++        function = "hsspi_cs1";
++        pins = "hsspi_cs1";
++      };
++
++      pinctrl_usb_port1_device: usb_port1_device-pins {
++        function = "usb_device_port";
++        pins = "usb_port1";
++      };
++
++      pinctrl_usb_port1_host: usb_port1_host-pins {
++        function = "usb_host_port";
++        pins = "usb_port1";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/057-v5.13-dt-bindings-add-BCM6328-GPIO-sysctl-binding-document.patch b/target/linux/bmips/patches-5.10/057-v5.13-dt-bindings-add-BCM6328-GPIO-sysctl-binding-document.patch
new file mode 100644
index 0000000000..3c1e48d300
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/057-v5.13-dt-bindings-add-BCM6328-GPIO-sysctl-binding-document.patch
@@ -0,0 +1,185 @@
+From 7f9dfaa2afb6bc3481e531c405b05acf6091af29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:07 +0100
+Subject: [PATCH 06/22] dt-bindings: add BCM6328 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM6328 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-7-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm6328-gpio-sysctl.yaml         | 162 ++++++++++++++++++
+ 1 file changed, 162 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm6328-gpio-sysctl.yaml
+@@ -0,0 +1,162 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm6328-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6328 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM6328 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm6328-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm6328-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@10000080 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm6328-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0x10000080 0x80>;
++      ranges = <0 0x10000080 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm6328-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 32>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@18 {
++        compatible = "brcm,bcm6328-pinctrl";
++        reg = <0x18 0x10>;
++
++        pinctrl_serial_led: serial_led-pins {
++          pinctrl_serial_led_data: serial_led_data-pins {
++            function = "serial_led_data";
++            pins = "gpio6";
++          };
++
++          pinctrl_serial_led_clk: serial_led_clk-pins {
++            function = "serial_led_clk";
++            pins = "gpio7";
++          };
++        };
++
++        pinctrl_inet_act_led: inet_act_led-pins {
++          function = "inet_act_led";
++          pins = "gpio11";
++        };
++
++        pinctrl_pcie_clkreq: pcie_clkreq-pins {
++          function = "pcie_clkreq";
++          pins = "gpio16";
++        };
++
++        pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
++          function = "led";
++          pins = "gpio17";
++        };
++
++        pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
++          function = "led";
++          pins = "gpio18";
++        };
++
++        pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
++          function = "led";
++          pins = "gpio19";
++        };
++
++        pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
++          function = "led";
++          pins = "gpio20";
++        };
++
++        pinctrl_ephy0_act_led: ephy0_act_led-pins {
++          function = "ephy0_act_led";
++          pins = "gpio25";
++        };
++
++        pinctrl_ephy1_act_led: ephy1_act_led-pins {
++          function = "ephy1_act_led";
++          pins = "gpio26";
++        };
++
++        pinctrl_ephy2_act_led: ephy2_act_led-pins {
++          function = "ephy2_act_led";
++          pins = "gpio27";
++        };
++
++        pinctrl_ephy3_act_led: ephy3_act_led-pins {
++          function = "ephy3_act_led";
++          pins = "gpio28";
++        };
++
++        pinctrl_hsspi_cs1: hsspi_cs1-pins {
++          function = "hsspi_cs1";
++          pins = "hsspi_cs1";
++        };
++
++        pinctrl_usb_port1_device: usb_port1_device-pins {
++          function = "usb_device_port";
++          pins = "usb_port1";
++        };
++
++        pinctrl_usb_port1_host: usb_port1_host-pins {
++          function = "usb_host_port";
++          pins = "usb_port1";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/401-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch b/target/linux/bmips/patches-5.10/058-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch
index 0e223f2fca..90929d8d1f 100644
--- a/target/linux/bmips/patches-5.10/401-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch
+++ b/target/linux/bmips/patches-5.10/058-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch
@@ -1,38 +1,38 @@
-From 3373a507212e6394921781766e9cd0dc155c62ba Mon Sep 17 00:00:00 2001
+From 9bf34ac5ab5805f0a798d40423c05596b7a0cee6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:12:50 +0200
-Subject: [PATCH 02/12] pinctrl: add a pincontrol driver for BCM6328
+Date: Wed, 24 Mar 2021 09:19:08 +0100
+Subject: [PATCH 07/22] pinctrl: add a pincontrol driver for BCM6328
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
-Add a pincontrol driver for BCM6328. BCM628 supports muxing 32 pins as
+Add a pincontrol driver for BCM6328. BCM6328 supports muxing 32 pins as
 GPIOs, as LEDs for the integrated LED controller, or various other
 functions. Its pincontrol mux registers also control other aspects, like
 switching the second USB port between host and device mode.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-8-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig           |  11 +
+ drivers/pinctrl/bcm/Kconfig           |   8 +
  drivers/pinctrl/bcm/Makefile          |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm6328.c | 581 ++++++++++++++++++++++++++
- 3 files changed, 593 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm6328.c | 404 ++++++++++++++++++++++++++
+ 3 files changed, 413 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6328.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -29,6 +29,17 @@ config PINCTRL_BCM2835
- 	help
- 	   Say Y here to enable the Broadcom BCM2835 GPIO driver.
+@@ -36,6 +36,14 @@ config PINCTRL_BCM63XX
+ 	select PINCONF
+ 	select PINMUX
  
 +config PINCTRL_BCM6328
 +	bool "Broadcom BCM6328 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM6328 GPIO driver.
@@ -42,17 +42,17 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -3,6 +3,7 @@
- 
+@@ -4,6 +4,7 @@
  obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
  obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
+ obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctrl-bcm63xx.o
 +obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctrl-bcm6328.o
  obj-$(CONFIG_PINCTRL_IPROC_GPIO)	+= pinctrl-iproc-gpio.o
  obj-$(CONFIG_PINCTRL_CYGNUS_MUX)	+= pinctrl-cygnus-mux.o
  obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm6328.c
-@@ -0,0 +1,581 @@
+@@ -0,0 +1,404 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM6328 GPIO unit (pinctrl + GPIO)
@@ -61,36 +61,25 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME		"bcm6328-pinctrl"
-+#define BCM6328_NUM_GPIOS	32
++#include "pinctrl-bcm63xx.h"
 +
-+#define BANK_SIZE		sizeof(uint32_t)
-+#define PINS_PER_BANK		(BANK_SIZE * BITS_PER_BYTE)
++#define BCM6328_NUM_GPIOS	32
 +
-+#define BCM6328_DIROUT_REG	0x04
-+#define BCM6328_DATA_REG	0x0c
 +#define BCM6328_MODE_REG	0x18
 +#define BCM6328_MUX_HI_REG	0x1c
 +#define BCM6328_MUX_LO_REG	0x20
 +#define BCM6328_MUX_OTHER_REG	0x24
++#define  BCM6328_MUX_MASK	GENMASK(1, 0)
 +
 +struct bcm6328_pingroup {
 +	const char *name;
@@ -107,14 +96,10 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	unsigned mux_val:2;
 +};
 +
-+struct bcm6328_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
++static const unsigned int bcm6328_mux[] = {
++	BCM6328_MUX_LO_REG,
++	BCM6328_MUX_HI_REG,
++	BCM6328_MUX_OTHER_REG
 +};
 +
 +static const struct pinctrl_pin_desc bcm6328_pins[] = {
@@ -344,119 +329,11 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	BCM6328_MUX_FUN(usb_device_port, 2),
 +};
 +
-+static inline unsigned int bcm6328_bank_pin(unsigned int pin)
++static inline unsigned int bcm6328_mux_off(unsigned int pin)
 +{
-+	return pin % PINS_PER_BANK;
-+}
-+
-+static inline unsigned int bcm6318_mux_off(unsigned int pin)
-+{
-+	static const unsigned int bcm6328_mux[] = {
-+		BCM6328_MUX_LO_REG,
-+		BCM6328_MUX_HI_REG,
-+		BCM6328_MUX_OTHER_REG
-+	};
-+
 +	return bcm6328_mux[pin / 16];
 +}
 +
-+static inline unsigned int bcm6328_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm6328_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm6328_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6328_reg_off(BCM6328_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6328_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm6328_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm6328_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6328_reg_off(BCM6328_DATA_REG, pin);
-+	unsigned int dirout = bcm6328_reg_off(BCM6328_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6328_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm6328_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6328_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6328_reg_off(BCM6328_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6328_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm6328_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6328_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6328_reg_off(BCM6328_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6328_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm6328_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm6328_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6328_reg_off(BCM6328_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6328_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm6328_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
-+}
-+
 +static int bcm6328_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
 +{
 +	return ARRAY_SIZE(bcm6328_groups);
@@ -500,22 +377,22 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	return 0;
 +}
 +
-+static void bcm6328_rmw_mux(struct bcm6328_pinctrl *pc, unsigned pin,
++static void bcm6328_rmw_mux(struct bcm63xx_pinctrl *pc, unsigned pin,
 +			    unsigned int mode, unsigned int mux)
 +{
 +	if (pin < BCM6328_NUM_GPIOS)
 +		regmap_update_bits(pc->regs, BCM6328_MODE_REG, BIT(pin),
 +				   mode ? BIT(pin) : 0);
 +
-+	regmap_update_bits(pc->regs, bcm6318_mux_off(pin),
-+			   3UL << ((pin % 16) * 2),
++	regmap_update_bits(pc->regs, bcm6328_mux_off(pin),
++			   BCM6328_MUX_MASK << ((pin % 16) * 2),
 +			   mux << ((pin % 16) * 2));
 +}
 +
 +static int bcm6328_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				   unsigned selector, unsigned group)
 +{
-+	struct bcm6328_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +	const struct bcm6328_pingroup *pg = &bcm6328_groups[group];
 +	const struct bcm6328_function *f = &bcm6328_funcs[selector];
 +
@@ -528,7 +405,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +				       struct pinctrl_gpio_range *range,
 +				       unsigned offset)
 +{
-+	struct bcm6328_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +
 +	/* disable all functions using this pin */
 +	bcm6328_rmw_mux(pc, offset, 0, 0);
@@ -537,98 +414,44 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +}
 +
 +static struct pinctrl_ops bcm6328_pctl_ops = {
-+	.get_groups_count = bcm6328_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm6328_pinctrl_get_group_name,
 +	.get_group_pins = bcm6328_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm6328_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm6328_pmx_ops = {
-+	.get_functions_count = bcm6328_pinctrl_get_func_count,
-+	.get_function_name = bcm6328_pinctrl_get_func_name,
 +	.get_function_groups = bcm6328_pinctrl_get_groups,
-+	.set_mux = bcm6328_pinctrl_set_mux,
++	.get_function_name = bcm6328_pinctrl_get_func_name,
++	.get_functions_count = bcm6328_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm6328_gpio_request_enable,
++	.set_mux = bcm6328_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm6328_soc = {
++	.ngpios = BCM6328_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm6328_pins),
++	.pctl_ops = &bcm6328_pctl_ops,
++	.pins = bcm6328_pins,
++	.pmx_ops = &bcm6328_pmx_ops,
++};
++
 +static int bcm6328_pinctrl_probe(struct platform_device *pdev)
 +{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm6328_pinctrl *pc;
-+	int err;
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm6328_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm6328_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm6328_gpio_get_direction;
-+	pc->gpio_chip.get = bcm6328_gpio_get;
-+	pc->gpio_chip.set = bcm6328_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM6328_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm6328_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
-+		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm6328_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm6328_pins),
-+	pc->pctl_desc.pctlops = &bcm6328_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm6328_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
-+
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM6328_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	dev_info(dev, "registered\n");
-+
-+	return 0;
++	return bcm63xx_pinctrl_probe(pdev, &bcm6328_soc, NULL);
 +}
 +
 +static const struct of_device_id bcm6328_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm6328-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm6328_pinctrl_driver = {
 +	.probe = bcm6328_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm6328-pinctrl",
 +		.of_match_table = bcm6328_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/059-v5.13-dt-bindings-add-BCM6358-pincontroller-binding-docume.patch b/target/linux/bmips/patches-5.10/059-v5.13-dt-bindings-add-BCM6358-pincontroller-binding-docume.patch
new file mode 100644
index 0000000000..001f94c5a5
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/059-v5.13-dt-bindings-add-BCM6358-pincontroller-binding-docume.patch
@@ -0,0 +1,118 @@
+From 6d591614bfe881bb7664c9bebb6a48231c059411 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:09 +0100
+Subject: [PATCH 08/22] dt-bindings: add BCM6358 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in BCM6358 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-9-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm6358-pinctrl.yaml         | 93 +++++++++++++++++++
+ 1 file changed, 93 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml
+@@ -0,0 +1,93 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6358-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6358 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM6358 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm6358-pinctrl
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ ebi_cs, uart1, serial_led, legacy_led, led, spi_cs, utopia,
++                pwm_syn_clk, sys_irq ]
++
++      pins:
++        enum: [ ebi_cs_grp, uart1_grp, serial_led_grp, legacy_led_grp,
++                led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk, sys_irq_grp ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@18 {
++      compatible = "brcm,bcm6358-pinctrl";
++      reg = <0x18 0x4>;
++
++      pinctrl_ebi_cs: ebi_cs-pins {
++        function = "ebi_cs";
++        groups = "ebi_cs_grp";
++      };
++
++      pinctrl_uart1: uart1-pins {
++        function = "uart1";
++        groups = "uart1_grp";
++      };
++
++      pinctrl_serial_led: serial_led-pins {
++        function = "serial_led";
++        groups = "serial_led_grp";
++      };
++
++      pinctrl_legacy_led: legacy_led-pins {
++        function = "legacy_led";
++        groups = "legacy_led_grp";
++      };
++
++      pinctrl_led: led-pins {
++        function = "led";
++        groups = "led_grp";
++      };
++
++      pinctrl_spi_cs_23: spi_cs-pins {
++        function = "spi_cs";
++        groups = "spi_cs_grp";
++      };
++
++      pinctrl_utopia: utopia-pins {
++        function = "utopia";
++        groups = "utopia_grp";
++      };
++
++      pinctrl_pwm_syn_clk: pwm_syn_clk-pins {
++        function = "pwm_syn_clk";
++        groups = "pwm_syn_clk_grp";
++      };
++
++      pinctrl_sys_irq: sys_irq-pins {
++        function = "sys_irq";
++        groups = "sys_irq_grp";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/060-v5.13-dt-bindings-add-BCM6358-GPIO-sysctl-binding-document.patch b/target/linux/bmips/patches-5.10/060-v5.13-dt-bindings-add-BCM6358-GPIO-sysctl-binding-document.patch
new file mode 100644
index 0000000000..a36984e7ad
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/060-v5.13-dt-bindings-add-BCM6358-GPIO-sysctl-binding-document.patch
@@ -0,0 +1,153 @@
+From cfb1b98bc8d5ffd813428cb03c63b54cf63dd785 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:10 +0100
+Subject: [PATCH 09/22] dt-bindings: add BCM6358 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM6358 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-10-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm6358-gpio-sysctl.yaml         | 130 ++++++++++++++++++
+ 1 file changed, 130 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm6358-gpio-sysctl.yaml
+@@ -0,0 +1,130 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm6358-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6358 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM6358 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm6358-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm6358-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@fffe0080 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm6358-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0xfffe0080 0x80>;
++      ranges = <0 0xfffe0080 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm6358-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 40>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@18 {
++        compatible = "brcm,bcm6358-pinctrl";
++        reg = <0x18 0x4>;
++
++        pinctrl_ebi_cs: ebi_cs-pins {
++          function = "ebi_cs";
++          groups = "ebi_cs_grp";
++        };
++
++        pinctrl_uart1: uart1-pins {
++          function = "uart1";
++          groups = "uart1_grp";
++        };
++
++        pinctrl_serial_led: serial_led-pins {
++          function = "serial_led";
++          groups = "serial_led_grp";
++        };
++
++        pinctrl_legacy_led: legacy_led-pins {
++          function = "legacy_led";
++          groups = "legacy_led_grp";
++        };
++
++        pinctrl_led: led-pins {
++          function = "led";
++          groups = "led_grp";
++        };
++
++        pinctrl_spi_cs_23: spi_cs-pins {
++          function = "spi_cs";
++          groups = "spi_cs_grp";
++        };
++
++        pinctrl_utopia: utopia-pins {
++          function = "utopia";
++          groups = "utopia_grp";
++        };
++
++        pinctrl_pwm_syn_clk: pwm_syn_clk-pins {
++          function = "pwm_syn_clk";
++          groups = "pwm_syn_clk_grp";
++        };
++
++        pinctrl_sys_irq: sys_irq-pins {
++          function = "sys_irq";
++          groups = "sys_irq_grp";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/403-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch b/target/linux/bmips/patches-5.10/061-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch
index fb8681d904..266ed686dc 100644
--- a/target/linux/bmips/patches-5.10/403-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch
+++ b/target/linux/bmips/patches-5.10/061-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch
@@ -1,7 +1,7 @@
-From b0e1ebc79a6d7f84f71a758f5a504c8cf954e2e0 Mon Sep 17 00:00:00 2001
+From 9494b16976e1ae3afc643abf638a25f2ce4c3f2b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:16:01 +0200
-Subject: [PATCH 04/12] pinctrl: add a pincontrol driver for BCM6358
+Date: Wed, 24 Mar 2021 09:19:11 +0100
+Subject: [PATCH 10/22] pinctrl: add a pincontrol driver for BCM6358
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -12,28 +12,28 @@ pins but only whole groups. These groups may overlap, and still require
 the directions to be set correctly in the GPIO register. In addition the
 functions register controls other, not directly mux related functions.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-11-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig           |  11 +
+ drivers/pinctrl/bcm/Kconfig           |   8 +
  drivers/pinctrl/bcm/Makefile          |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm6358.c | 526 ++++++++++++++++++++++++++
- 3 files changed, 538 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm6358.c | 369 ++++++++++++++++++++++++++
+ 3 files changed, 378 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6358.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -40,6 +40,17 @@ config PINCTRL_BCM6328
+@@ -44,6 +44,14 @@ config PINCTRL_BCM6328
  	help
  	   Say Y here to enable the Broadcom BCM6328 GPIO driver.
  
 +config PINCTRL_BCM6358
 +	bool "Broadcom BCM6358 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM6358 GPIO driver.
@@ -43,9 +43,9 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -4,6 +4,7 @@
- obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
+@@ -5,6 +5,7 @@ obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinct
  obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
+ obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctrl-bcm63xx.o
  obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctrl-bcm6328.o
 +obj-$(CONFIG_PINCTRL_BCM6358)		+= pinctrl-bcm6358.o
  obj-$(CONFIG_PINCTRL_IPROC_GPIO)	+= pinctrl-iproc-gpio.o
@@ -53,7 +53,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm6358.c
-@@ -0,0 +1,526 @@
+@@ -0,0 +1,369 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM6358 GPIO unit (pinctrl + GPIO)
@@ -62,46 +62,33 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME		"bcm6358-pinctrl"
-+#define BCM6358_NUM_GPIOS	40
-+
-+#define BANK_SIZE		sizeof(uint32_t)
-+#define PINS_PER_BANK		(BANK_SIZE * BITS_PER_BYTE)
-+
-+#define BCM6358_DIROUT_REG	0x04
-+#define BCM6358_DATA_REG	0x0c
-+#define BCM6358_MODE_REG	0x18
-+
-+#define BCM6358_MODE_MUX_NONE		0
-+#define BCM6358_MODE_MUX_EBI_CS		BIT(5)
-+#define BCM6358_MODE_MUX_UART1		BIT(6)
-+#define BCM6358_MODE_MUX_SPI_CS		BIT(7)
-+#define BCM6358_MODE_MUX_ASYNC_MODEM	BIT(8)
-+#define BCM6358_MODE_MUX_LEGACY_LED	BIT(9)
-+#define BCM6358_MODE_MUX_SERIAL_LED	BIT(10)
-+#define BCM6358_MODE_MUX_LED		BIT(11)
-+#define BCM6358_MODE_MUX_UTOPIA		BIT(12)
-+#define BCM6358_MODE_MUX_CLKRST		BIT(13)
-+#define BCM6358_MODE_MUX_PWM_SYN_CLK	BIT(14)
-+#define BCM6358_MODE_MUX_SYS_IRQ	BIT(15)
++#include "pinctrl-bcm63xx.h"
++
++#define BCM6358_NUM_GPIOS		40
++
++#define BCM6358_MODE_REG		0x18
++#define  BCM6358_MODE_MUX_NONE		0
++#define  BCM6358_MODE_MUX_EBI_CS	BIT(5)
++#define  BCM6358_MODE_MUX_UART1		BIT(6)
++#define  BCM6358_MODE_MUX_SPI_CS	BIT(7)
++#define  BCM6358_MODE_MUX_ASYNC_MODEM	BIT(8)
++#define  BCM6358_MODE_MUX_LEGACY_LED	BIT(9)
++#define  BCM6358_MODE_MUX_SERIAL_LED	BIT(10)
++#define  BCM6358_MODE_MUX_LED		BIT(11)
++#define  BCM6358_MODE_MUX_UTOPIA	BIT(12)
++#define  BCM6358_MODE_MUX_CLKRST	BIT(13)
++#define  BCM6358_MODE_MUX_PWM_SYN_CLK	BIT(14)
++#define  BCM6358_MODE_MUX_SYS_IRQ	BIT(15)
 +
 +struct bcm6358_pingroup {
 +	const char *name;
@@ -120,15 +107,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	const unsigned num_groups;
 +};
 +
-+struct bcm6358_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
++struct bcm6358_priv {
 +	struct regmap_field *overlays;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
 +};
 +
 +#define BCM6358_GPIO_PIN(a, b, bit1, bit2, bit3)		\
@@ -287,108 +267,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	BCM6358_FUN(sys_irq),
 +};
 +
-+static inline unsigned int bcm6358_bank_pin(unsigned int pin)
-+{
-+	return pin % PINS_PER_BANK;
-+}
-+
-+static inline unsigned int bcm6358_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm6358_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm6358_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6358_reg_off(BCM6358_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6358_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm6358_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm6358_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6358_reg_off(BCM6358_DATA_REG, pin);
-+	unsigned int dirout = bcm6358_reg_off(BCM6358_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6358_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm6358_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6358_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6358_reg_off(BCM6358_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6358_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm6358_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6358_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6358_reg_off(BCM6358_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6358_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm6358_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm6358_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6358_reg_off(BCM6358_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6358_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm6358_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
-+}
-+
 +static int bcm6358_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
 +{
 +	return ARRAY_SIZE(bcm6358_groups);
@@ -435,7 +313,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +static int bcm6358_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				   unsigned selector, unsigned group)
 +{
-+	struct bcm6358_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm6358_priv *priv = pc->driver_data;
 +	const struct bcm6358_pingroup *pg = &bcm6358_groups[group];
 +	unsigned int val = pg->mode_val;
 +	unsigned int mask = val;
@@ -444,16 +323,21 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	for (pin = 0; pin < pg->num_pins; pin++)
 +		mask |= (unsigned long)bcm6358_pins[pin].drv_data;
 +
-+	regmap_field_update_bits(pc->overlays, mask, val);
++	regmap_field_update_bits(priv->overlays, mask, val);
 +
 +	for (pin = 0; pin < pg->num_pins; pin++) {
-+		int hw_gpio = bcm6358_pins[pin].number;
-+		struct gpio_chip *gc = &pc->gpio_chip;
-+
-+		if (pg->direction & BIT(pin))
-+			gc->direction_output(gc, hw_gpio, 0);
-+		else
-+			gc->direction_input(gc, hw_gpio);
++		struct pinctrl_gpio_range *range;
++		unsigned int hw_gpio = bcm6358_pins[pin].number;
++
++		range = pinctrl_find_gpio_range_from_pin(pctldev, hw_gpio);
++		if (range) {
++			struct gpio_chip *gc = range->gc;
++
++			if (pg->direction & BIT(pin))
++				gc->direction_output(gc, hw_gpio, 0);
++			else
++				gc->direction_input(gc, hw_gpio);
++		}
 +	}
 +
 +	return 0;
@@ -463,7 +347,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +				       struct pinctrl_gpio_range *range,
 +				       unsigned offset)
 +{
-+	struct bcm6358_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm6358_priv *priv = pc->driver_data;
 +	unsigned int mask;
 +
 +	mask = (unsigned long) bcm6358_pins[offset].drv_data;
@@ -471,110 +356,68 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +		return 0;
 +
 +	/* disable all functions using this pin */
-+	return regmap_field_update_bits(pc->overlays, mask, 0);
++	return regmap_field_update_bits(priv->overlays, mask, 0);
 +}
 +
 +static struct pinctrl_ops bcm6358_pctl_ops = {
-+	.get_groups_count = bcm6358_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm6358_pinctrl_get_group_name,
 +	.get_group_pins = bcm6358_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm6358_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm6358_pmx_ops = {
-+	.get_functions_count = bcm6358_pinctrl_get_func_count,
-+	.get_function_name = bcm6358_pinctrl_get_func_name,
 +	.get_function_groups = bcm6358_pinctrl_get_groups,
-+	.set_mux = bcm6358_pinctrl_set_mux,
++	.get_function_name = bcm6358_pinctrl_get_func_name,
++	.get_functions_count = bcm6358_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm6358_gpio_request_enable,
++	.set_mux = bcm6358_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm6358_soc = {
++	.ngpios = BCM6358_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm6358_pins),
++	.pctl_ops = &bcm6358_pctl_ops,
++	.pins = bcm6358_pins,
++	.pmx_ops = &bcm6358_pmx_ops,
++};
++
 +static int bcm6358_pinctrl_probe(struct platform_device *pdev)
 +{
 +	struct reg_field overlays = REG_FIELD(BCM6358_MODE_REG, 0, 15);
 +	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm6358_pinctrl *pc;
++	struct bcm63xx_pinctrl *pc;
++	struct bcm6358_priv *priv;
 +	int err;
 +
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
++	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++	if (!priv)
 +		return -ENOMEM;
 +
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->overlays = devm_regmap_field_alloc(&pdev->dev, pc->regs, overlays);
-+	if (IS_ERR(pc->overlays))
-+		return PTR_ERR(pc->overlays);
-+
-+	/* disable all muxes by default */
-+	regmap_field_write(pc->overlays, 0);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm6358_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm6358_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm6358_gpio_get_direction;
-+	pc->gpio_chip.get = bcm6358_gpio_get;
-+	pc->gpio_chip.set = bcm6358_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM6358_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm6358_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
++	err = bcm63xx_pinctrl_probe(pdev, &bcm6358_soc, (void *) priv);
++	if (err)
 +		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm6358_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm6358_pins),
-+	pc->pctl_desc.pctlops = &bcm6358_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm6358_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
 +
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM6358_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
++	pc = platform_get_drvdata(pdev);
 +
-+	dev_info(dev, "registered\n");
++	priv->overlays = devm_regmap_field_alloc(dev, pc->regs, overlays);
++	if (IS_ERR(priv->overlays))
++		return PTR_ERR(priv->overlays);
 +
 +	return 0;
 +}
 +
 +static const struct of_device_id bcm6358_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm6358-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm6358_pinctrl_driver = {
 +	.probe = bcm6358_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm6358-pinctrl",
 +		.of_match_table = bcm6358_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/062-v5.13-dt-bindings-add-BCM6362-pincontroller-binding-docume.patch b/target/linux/bmips/patches-5.10/062-v5.13-dt-bindings-add-BCM6362-pincontroller-binding-docume.patch
new file mode 100644
index 0000000000..afdfbff1c2
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/062-v5.13-dt-bindings-add-BCM6362-pincontroller-binding-docume.patch
@@ -0,0 +1,231 @@
+From 6e4b5e1fc77513359989112e002e08553d0d8d5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:12 +0100
+Subject: [PATCH 11/22] dt-bindings: add BCM6362 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in BCM6362 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-12-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm6362-pinctrl.yaml         | 206 ++++++++++++++++++
+ 1 file changed, 206 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml
+@@ -0,0 +1,206 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6362-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6362 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM6362 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm6362-pinctrl
++
++  reg:
++    maxItems: 2
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ usb_device_led, sys_irq, serial_led_clk, serial_led_data,
++                robosw_led_data, robosw_led_clk, robosw_led0, robosw_led1,
++                inet_led, spi_cs2, spi_cs3, ntr_pulse, uart1_scts,
++                uart1_srts, uart1_sdin, uart1_sdout, adsl_spi_miso,
++                adsl_spi_mosi, adsl_spi_clk, adsl_spi_cs, ephy0_led,
++                ephy1_led, ephy2_led, ephy3_led, ext_irq0, ext_irq1,
++                ext_irq2, ext_irq3, nand ]
++
++      pins:
++        enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
++                gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio14,
++                gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
++                gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@18 {
++      compatible = "brcm,bcm6362-pinctrl";
++      reg = <0x18 0x10>, <0x38 0x4>;
++
++      pinctrl_usb_device_led: usb_device_led-pins {
++        function = "usb_device_led";
++        pins = "gpio0";
++      };
++
++      pinctrl_sys_irq: sys_irq-pins {
++        function = "sys_irq";
++        pins = "gpio1";
++      };
++
++      pinctrl_serial_led: serial_led-pins {
++        pinctrl_serial_led_clk: serial_led_clk-pins {
++          function = "serial_led_clk";
++          pins = "gpio2";
++        };
++
++        pinctrl_serial_led_data: serial_led_data-pins {
++          function = "serial_led_data";
++          pins = "gpio3";
++        };
++      };
++
++      pinctrl_robosw_led_data: robosw_led_data-pins {
++        function = "robosw_led_data";
++        pins = "gpio4";
++      };
++
++      pinctrl_robosw_led_clk: robosw_led_clk-pins {
++        function = "robosw_led_clk";
++        pins = "gpio5";
++      };
++
++      pinctrl_robosw_led0: robosw_led0-pins {
++        function = "robosw_led0";
++        pins = "gpio6";
++      };
++
++      pinctrl_robosw_led1: robosw_led1-pins {
++        function = "robosw_led1";
++        pins = "gpio7";
++      };
++
++      pinctrl_inet_led: inet_led-pins {
++        function = "inet_led";
++        pins = "gpio8";
++      };
++
++      pinctrl_spi_cs2: spi_cs2-pins {
++        function = "spi_cs2";
++        pins = "gpio9";
++      };
++
++      pinctrl_spi_cs3: spi_cs3-pins {
++        function = "spi_cs3";
++        pins = "gpio10";
++      };
++
++      pinctrl_ntr_pulse: ntr_pulse-pins {
++        function = "ntr_pulse";
++        pins = "gpio11";
++      };
++
++      pinctrl_uart1_scts: uart1_scts-pins {
++        function = "uart1_scts";
++        pins = "gpio12";
++      };
++
++      pinctrl_uart1_srts: uart1_srts-pins {
++        function = "uart1_srts";
++        pins = "gpio13";
++      };
++
++      pinctrl_uart1: uart1-pins {
++        pinctrl_uart1_sdin: uart1_sdin-pins {
++          function = "uart1_sdin";
++          pins = "gpio14";
++        };
++
++        pinctrl_uart1_sdout: uart1_sdout-pins {
++          function = "uart1_sdout";
++          pins = "gpio15";
++        };
++      };
++
++      pinctrl_adsl_spi: adsl_spi-pins {
++        pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
++          function = "adsl_spi_miso";
++          pins = "gpio16";
++        };
++
++        pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
++          function = "adsl_spi_mosi";
++          pins = "gpio17";
++        };
++
++        pinctrl_adsl_spi_clk: adsl_spi_clk-pins {
++          function = "adsl_spi_clk";
++          pins = "gpio18";
++        };
++
++        pinctrl_adsl_spi_cs: adsl_spi_cs-pins {
++          function = "adsl_spi_cs";
++          pins = "gpio19";
++        };
++      };
++
++      pinctrl_ephy0_led: ephy0_led-pins {
++        function = "ephy0_led";
++        pins = "gpio20";
++      };
++
++      pinctrl_ephy1_led: ephy1_led-pins {
++        function = "ephy1_led";
++        pins = "gpio21";
++      };
++
++      pinctrl_ephy2_led: ephy2_led-pins {
++        function = "ephy2_led";
++        pins = "gpio22";
++      };
++
++      pinctrl_ephy3_led: ephy3_led-pins {
++        function = "ephy3_led";
++        pins = "gpio23";
++      };
++
++      pinctrl_ext_irq0: ext_irq0-pins {
++        function = "ext_irq0";
++        pins = "gpio24";
++      };
++
++      pinctrl_ext_irq1: ext_irq1-pins {
++        function = "ext_irq1";
++        pins = "gpio25";
++      };
++
++      pinctrl_ext_irq2: ext_irq2-pins {
++        function = "ext_irq2";
++        pins = "gpio26";
++      };
++
++      pinctrl_ext_irq3: ext_irq3-pins {
++        function = "ext_irq3";
++        pins = "gpio27";
++      };
++
++      pinctrl_nand: nand-pins {
++        function = "nand";
++        group = "nand_grp";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/063-v5.13-dt-bindings-add-BCM6362-GPIO-sysctl-binding-document.patch b/target/linux/bmips/patches-5.10/063-v5.13-dt-bindings-add-BCM6362-GPIO-sysctl-binding-document.patch
new file mode 100644
index 0000000000..db0952211e
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/063-v5.13-dt-bindings-add-BCM6362-GPIO-sysctl-binding-document.patch
@@ -0,0 +1,259 @@
+From 7ca989eafbd6ce1c216a775556c4893baab1959b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:13 +0100
+Subject: [PATCH 12/22] dt-bindings: add BCM6362 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM6362 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-13-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm6362-gpio-sysctl.yaml         | 236 ++++++++++++++++++
+ 1 file changed, 236 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm6362-gpio-sysctl.yaml
+@@ -0,0 +1,236 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm6362-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6362 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM6362 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm6362-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm6362-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@10000080 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm6362-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0x10000080 0x80>;
++      ranges = <0 0x10000080 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm6362-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 48>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@18 {
++        compatible = "brcm,bcm6362-pinctrl";
++        reg = <0x18 0x10>, <0x38 0x4>;
++
++        pinctrl_usb_device_led: usb_device_led-pins {
++          function = "usb_device_led";
++          pins = "gpio0";
++        };
++
++        pinctrl_sys_irq: sys_irq-pins {
++          function = "sys_irq";
++          pins = "gpio1";
++        };
++
++        pinctrl_serial_led: serial_led-pins {
++          pinctrl_serial_led_clk: serial_led_clk-pins {
++            function = "serial_led_clk";
++            pins = "gpio2";
++          };
++
++          pinctrl_serial_led_data: serial_led_data-pins {
++            function = "serial_led_data";
++            pins = "gpio3";
++          };
++        };
++
++        pinctrl_robosw_led_data: robosw_led_data-pins {
++          function = "robosw_led_data";
++          pins = "gpio4";
++        };
++
++        pinctrl_robosw_led_clk: robosw_led_clk-pins {
++          function = "robosw_led_clk";
++          pins = "gpio5";
++        };
++
++        pinctrl_robosw_led0: robosw_led0-pins {
++          function = "robosw_led0";
++          pins = "gpio6";
++        };
++
++        pinctrl_robosw_led1: robosw_led1-pins {
++          function = "robosw_led1";
++          pins = "gpio7";
++        };
++
++        pinctrl_inet_led: inet_led-pins {
++          function = "inet_led";
++          pins = "gpio8";
++        };
++
++        pinctrl_spi_cs2: spi_cs2-pins {
++          function = "spi_cs2";
++          pins = "gpio9";
++        };
++
++        pinctrl_spi_cs3: spi_cs3-pins {
++          function = "spi_cs3";
++          pins = "gpio10";
++        };
++
++        pinctrl_ntr_pulse: ntr_pulse-pins {
++          function = "ntr_pulse";
++          pins = "gpio11";
++        };
++
++        pinctrl_uart1_scts: uart1_scts-pins {
++          function = "uart1_scts";
++          pins = "gpio12";
++        };
++
++        pinctrl_uart1_srts: uart1_srts-pins {
++          function = "uart1_srts";
++          pins = "gpio13";
++        };
++
++        pinctrl_uart1: uart1-pins {
++          pinctrl_uart1_sdin: uart1_sdin-pins {
++            function = "uart1_sdin";
++            pins = "gpio14";
++          };
++
++          pinctrl_uart1_sdout: uart1_sdout-pins {
++            function = "uart1_sdout";
++            pins = "gpio15";
++          };
++        };
++
++        pinctrl_adsl_spi: adsl_spi-pins {
++          pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
++            function = "adsl_spi_miso";
++            pins = "gpio16";
++          };
++
++          pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
++            function = "adsl_spi_mosi";
++            pins = "gpio17";
++          };
++
++          pinctrl_adsl_spi_clk: adsl_spi_clk-pins {
++            function = "adsl_spi_clk";
++            pins = "gpio18";
++          };
++
++          pinctrl_adsl_spi_cs: adsl_spi_cs-pins {
++            function = "adsl_spi_cs";
++            pins = "gpio19";
++          };
++        };
++
++        pinctrl_ephy0_led: ephy0_led-pins {
++          function = "ephy0_led";
++          pins = "gpio20";
++        };
++
++        pinctrl_ephy1_led: ephy1_led-pins {
++          function = "ephy1_led";
++          pins = "gpio21";
++        };
++
++        pinctrl_ephy2_led: ephy2_led-pins {
++          function = "ephy2_led";
++          pins = "gpio22";
++        };
++
++        pinctrl_ephy3_led: ephy3_led-pins {
++          function = "ephy3_led";
++          pins = "gpio23";
++        };
++
++        pinctrl_ext_irq0: ext_irq0-pins {
++          function = "ext_irq0";
++          pins = "gpio24";
++        };
++
++        pinctrl_ext_irq1: ext_irq1-pins {
++          function = "ext_irq1";
++          pins = "gpio25";
++        };
++
++        pinctrl_ext_irq2: ext_irq2-pins {
++          function = "ext_irq2";
++          pins = "gpio26";
++        };
++
++        pinctrl_ext_irq3: ext_irq3-pins {
++          function = "ext_irq3";
++          pins = "gpio27";
++        };
++
++        pinctrl_nand: nand-pins {
++          function = "nand";
++          group = "nand_grp";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/405-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch b/target/linux/bmips/patches-5.10/064-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch
index bfc6620ace..dc775c3c2c 100644
--- a/target/linux/bmips/patches-5.10/405-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch
+++ b/target/linux/bmips/patches-5.10/064-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch
@@ -1,7 +1,7 @@
-From 2872fcb5eac02d3a74d696e6350410a9e66281b4 Mon Sep 17 00:00:00 2001
+From 705791e23ecd93d6c2697234fdf0c22b499c0a5b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:17:20 +0200
-Subject: [PATCH 06/12] pinctrl: add a pincontrol driver for BCM6362
+Date: Wed, 24 Mar 2021 09:19:14 +0100
+Subject: [PATCH 13/22] pinctrl: add a pincontrol driver for BCM6362
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,28 +11,28 @@ GPIO pins to the LED controller, to be available by the integrated
 wifi, or other functions. It also supports overlay groups, of which
 only NAND is documented.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-14-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig           |  11 +
+ drivers/pinctrl/bcm/Kconfig           |   8 +
  drivers/pinctrl/bcm/Makefile          |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm6362.c | 794 ++++++++++++++++++++++++++
- 3 files changed, 806 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm6362.c | 617 ++++++++++++++++++++++++++
+ 3 files changed, 626 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6362.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -51,6 +51,17 @@ config PINCTRL_BCM6358
+@@ -52,6 +52,14 @@ config PINCTRL_BCM6358
  	help
  	   Say Y here to enable the Broadcom BCM6358 GPIO driver.
  
 +config PINCTRL_BCM6362
 +	bool "Broadcom BCM6362 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM6362 GPIO driver.
@@ -42,8 +42,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinct
- obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
+@@ -6,6 +6,7 @@ obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctr
+ obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctrl-bcm63xx.o
  obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctrl-bcm6328.o
  obj-$(CONFIG_PINCTRL_BCM6358)		+= pinctrl-bcm6358.o
 +obj-$(CONFIG_PINCTRL_BCM6362)		+= pinctrl-bcm6362.o
@@ -52,7 +52,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm6362.c
-@@ -0,0 +1,794 @@
+@@ -0,0 +1,617 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM6362 GPIO unit (pinctrl + GPIO)
@@ -61,33 +61,22 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME		"bcm6362-pinctrl"
++#include "pinctrl-bcm63xx.h"
++
++#define BCM6362_BANK_GPIOS	32
 +#define BCM6362_NUM_GPIOS	48
 +#define BCM6362_NUM_LEDS	24
 +
-+#define BANK_SIZE		sizeof(uint32_t)
-+#define PINS_PER_BANK		(BANK_SIZE * BITS_PER_BYTE)
-+
-+#define BCM6362_DIROUT_REG	0x04
-+#define BCM6362_DATA_REG	0x0c
 +#define BCM6362_LED_REG		0x10
 +#define BCM6362_MODE_REG	0x18
 +#define BCM6362_CTRL_REG	0x1c
@@ -116,16 +105,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	uint32_t basemode_mask;
 +};
 +
-+struct bcm6362_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
-+};
-+
 +#define BCM6362_PIN(a, b, mask)			\
 +	{					\
 +		.number = a,			\
@@ -526,108 +505,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	BCM6362_BASEMODE_FUN(nand, BASEMODE_NAND),
 +};
 +
-+static inline unsigned int bcm6362_bank_pin(unsigned int pin)
-+{
-+	return pin % PINS_PER_BANK;
-+}
-+
-+static inline unsigned int bcm6362_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm6362_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm6362_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6362_reg_off(BCM6362_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6362_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm6362_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm6362_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6362_reg_off(BCM6362_DATA_REG, pin);
-+	unsigned int dirout = bcm6362_reg_off(BCM6362_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6362_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm6362_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6362_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6362_reg_off(BCM6362_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6362_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm6362_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6362_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6362_reg_off(BCM6362_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6362_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm6362_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm6362_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6362_reg_off(BCM6362_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6362_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm6362_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
-+}
-+
 +static int bcm6362_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
 +{
 +	return ARRAY_SIZE(bcm6362_groups);
@@ -671,16 +548,16 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	return 0;
 +}
 +
-+static void bcm6362_set_gpio(struct bcm6362_pinctrl *pc, unsigned pin)
++static void bcm6362_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
 +{
 +	const struct pinctrl_pin_desc *desc = &bcm6362_pins[pin];
-+	unsigned int mask = bcm6362_bank_pin(pin);
++	unsigned int mask = bcm63xx_bank_pin(pin);
 +
 +	if (desc->drv_data)
 +		regmap_update_bits(pc->regs, BCM6362_BASEMODE_REG,
 +				   (uint32_t) desc->drv_data, 0);
 +
-+	if (pin < PINS_PER_BANK) {
++	if (pin < BCM63XX_BANK_GPIOS) {
 +		/* base mode 0 => gpio 1 => mux function */
 +		regmap_update_bits(pc->regs, BCM6362_MODE_REG, mask, 0);
 +
@@ -696,7 +573,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +static int bcm6362_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				   unsigned selector, unsigned group)
 +{
-+	struct bcm6362_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +	const struct bcm6362_pingroup *pg = &bcm6362_groups[group];
 +	const struct bcm6362_function *f = &bcm6362_funcs[selector];
 +	unsigned i;
@@ -741,7 +618,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +				       struct pinctrl_gpio_range *range,
 +				       unsigned offset)
 +{
-+	struct bcm6362_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +
 +	/* disable all functions using this pin */
 +	bcm6362_set_gpio(pc, offset);
@@ -750,98 +627,44 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +}
 +
 +static struct pinctrl_ops bcm6362_pctl_ops = {
-+	.get_groups_count = bcm6362_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm6362_pinctrl_get_group_name,
 +	.get_group_pins = bcm6362_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm6362_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm6362_pmx_ops = {
-+	.get_functions_count = bcm6362_pinctrl_get_func_count,
-+	.get_function_name = bcm6362_pinctrl_get_func_name,
 +	.get_function_groups = bcm6362_pinctrl_get_groups,
-+	.set_mux = bcm6362_pinctrl_set_mux,
++	.get_function_name = bcm6362_pinctrl_get_func_name,
++	.get_functions_count = bcm6362_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm6362_gpio_request_enable,
++	.set_mux = bcm6362_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm6362_soc = {
++	.ngpios = BCM6362_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm6362_pins),
++	.pctl_ops = &bcm6362_pctl_ops,
++	.pins = bcm6362_pins,
++	.pmx_ops = &bcm6362_pmx_ops,
++};
++
 +static int bcm6362_pinctrl_probe(struct platform_device *pdev)
 +{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm6362_pinctrl *pc;
-+	int err;
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm6362_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm6362_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm6362_gpio_get_direction;
-+	pc->gpio_chip.get = bcm6362_gpio_get;
-+	pc->gpio_chip.set = bcm6362_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM6362_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm6362_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
-+		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm6362_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm6362_pins),
-+	pc->pctl_desc.pctlops = &bcm6362_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm6362_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
-+
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM6362_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	dev_info(dev, "registered\n");
-+
-+	return 0;
++	return bcm63xx_pinctrl_probe(pdev, &bcm6362_soc, NULL);
 +}
 +
 +static const struct of_device_id bcm6362_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm6362-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm6362_pinctrl_driver = {
 +	.probe = bcm6362_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm6362-pinctrl",
 +		.of_match_table = bcm6362_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/065-v5.13-dt-bindings-add-BCM6368-pincontroller-binding-docume.patch b/target/linux/bmips/patches-5.10/065-v5.13-dt-bindings-add-BCM6368-pincontroller-binding-docume.patch
new file mode 100644
index 0000000000..e4e91e597f
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/065-v5.13-dt-bindings-add-BCM6368-pincontroller-binding-docume.patch
@@ -0,0 +1,242 @@
+From 9fbf8303796c89ecab026eb3dbadae7f98c49922 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:15 +0100
+Subject: [PATCH 14/22] dt-bindings: add BCM6368 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in BCM6368 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-15-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm6368-pinctrl.yaml         | 217 ++++++++++++++++++
+ 1 file changed, 217 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml
+@@ -0,0 +1,217 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6368-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6368 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM6368 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm6368-pinctrl
++
++  reg:
++    maxItems: 2
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ analog_afe_0, analog_afe_1, sys_irq, serial_led_data,
++                serial_led_clk, inet_led, ephy0_led, ephy1_led, ephy2_led,
++                ephy3_led, robosw_led_data, robosw_led_clk, robosw_led0,
++                robosw_led1, usb_device_led, pci_req1, pci_gnt1, pci_intb,
++                pci_req0, pci_gnt0, pcmcia_cd1, pcmcia_cd2, pcmcia_vs1,
++                pcmcia_vs2, ebi_cs2, ebi_cs3, spi_cs2, spi_cs3, spi_cs4,
++                spi_cs5, uart1 ]
++
++      pins:
++        enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
++                gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio14,
++                gpio16, gpio17, gpio18, gpio19, gpio20, gpio22, gpio23,
++                gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,
++                gpio31, uart1_grp ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@18 {
++      compatible = "brcm,bcm6368-pinctrl";
++      reg = <0x18 0x4>, <0x38 0x4>;
++
++      pinctrl_analog_afe_0: analog_afe_0-pins {
++        function = "analog_afe_0";
++        pins = "gpio0";
++      };
++
++      pinctrl_analog_afe_1: analog_afe_1-pins {
++        function = "analog_afe_1";
++        pins = "gpio1";
++      };
++
++      pinctrl_sys_irq: sys_irq-pins {
++        function = "sys_irq";
++        pins = "gpio2";
++      };
++
++      pinctrl_serial_led: serial_led-pins {
++        pinctrl_serial_led_data: serial_led_data-pins {
++          function = "serial_led_data";
++          pins = "gpio3";
++        };
++
++        pinctrl_serial_led_clk: serial_led_clk-pins {
++          function = "serial_led_clk";
++          pins = "gpio4";
++        };
++      };
++
++      pinctrl_inet_led: inet_led-pins {
++        function = "inet_led";
++        pins = "gpio5";
++      };
++
++      pinctrl_ephy0_led: ephy0_led-pins {
++        function = "ephy0_led";
++        pins = "gpio6";
++      };
++
++      pinctrl_ephy1_led: ephy1_led-pins {
++        function = "ephy1_led";
++        pins = "gpio7";
++      };
++
++      pinctrl_ephy2_led: ephy2_led-pins {
++        function = "ephy2_led";
++        pins = "gpio8";
++      };
++
++      pinctrl_ephy3_led: ephy3_led-pins {
++        function = "ephy3_led";
++        pins = "gpio9";
++      };
++
++      pinctrl_robosw_led_data: robosw_led_data-pins {
++        function = "robosw_led_data";
++        pins = "gpio10";
++      };
++
++      pinctrl_robosw_led_clk: robosw_led_clk-pins {
++        function = "robosw_led_clk";
++        pins = "gpio11";
++      };
++
++      pinctrl_robosw_led0: robosw_led0-pins {
++        function = "robosw_led0";
++        pins = "gpio12";
++      };
++
++      pinctrl_robosw_led1: robosw_led1-pins {
++        function = "robosw_led1";
++        pins = "gpio13";
++      };
++
++      pinctrl_usb_device_led: usb_device_led-pins {
++        function = "usb_device_led";
++        pins = "gpio14";
++      };
++
++      pinctrl_pci: pci-pins {
++        pinctrl_pci_req1: pci_req1-pins {
++          function = "pci_req1";
++          pins = "gpio16";
++        };
++
++        pinctrl_pci_gnt1: pci_gnt1-pins {
++          function = "pci_gnt1";
++          pins = "gpio17";
++        };
++
++        pinctrl_pci_intb: pci_intb-pins {
++          function = "pci_intb";
++          pins = "gpio18";
++        };
++
++        pinctrl_pci_req0: pci_req0-pins {
++          function = "pci_req0";
++          pins = "gpio19";
++        };
++
++        pinctrl_pci_gnt0: pci_gnt0-pins {
++          function = "pci_gnt0";
++          pins = "gpio20";
++        };
++      };
++
++      pinctrl_pcmcia: pcmcia-pins {
++        pinctrl_pcmcia_cd1: pcmcia_cd1-pins {
++          function = "pcmcia_cd1";
++          pins = "gpio22";
++        };
++
++        pinctrl_pcmcia_cd2: pcmcia_cd2-pins {
++          function = "pcmcia_cd2";
++          pins = "gpio23";
++        };
++
++        pinctrl_pcmcia_vs1: pcmcia_vs1-pins {
++          function = "pcmcia_vs1";
++          pins = "gpio24";
++        };
++
++        pinctrl_pcmcia_vs2: pcmcia_vs2-pins {
++          function = "pcmcia_vs2";
++          pins = "gpio25";
++        };
++      };
++
++      pinctrl_ebi_cs2: ebi_cs2-pins {
++        function = "ebi_cs2";
++        pins = "gpio26";
++      };
++
++      pinctrl_ebi_cs3: ebi_cs3-pins {
++        function = "ebi_cs3";
++        pins = "gpio27";
++      };
++
++      pinctrl_spi_cs2: spi_cs2-pins {
++        function = "spi_cs2";
++        pins = "gpio28";
++      };
++
++      pinctrl_spi_cs3: spi_cs3-pins {
++        function = "spi_cs3";
++        pins = "gpio29";
++      };
++
++      pinctrl_spi_cs4: spi_cs4-pins {
++        function = "spi_cs4";
++        pins = "gpio30";
++      };
++
++      pinctrl_spi_cs5: spi_cs5-pins {
++        function = "spi_cs5";
++        pins = "gpio31";
++      };
++
++      pinctrl_uart1: uart1-pins {
++        function = "uart1";
++        group = "uart1_grp";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/066-v5.13-dt-bindings-add-BCM6368-GPIO-sysctl-binding-document.patch b/target/linux/bmips/patches-5.10/066-v5.13-dt-bindings-add-BCM6368-GPIO-sysctl-binding-document.patch
new file mode 100644
index 0000000000..d36cff6564
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/066-v5.13-dt-bindings-add-BCM6368-GPIO-sysctl-binding-document.patch
@@ -0,0 +1,269 @@
+From fd22635f222f44dcb4dd6382d97de13144edad2b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:16 +0100
+Subject: [PATCH 15/22] dt-bindings: add BCM6368 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM6368 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-16-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm6368-gpio-sysctl.yaml         | 246 ++++++++++++++++++
+ 1 file changed, 246 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm6368-gpio-sysctl.yaml
+@@ -0,0 +1,246 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm6368-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6368 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM6368 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm6368-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm6368-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@10000080 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm6368-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0x10000080 0x80>;
++      ranges = <0 0x10000080 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm6368-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 38>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@18 {
++        compatible = "brcm,bcm6368-pinctrl";
++        reg = <0x18 0x4>, <0x38 0x4>;
++
++        pinctrl_analog_afe_0: analog_afe_0-pins {
++          function = "analog_afe_0";
++          pins = "gpio0";
++        };
++
++        pinctrl_analog_afe_1: analog_afe_1-pins {
++          function = "analog_afe_1";
++          pins = "gpio1";
++        };
++
++        pinctrl_sys_irq: sys_irq-pins {
++          function = "sys_irq";
++          pins = "gpio2";
++        };
++
++        pinctrl_serial_led: serial_led-pins {
++          pinctrl_serial_led_data: serial_led_data-pins {
++            function = "serial_led_data";
++            pins = "gpio3";
++          };
++
++          pinctrl_serial_led_clk: serial_led_clk-pins {
++            function = "serial_led_clk";
++            pins = "gpio4";
++          };
++        };
++
++        pinctrl_inet_led: inet_led-pins {
++          function = "inet_led";
++          pins = "gpio5";
++        };
++
++        pinctrl_ephy0_led: ephy0_led-pins {
++          function = "ephy0_led";
++          pins = "gpio6";
++        };
++
++        pinctrl_ephy1_led: ephy1_led-pins {
++          function = "ephy1_led";
++          pins = "gpio7";
++        };
++
++        pinctrl_ephy2_led: ephy2_led-pins {
++          function = "ephy2_led";
++          pins = "gpio8";
++        };
++
++        pinctrl_ephy3_led: ephy3_led-pins {
++          function = "ephy3_led";
++          pins = "gpio9";
++        };
++
++        pinctrl_robosw_led_data: robosw_led_data-pins {
++          function = "robosw_led_data";
++          pins = "gpio10";
++        };
++
++        pinctrl_robosw_led_clk: robosw_led_clk-pins {
++          function = "robosw_led_clk";
++          pins = "gpio11";
++        };
++
++        pinctrl_robosw_led0: robosw_led0-pins {
++          function = "robosw_led0";
++          pins = "gpio12";
++        };
++
++        pinctrl_robosw_led1: robosw_led1-pins {
++          function = "robosw_led1";
++          pins = "gpio13";
++        };
++
++        pinctrl_usb_device_led: usb_device_led-pins {
++          function = "usb_device_led";
++          pins = "gpio14";
++        };
++
++        pinctrl_pci: pci-pins {
++          pinctrl_pci_req1: pci_req1-pins {
++            function = "pci_req1";
++            pins = "gpio16";
++          };
++
++          pinctrl_pci_gnt1: pci_gnt1-pins {
++            function = "pci_gnt1";
++            pins = "gpio17";
++          };
++
++          pinctrl_pci_intb: pci_intb-pins {
++            function = "pci_intb";
++            pins = "gpio18";
++          };
++
++          pinctrl_pci_req0: pci_req0-pins {
++            function = "pci_req0";
++            pins = "gpio19";
++          };
++
++          pinctrl_pci_gnt0: pci_gnt0-pins {
++            function = "pci_gnt0";
++            pins = "gpio20";
++          };
++        };
++
++        pinctrl_pcmcia: pcmcia-pins {
++          pinctrl_pcmcia_cd1: pcmcia_cd1-pins {
++            function = "pcmcia_cd1";
++            pins = "gpio22";
++          };
++
++          pinctrl_pcmcia_cd2: pcmcia_cd2-pins {
++            function = "pcmcia_cd2";
++            pins = "gpio23";
++          };
++
++          pinctrl_pcmcia_vs1: pcmcia_vs1-pins {
++            function = "pcmcia_vs1";
++            pins = "gpio24";
++          };
++
++          pinctrl_pcmcia_vs2: pcmcia_vs2-pins {
++            function = "pcmcia_vs2";
++            pins = "gpio25";
++          };
++        };
++
++        pinctrl_ebi_cs2: ebi_cs2-pins {
++          function = "ebi_cs2";
++          pins = "gpio26";
++        };
++
++        pinctrl_ebi_cs3: ebi_cs3-pins {
++          function = "ebi_cs3";
++          pins = "gpio27";
++        };
++
++        pinctrl_spi_cs2: spi_cs2-pins {
++          function = "spi_cs2";
++          pins = "gpio28";
++        };
++
++        pinctrl_spi_cs3: spi_cs3-pins {
++          function = "spi_cs3";
++          pins = "gpio29";
++        };
++
++        pinctrl_spi_cs4: spi_cs4-pins {
++          function = "spi_cs4";
++          pins = "gpio30";
++        };
++
++        pinctrl_spi_cs5: spi_cs5-pins {
++          function = "spi_cs5";
++          pins = "gpio31";
++        };
++
++        pinctrl_uart1: uart1-pins {
++          function = "uart1";
++          group = "uart1_grp";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/407-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/bmips/patches-5.10/067-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch
index 5a5dac3487..3965762407 100644
--- a/target/linux/bmips/patches-5.10/407-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch
+++ b/target/linux/bmips/patches-5.10/067-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch
@@ -1,7 +1,7 @@
-From a212dcb2f04ae42f35ec11122a2532b1bcf8a94f Mon Sep 17 00:00:00 2001
+From 50554accf7a79980cd04481e8903073bdb706daf Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:18:25 +0200
-Subject: [PATCH 08/12] pinctrl: add a pincontrol driver for BCM6368
+Date: Wed, 24 Mar 2021 09:19:17 +0100
+Subject: [PATCH 16/22] pinctrl: add a pincontrol driver for BCM6368
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -9,28 +9,28 @@ Content-Transfer-Encoding: 8bit
 Add a pincontrol driver for BCM6368. BCM6368 allows muxing the first 32
 GPIOs onto alternative functions. Not all are documented.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-17-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig           |  11 +
+ drivers/pinctrl/bcm/Kconfig           |   8 +
  drivers/pinctrl/bcm/Makefile          |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm6368.c | 679 ++++++++++++++++++++++++++
- 3 files changed, 691 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm6368.c | 523 ++++++++++++++++++++++++++
+ 3 files changed, 532 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6368.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -62,6 +62,17 @@ config PINCTRL_BCM6362
+@@ -60,6 +60,14 @@ config PINCTRL_BCM6362
  	help
  	   Say Y here to enable the Broadcom BCM6362 GPIO driver.
  
 +config PINCTRL_BCM6368
 +	bool "Broadcom BCM6368 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM6368 GPIO driver.
@@ -40,7 +40,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctr
+@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctr
  obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctrl-bcm6328.o
  obj-$(CONFIG_PINCTRL_BCM6358)		+= pinctrl-bcm6358.o
  obj-$(CONFIG_PINCTRL_BCM6362)		+= pinctrl-bcm6362.o
@@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm6368.c
-@@ -0,0 +1,679 @@
+@@ -0,0 +1,523 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM6368 GPIO unit (pinctrl + GPIO)
@@ -59,32 +59,20 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME		"bcm6368-pinctrl"
-+#define BCM6368_NUM_GPIOS	38
++#include "pinctrl-bcm63xx.h"
 +
-+#define BANK_SIZE		sizeof(uint32_t)
-+#define PINS_PER_BANK		(BANK_SIZE * BITS_PER_BYTE)
++#define BCM6368_NUM_GPIOS	38
 +
-+#define BCM6368_DIROUT_REG	0x04
-+#define BCM6368_DATA_REG	0x0c
 +#define BCM6368_MODE_REG	0x18
 +#define BCM6368_BASEMODE_REG	0x38
 +#define  BCM6368_BASEMODE_MASK	0x7
@@ -106,15 +94,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	unsigned basemode:3;
 +};
 +
-+struct bcm6368_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
++struct bcm6368_priv {
 +	struct regmap_field *overlays;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
 +};
 +
 +#define BCM6368_BASEMODE_PIN(a, b)		\
@@ -417,108 +398,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	BCM6368_BASEMODE_FUN(uart1, UART1, 0x6),
 +};
 +
-+static inline unsigned int bcm6368_bank_pin(unsigned int pin)
-+{
-+	return pin % PINS_PER_BANK;
-+}
-+
-+static inline unsigned int bcm6368_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm6368_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm6368_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6368_reg_off(BCM6368_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6368_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm6368_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm6368_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6368_reg_off(BCM6368_DATA_REG, pin);
-+	unsigned int dirout = bcm6368_reg_off(BCM6368_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6368_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm6368_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6368_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6368_reg_off(BCM6368_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6368_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm6368_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6368_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6368_reg_off(BCM6368_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6368_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm6368_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm6368_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6368_reg_off(BCM6368_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6368_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm6368_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
-+}
-+
 +static int bcm6368_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
 +{
 +	return ARRAY_SIZE(bcm6368_groups);
@@ -565,7 +444,8 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +static int bcm6368_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				   unsigned selector, unsigned group)
 +{
-+	struct bcm6368_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm6368_priv *priv = pc->driver_data;
 +	const struct bcm6368_pingroup *pg = &bcm6368_groups[group];
 +	const struct bcm6368_function *fun = &bcm6368_funcs[selector];
 +	int i, pin;
@@ -575,17 +455,17 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +
 +		for (i = 0; i < pg->num_pins; i++) {
 +			pin = pg->pins[i];
-+			if (pin < PINS_PER_BANK)
++			if (pin < BCM63XX_BANK_GPIOS)
 +				mask |= BIT(pin);
 +		}
 +
 +		regmap_update_bits(pc->regs, BCM6368_MODE_REG, mask, 0);
-+		regmap_field_write(pc->overlays, fun->basemode);
++		regmap_field_write(priv->overlays, fun->basemode);
 +	} else {
 +		pin = pg->pins[0];
 +
 +		if (bcm6368_pins[pin].drv_data)
-+			regmap_field_write(pc->overlays,
++			regmap_field_write(priv->overlays,
 +					   BCM6368_BASEMODE_GPIO);
 +
 +		regmap_update_bits(pc->regs, BCM6368_MODE_REG, BIT(pin),
@@ -593,13 +473,18 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	}
 +
 +	for (pin = 0; pin < pg->num_pins; pin++) {
++		struct pinctrl_gpio_range *range;
 +		int hw_gpio = bcm6368_pins[pin].number;
-+		struct gpio_chip *gc = &pc->gpio_chip;
 +
-+		if (fun->dir_out & BIT(pin))
-+			gc->direction_output(gc, hw_gpio, 0);
-+		else
-+			gc->direction_input(gc, hw_gpio);
++		range = pinctrl_find_gpio_range_from_pin(pctldev, hw_gpio);
++		if (range) {
++			struct gpio_chip *gc = range->gc;
++
++			if (fun->dir_out & BIT(pin))
++				gc->direction_output(gc, hw_gpio, 0);
++			else
++				gc->direction_input(gc, hw_gpio);
++		}
 +	}
 +
 +	return 0;
@@ -609,122 +494,81 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +				       struct pinctrl_gpio_range *range,
 +				       unsigned offset)
 +{
-+	struct bcm6368_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm6368_priv *priv = pc->driver_data;
 +
-+	if (offset >= PINS_PER_BANK && !bcm6368_pins[offset].drv_data)
++	if (offset >= BCM63XX_BANK_GPIOS && !bcm6368_pins[offset].drv_data)
 +		return 0;
 +
 +	/* disable all functions using this pin */
-+	if (offset < PINS_PER_BANK)
++	if (offset < BCM63XX_BANK_GPIOS)
 +		regmap_update_bits(pc->regs, BCM6368_MODE_REG, BIT(offset), 0);
 +
 +	if (bcm6368_pins[offset].drv_data)
-+		regmap_field_write(pc->overlays, BCM6368_BASEMODE_GPIO);
++		regmap_field_write(priv->overlays, BCM6368_BASEMODE_GPIO);
 +
 +	return 0;
 +}
 +
 +static struct pinctrl_ops bcm6368_pctl_ops = {
-+	.get_groups_count = bcm6368_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm6368_pinctrl_get_group_name,
 +	.get_group_pins = bcm6368_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm6368_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm6368_pmx_ops = {
-+	.get_functions_count = bcm6368_pinctrl_get_func_count,
-+	.get_function_name = bcm6368_pinctrl_get_func_name,
 +	.get_function_groups = bcm6368_pinctrl_get_groups,
-+	.set_mux = bcm6368_pinctrl_set_mux,
++	.get_function_name = bcm6368_pinctrl_get_func_name,
++	.get_functions_count = bcm6368_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm6368_gpio_request_enable,
++	.set_mux = bcm6368_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm6368_soc = {
++	.ngpios = BCM6368_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm6368_pins),
++	.pctl_ops = &bcm6368_pctl_ops,
++	.pins = bcm6368_pins,
++	.pmx_ops = &bcm6368_pmx_ops,
++};
++
 +static int bcm6368_pinctrl_probe(struct platform_device *pdev)
 +{
 +	struct reg_field overlays = REG_FIELD(BCM6368_BASEMODE_REG, 0, 15);
 +	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm6368_pinctrl *pc;
++	struct bcm63xx_pinctrl *pc;
++	struct bcm6368_priv *priv;
 +	int err;
 +
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
++	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
++	if (!priv)
 +		return -ENOMEM;
 +
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->overlays = devm_regmap_field_alloc(&pdev->dev, pc->regs, overlays);
-+	if (IS_ERR(pc->overlays))
-+		return PTR_ERR(pc->overlays);
-+
-+	/* disable all muxes by default */
-+	regmap_field_write(pc->overlays, 0);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm6368_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm6368_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm6368_gpio_get_direction;
-+	pc->gpio_chip.get = bcm6368_gpio_get;
-+	pc->gpio_chip.set = bcm6368_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM6368_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm6368_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
++	err = bcm63xx_pinctrl_probe(pdev, &bcm6368_soc, (void *) priv);
++	if (err)
 +		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm6368_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm6368_pins),
-+	pc->pctl_desc.pctlops = &bcm6368_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm6368_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
 +
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM6368_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
++	pc = platform_get_drvdata(pdev);
 +
-+	dev_info(dev, "registered\n");
++	priv->overlays = devm_regmap_field_alloc(dev, pc->regs, overlays);
++	if (IS_ERR(priv->overlays))
++		return PTR_ERR(priv->overlays);
 +
 +	return 0;
 +}
 +
 +static const struct of_device_id bcm6368_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm6368-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm6368_pinctrl_driver = {
 +	.probe = bcm6368_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm6368-pinctrl",
 +		.of_match_table = bcm6368_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/068-v5.13-dt-bindings-add-BCM63268-pincontroller-binding-docum.patch b/target/linux/bmips/patches-5.10/068-v5.13-dt-bindings-add-BCM63268-pincontroller-binding-docum.patch
new file mode 100644
index 0000000000..bffc1ab02f
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/068-v5.13-dt-bindings-add-BCM63268-pincontroller-binding-docum.patch
@@ -0,0 +1,190 @@
+From 9b3303413379af8bed307cd465fe7aa1bc3569ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:18 +0100
+Subject: [PATCH 17/22] dt-bindings: add BCM63268 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in the BCM63268
+family SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-18-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm63268-pinctrl.yaml        | 164 ++++++++++++++++++
+ 1 file changed, 164 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml
+@@ -0,0 +1,164 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm63268-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM63268 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM63268 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm63268-pinctrl
++
++  reg:
++    maxItems: 3
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ serial_led_clk, serial_led_data, hsspi_cs4, hsspi_cs5,
++                hsspi_cs6, hsspi_cs7, adsl_spi_miso, adsl_spi_mosi,
++                vreq_clk, pcie_clkreq_b, robosw_led_clk, robosw_led_data,
++                nand, gpio35_alt, dectpd, vdsl_phy_override_0,
++                vdsl_phy_override_1, vdsl_phy_override_2,
++                vdsl_phy_override_3, dsl_gpio8, dsl_gpio9 ]
++
++      pins:
++        enum: [ gpio0, gpio1, gpio16, gpio17, gpio8, gpio9, gpio18, gpio19,
++                gpio22, gpio23, gpio30, gpio31, nand_grp, gpio35
++                dectpd_grp, vdsl_phy_override_0_grp,
++                vdsl_phy_override_1_grp, vdsl_phy_override_2_grp,
++                vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@10 {
++      compatible = "brcm,bcm63268-pinctrl";
++      reg = <0x10 0x4>, <0x18 0x8>, <0x38 0x4>;
++
++      pinctrl_serial_led: serial_led-pins {
++        pinctrl_serial_led_clk: serial_led_clk-pins {
++          function = "serial_led_clk";
++          pins = "gpio0";
++        };
++
++        pinctrl_serial_led_data: serial_led_data-pins {
++          function = "serial_led_data";
++          pins = "gpio1";
++        };
++      };
++
++      pinctrl_hsspi_cs4: hsspi_cs4-pins {
++        function = "hsspi_cs4";
++        pins = "gpio16";
++      };
++
++      pinctrl_hsspi_cs5: hsspi_cs5-pins {
++        function = "hsspi_cs5";
++        pins = "gpio17";
++      };
++
++      pinctrl_hsspi_cs6: hsspi_cs6-pins {
++        function = "hsspi_cs6";
++        pins = "gpio8";
++      };
++
++      pinctrl_hsspi_cs7: hsspi_cs7-pins {
++        function = "hsspi_cs7";
++        pins = "gpio9";
++      };
++
++      pinctrl_adsl_spi: adsl_spi-pins {
++        pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
++          function = "adsl_spi_miso";
++          pins = "gpio18";
++        };
++
++        pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
++          function = "adsl_spi_mosi";
++          pins = "gpio19";
++        };
++      };
++
++      pinctrl_vreq_clk: vreq_clk-pins {
++        function = "vreq_clk";
++        pins = "gpio22";
++      };
++
++      pinctrl_pcie_clkreq_b: pcie_clkreq_b-pins {
++        function = "pcie_clkreq_b";
++        pins = "gpio23";
++      };
++
++      pinctrl_robosw_led_clk: robosw_led_clk-pins {
++        function = "robosw_led_clk";
++        pins = "gpio30";
++      };
++
++      pinctrl_robosw_led_data: robosw_led_data-pins {
++        function = "robosw_led_data";
++        pins = "gpio31";
++      };
++
++      pinctrl_nand: nand-pins {
++        function = "nand";
++        group = "nand_grp";
++      };
++
++      pinctrl_gpio35_alt: gpio35_alt-pins {
++        function = "gpio35_alt";
++        pin = "gpio35";
++      };
++
++      pinctrl_dectpd: dectpd-pins {
++        function = "dectpd";
++        group = "dectpd_grp";
++      };
++
++      pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
++        function = "vdsl_phy_override_0";
++        group = "vdsl_phy_override_0_grp";
++      };
++
++      pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
++        function = "vdsl_phy_override_1";
++        group = "vdsl_phy_override_1_grp";
++      };
++
++      pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
++        function = "vdsl_phy_override_2";
++        group = "vdsl_phy_override_2_grp";
++      };
++
++      pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
++        function = "vdsl_phy_override_3";
++        group = "vdsl_phy_override_3_grp";
++      };
++
++      pinctrl_dsl_gpio8: dsl_gpio8-pins {
++        function = "dsl_gpio8";
++        group = "dsl_gpio8";
++      };
++
++      pinctrl_dsl_gpio9: dsl_gpio9-pins {
++        function = "dsl_gpio9";
++        group = "dsl_gpio9";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/069-v5.13-dt-bindings-add-BCM63268-GPIO-sysctl-binding-documen.patch b/target/linux/bmips/patches-5.10/069-v5.13-dt-bindings-add-BCM63268-GPIO-sysctl-binding-documen.patch
new file mode 100644
index 0000000000..a130d60d42
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/069-v5.13-dt-bindings-add-BCM63268-GPIO-sysctl-binding-documen.patch
@@ -0,0 +1,217 @@
+From ff8324355d7ae2e4ebbd304de27bb5fa75e20c6a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:19 +0100
+Subject: [PATCH 18/22] dt-bindings: add BCM63268 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM63268 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-19-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm63268-gpio-sysctl.yaml        | 194 ++++++++++++++++++
+ 1 file changed, 194 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm63268-gpio-sysctl.yaml
+@@ -0,0 +1,194 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm63268-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM63268 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM63268 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm63268-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm63268-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@100000c0 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm63268-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0x100000c0 0x80>;
++      ranges = <0 0x100000c0 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm63268-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 52>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@10 {
++        compatible = "brcm,bcm63268-pinctrl";
++        reg = <0x10 0x4>, <0x18 0x8>, <0x38 0x4>;
++
++        pinctrl_serial_led: serial_led-pins {
++          pinctrl_serial_led_clk: serial_led_clk-pins {
++            function = "serial_led_clk";
++            pins = "gpio0";
++          };
++
++          pinctrl_serial_led_data: serial_led_data-pins {
++            function = "serial_led_data";
++            pins = "gpio1";
++          };
++        };
++
++        pinctrl_hsspi_cs4: hsspi_cs4-pins {
++          function = "hsspi_cs4";
++          pins = "gpio16";
++        };
++
++        pinctrl_hsspi_cs5: hsspi_cs5-pins {
++          function = "hsspi_cs5";
++          pins = "gpio17";
++        };
++
++        pinctrl_hsspi_cs6: hsspi_cs6-pins {
++          function = "hsspi_cs6";
++          pins = "gpio8";
++        };
++
++        pinctrl_hsspi_cs7: hsspi_cs7-pins {
++          function = "hsspi_cs7";
++          pins = "gpio9";
++        };
++
++        pinctrl_adsl_spi: adsl_spi-pins {
++          pinctrl_adsl_spi_miso: adsl_spi_miso-pins {
++            function = "adsl_spi_miso";
++            pins = "gpio18";
++          };
++
++          pinctrl_adsl_spi_mosi: adsl_spi_mosi-pins {
++            function = "adsl_spi_mosi";
++            pins = "gpio19";
++          };
++        };
++
++        pinctrl_vreq_clk: vreq_clk-pins {
++          function = "vreq_clk";
++          pins = "gpio22";
++        };
++
++        pinctrl_pcie_clkreq_b: pcie_clkreq_b-pins {
++          function = "pcie_clkreq_b";
++          pins = "gpio23";
++        };
++
++        pinctrl_robosw_led_clk: robosw_led_clk-pins {
++          function = "robosw_led_clk";
++          pins = "gpio30";
++        };
++
++        pinctrl_robosw_led_data: robosw_led_data-pins {
++          function = "robosw_led_data";
++          pins = "gpio31";
++        };
++
++        pinctrl_nand: nand-pins {
++          function = "nand";
++          group = "nand_grp";
++        };
++
++        pinctrl_gpio35_alt: gpio35_alt-pins {
++          function = "gpio35_alt";
++          pin = "gpio35";
++        };
++
++        pinctrl_dectpd: dectpd-pins {
++          function = "dectpd";
++          group = "dectpd_grp";
++        };
++
++        pinctrl_vdsl_phy_override_0: vdsl_phy_override_0-pins {
++          function = "vdsl_phy_override_0";
++          group = "vdsl_phy_override_0_grp";
++        };
++
++        pinctrl_vdsl_phy_override_1: vdsl_phy_override_1-pins {
++          function = "vdsl_phy_override_1";
++          group = "vdsl_phy_override_1_grp";
++        };
++
++        pinctrl_vdsl_phy_override_2: vdsl_phy_override_2-pins {
++          function = "vdsl_phy_override_2";
++          group = "vdsl_phy_override_2_grp";
++        };
++
++        pinctrl_vdsl_phy_override_3: vdsl_phy_override_3-pins {
++          function = "vdsl_phy_override_3";
++          group = "vdsl_phy_override_3_grp";
++        };
++
++        pinctrl_dsl_gpio8: dsl_gpio8-pins {
++          function = "dsl_gpio8";
++          group = "dsl_gpio8";
++        };
++
++        pinctrl_dsl_gpio9: dsl_gpio9-pins {
++          function = "dsl_gpio9";
++          group = "dsl_gpio9";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/409-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch b/target/linux/bmips/patches-5.10/070-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch
index 8acc5dbfbb..933af5fb51 100644
--- a/target/linux/bmips/patches-5.10/409-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch
+++ b/target/linux/bmips/patches-5.10/070-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch
@@ -1,7 +1,7 @@
-From 8ec959299a6e4bbdc65d62180aa952ae04cdcf07 Mon Sep 17 00:00:00 2001
+From 155cca1b0794a8f541e7eaa45be70df0a49964f3 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:19:12 +0200
-Subject: [PATCH 10/12] pinctrl: add a pincontrol driver for BCM63268
+Date: Wed, 24 Mar 2021 09:19:20 +0100
+Subject: [PATCH 19/22] pinctrl: add a pincontrol driver for BCM63268
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,28 +10,28 @@ Add a pincontrol driver for BCM63268. BCM63268 allows muxing GPIOs
 to different functions. Depending on the mux, these are either single
 pin configurations or whole pin groups.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-20-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig            |  11 +
+ drivers/pinctrl/bcm/Kconfig            |   8 +
  drivers/pinctrl/bcm/Makefile           |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm63268.c | 821 +++++++++++++++++++++++++
- 3 files changed, 833 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm63268.c | 643 +++++++++++++++++++++++++
+ 3 files changed, 652 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm63268.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -73,6 +73,17 @@ config PINCTRL_BCM6368
+@@ -68,6 +68,14 @@ config PINCTRL_BCM6368
  	help
  	   Say Y here to enable the Broadcom BCM6368 GPIO driver.
  
 +config PINCTRL_BCM63268
 +	bool "Broadcom BCM63268 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM63268 GPIO driver.
@@ -41,7 +41,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	depends on OF_GPIO && (ARCH_BCM_IPROC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -7,6 +7,7 @@ obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctr
+@@ -8,6 +8,7 @@ obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctr
  obj-$(CONFIG_PINCTRL_BCM6358)		+= pinctrl-bcm6358.o
  obj-$(CONFIG_PINCTRL_BCM6362)		+= pinctrl-bcm6362.o
  obj-$(CONFIG_PINCTRL_BCM6368)		+= pinctrl-bcm6368.o
@@ -51,7 +51,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  obj-$(CONFIG_PINCTRL_NS)		+= pinctrl-ns.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm63268.c
-@@ -0,0 +1,821 @@
+@@ -0,0 +1,643 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM63268 GPIO unit (pinctrl + GPIO)
@@ -60,33 +60,21 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME			"bcm63268-pinctrl"
++#include "pinctrl-bcm63xx.h"
++
 +#define BCM63268_NUM_GPIOS		52
 +#define BCM63268_NUM_LEDS		24
 +
-+#define BANK_SIZE			sizeof(uint32_t)
-+#define PINS_PER_BANK			(BANK_SIZE * BITS_PER_BYTE)
-+
-+#define BCM63268_DIROUT_REG		0x04
-+#define BCM63268_DATA_REG		0x0c
 +#define BCM63268_LED_REG		0x10
 +#define BCM63268_MODE_REG		0x18
 +#define BCM63268_CTRL_REG		0x1c
@@ -121,16 +109,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	uint32_t mask;
 +};
 +
-+struct bcm63268_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
-+};
-+
 +#define BCM63268_PIN(a, b, basemode)			\
 +	{						\
 +		.number = a,				\
@@ -549,108 +527,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +			      BCM63268_BASEMODE_VDSL_PHY_3),
 +};
 +
-+static inline unsigned int bcm63268_bank_pin(unsigned int pin)
-+{
-+	return pin % PINS_PER_BANK;
-+}
-+
-+static inline unsigned int bcm63268_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm63268_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm63268_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm63268_reg_off(BCM63268_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm63268_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm63268_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm63268_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm63268_reg_off(BCM63268_DATA_REG, pin);
-+	unsigned int dirout = bcm63268_reg_off(BCM63268_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm63268_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm63268_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm63268_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm63268_reg_off(BCM63268_DATA_REG, pin);
-+	unsigned int bank_pin = bcm63268_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm63268_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm63268_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm63268_reg_off(BCM63268_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm63268_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm63268_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm63268_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm63268_reg_off(BCM63268_DATA_REG, pin);
-+	unsigned int bank_pin = bcm63268_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm63268_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
-+}
-+
 +static int bcm63268_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
 +{
 +	return ARRAY_SIZE(bcm63268_groups);
@@ -695,17 +571,17 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	return 0;
 +}
 +
-+static void bcm63268_set_gpio(struct bcm63268_pinctrl *pc, unsigned pin)
++static void bcm63268_set_gpio(struct bcm63xx_pinctrl *pc, unsigned pin)
 +{
 +	const struct pinctrl_pin_desc *desc = &bcm63268_pins[pin];
 +	unsigned int basemode = (unsigned long) desc->drv_data;
-+	unsigned int mask = BIT(bcm63268_bank_pin(pin));
++	unsigned int mask = BIT(bcm63xx_bank_pin(pin));
 +
 +	if (basemode)
 +		regmap_update_bits(pc->regs, BCM63268_BASEMODE_REG, basemode,
 +				   0);
 +
-+	if (pin < PINS_PER_BANK) {
++	if (pin < BCM63XX_BANK_GPIOS) {
 +		/* base mode: 0 => gpio, 1 => mux function */
 +		regmap_update_bits(pc->regs, BCM63268_MODE_REG, mask, 0);
 +
@@ -722,7 +598,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +static int bcm63268_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				    unsigned selector, unsigned group)
 +{
-+	struct bcm63268_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +	const struct bcm63268_pingroup *pg = &bcm63268_groups[group];
 +	const struct bcm63268_function *f = &bcm63268_funcs[selector];
 +	unsigned i;
@@ -767,7 +643,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +					struct pinctrl_gpio_range *range,
 +					unsigned offset)
 +{
-+	struct bcm63268_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +
 +	/* disable all functions using this pin */
 +	bcm63268_set_gpio(pc, offset);
@@ -776,98 +652,44 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +}
 +
 +static struct pinctrl_ops bcm63268_pctl_ops = {
-+	.get_groups_count = bcm63268_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm63268_pinctrl_get_group_name,
 +	.get_group_pins = bcm63268_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm63268_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm63268_pmx_ops = {
-+	.get_functions_count = bcm63268_pinctrl_get_func_count,
-+	.get_function_name = bcm63268_pinctrl_get_func_name,
 +	.get_function_groups = bcm63268_pinctrl_get_groups,
-+	.set_mux = bcm63268_pinctrl_set_mux,
++	.get_function_name = bcm63268_pinctrl_get_func_name,
++	.get_functions_count = bcm63268_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm63268_gpio_request_enable,
++	.set_mux = bcm63268_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm63268_soc = {
++	.ngpios = BCM63268_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm63268_pins),
++	.pctl_ops = &bcm63268_pctl_ops,
++	.pins = bcm63268_pins,
++	.pmx_ops = &bcm63268_pmx_ops,
++};
++
 +static int bcm63268_pinctrl_probe(struct platform_device *pdev)
 +{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm63268_pinctrl *pc;
-+	int err;
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm63268_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm63268_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm63268_gpio_get_direction;
-+	pc->gpio_chip.get = bcm63268_gpio_get;
-+	pc->gpio_chip.set = bcm63268_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM63268_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm63268_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
-+		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm63268_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm63268_pins),
-+	pc->pctl_desc.pctlops = &bcm63268_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm63268_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
-+
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM63268_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	dev_info(dev, "registered\n");
-+
-+	return 0;
++	return bcm63xx_pinctrl_probe(pdev, &bcm63268_soc, NULL);
 +}
 +
 +static const struct of_device_id bcm63268_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm63268-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm63268_pinctrl_driver = {
 +	.probe = bcm63268_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm63268-pinctrl",
 +		.of_match_table = bcm63268_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/071-v5.13-dt-bindings-add-BCM6318-pincontroller-binding-docume.patch b/target/linux/bmips/patches-5.10/071-v5.13-dt-bindings-add-BCM6318-pincontroller-binding-docume.patch
new file mode 100644
index 0000000000..3b490da098
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/071-v5.13-dt-bindings-add-BCM6318-pincontroller-binding-docume.patch
@@ -0,0 +1,168 @@
+From b2f215141b985d5d39ed16fe7e2089d5aa162302 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:21 +0100
+Subject: [PATCH 20/22] dt-bindings: add BCM6318 pincontroller binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the pincontrol core found in BCM6318 SoCs.
+
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-21-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../pinctrl/brcm,bcm6318-pinctrl.yaml         | 143 ++++++++++++++++++
+ 1 file changed, 143 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml
+@@ -0,0 +1,143 @@
++# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6318-pinctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6318 pin controller
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Bindings for Broadcom's BCM6318 memory-mapped pin controller.
++
++properties:
++  compatible:
++    const: brcm,bcm6318-pinctrl
++
++  reg:
++    maxItems: 2
++
++patternProperties:
++  '-pins$':
++    type: object
++    $ref: pinmux-node.yaml#
++
++    properties:
++      function:
++        enum: [ ephy0_spd_led, ephy1_spd_led, ephy2_spd_led, ephy3_spd_led,
++                ephy0_act_led, ephy1_act_led, ephy2_act_led, ephy3_act_led,
++                serial_led_data, serial_led_clk, inet_act_led, inet_fail_led,
++                dsl_led, post_fail_led, wlan_wps_led, usb_pwron,
++                usb_device_led, usb_active ]
++
++      pins:
++        enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
++                gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ]
++
++required:
++  - compatible
++  - reg
++
++additionalProperties: false
++
++examples:
++  - |
++    pinctrl@18 {
++      compatible = "brcm,bcm6318-pinctrl";
++      reg = <0x18 0x10>, <0x54 0x18>;
++
++      pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
++        function = "ephy0_spd_led";
++        pins = "gpio0";
++      };
++
++      pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
++        function = "ephy1_spd_led";
++        pins = "gpio1";
++      };
++
++      pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
++        function = "ephy2_spd_led";
++        pins = "gpio2";
++      };
++
++      pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
++        function = "ephy3_spd_led";
++        pins = "gpio3";
++      };
++
++      pinctrl_ephy0_act_led: ephy0_act_led-pins {
++        function = "ephy0_act_led";
++        pins = "gpio4";
++      };
++
++      pinctrl_ephy1_act_led: ephy1_act_led-pins {
++        function = "ephy1_act_led";
++        pins = "gpio5";
++      };
++
++      pinctrl_ephy2_act_led: ephy2_act_led-pins {
++        function = "ephy2_act_led";
++        pins = "gpio6";
++      };
++
++      pinctrl_ephy3_act_led: ephy3_act_led-pins {
++        function = "ephy3_act_led";
++        pins = "gpio7";
++      };
++
++      pinctrl_serial_led: serial_led-pins {
++        pinctrl_serial_led_data: serial_led_data-pins {
++          function = "serial_led_data";
++          pins = "gpio6";
++        };
++
++        pinctrl_serial_led_clk: serial_led_clk-pins {
++          function = "serial_led_clk";
++          pins = "gpio7";
++        };
++      };
++
++      pinctrl_inet_act_led: inet_act_led-pins {
++        function = "inet_act_led";
++        pins = "gpio8";
++      };
++
++      pinctrl_inet_fail_led: inet_fail_led-pins {
++        function = "inet_fail_led";
++        pins = "gpio9";
++      };
++
++      pinctrl_dsl_led: dsl_led-pins {
++        function = "dsl_led";
++        pins = "gpio10";
++      };
++
++      pinctrl_post_fail_led: post_fail_led-pins {
++        function = "post_fail_led";
++        pins = "gpio11";
++      };
++
++      pinctrl_wlan_wps_led: wlan_wps_led-pins {
++        function = "wlan_wps_led";
++        pins = "gpio12";
++      };
++
++      pinctrl_usb_pwron: usb_pwron-pins {
++        function = "usb_pwron";
++        pins = "gpio13";
++      };
++
++      pinctrl_usb_device_led: usb_device_led-pins {
++        function = "usb_device_led";
++        pins = "gpio13";
++      };
++
++      pinctrl_usb_active: usb_active-pins {
++        function = "usb_active";
++        pins = "gpio40";
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/072-v5.13-dt-bindings-add-BCM6318-GPIO-sysctl-binding-document.patch b/target/linux/bmips/patches-5.10/072-v5.13-dt-bindings-add-BCM6318-GPIO-sysctl-binding-document.patch
new file mode 100644
index 0000000000..1ef13407c8
--- /dev/null
+++ b/target/linux/bmips/patches-5.10/072-v5.13-dt-bindings-add-BCM6318-GPIO-sysctl-binding-document.patch
@@ -0,0 +1,200 @@
+From b6d46b9454742a25f9d923be072869e40b2ecebb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Wed, 24 Mar 2021 09:19:22 +0100
+Subject: [PATCH 21/22] dt-bindings: add BCM6318 GPIO sysctl binding
+ documentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding documentation for the GPIO sysctl found in BCM6318 SoCs.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+Link: https://lore.kernel.org/r/20210324081923.20379-22-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ .../mfd/brcm,bcm6318-gpio-sysctl.yaml         | 177 ++++++++++++++++++
+ 1 file changed, 177 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml
+
+--- /dev/null
++++ b/Documentation/devicetree/bindings/mfd/brcm,bcm6318-gpio-sysctl.yaml
+@@ -0,0 +1,177 @@
++# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/mfd/brcm,bcm6318-gpio-sysctl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: Broadcom BCM6318 GPIO System Controller Device Tree Bindings
++
++maintainers:
++  - Álvaro Fernández Rojas <noltari@gmail.com>
++  - Jonas Gorski <jonas.gorski@gmail.com>
++
++description:
++  Broadcom BCM6318 SoC GPIO system controller which provides a register map
++  for controlling the GPIO and pins of the SoC.
++
++properties:
++  "#address-cells": true
++
++  "#size-cells": true
++
++  compatible:
++    items:
++      - const: brcm,bcm6318-gpio-sysctl
++      - const: syscon
++      - const: simple-mfd
++
++  ranges:
++    maxItems: 1
++
++  reg:
++    maxItems: 1
++
++patternProperties:
++  "^gpio@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../gpio/brcm,bcm6345-gpio.yaml"
++    description:
++      GPIO controller for the SoC GPIOs. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/gpio/brcm,bcm6345-gpio.yaml.
++
++  "^pinctrl@[0-9a-f]+$":
++    # Child node
++    type: object
++    $ref: "../pinctrl/brcm,bcm6318-pinctrl.yaml"
++    description:
++      Pin controller for the SoC pins. This child node definition
++      should follow the bindings specified in
++      Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml.
++
++required:
++  - "#address-cells"
++  - compatible
++  - ranges
++  - reg
++  - "#size-cells"
++
++additionalProperties: false
++
++examples:
++  - |
++    syscon@10000080 {
++      #address-cells = <1>;
++      #size-cells = <1>;
++      compatible = "brcm,bcm6318-gpio-sysctl", "syscon", "simple-mfd";
++      reg = <0x10000080 0x80>;
++      ranges = <0 0x10000080 0x80>;
++
++      gpio@0 {
++        compatible = "brcm,bcm6318-gpio";
++        reg-names = "dirout", "dat";
++        reg = <0x0 0x8>, <0x8 0x8>;
++
++        gpio-controller;
++        gpio-ranges = <&pinctrl 0 0 50>;
++        #gpio-cells = <2>;
++      };
++
++      pinctrl: pinctrl@10 {
++        compatible = "brcm,bcm6318-pinctrl";
++        reg = <0x18 0x10>, <0x54 0x18>;
++
++        pinctrl_ephy0_spd_led: ephy0_spd_led-pins {
++          function = "ephy0_spd_led";
++          pins = "gpio0";
++        };
++
++        pinctrl_ephy1_spd_led: ephy1_spd_led-pins {
++          function = "ephy1_spd_led";
++          pins = "gpio1";
++        };
++
++        pinctrl_ephy2_spd_led: ephy2_spd_led-pins {
++          function = "ephy2_spd_led";
++          pins = "gpio2";
++        };
++
++        pinctrl_ephy3_spd_led: ephy3_spd_led-pins {
++          function = "ephy3_spd_led";
++          pins = "gpio3";
++        };
++
++        pinctrl_ephy0_act_led: ephy0_act_led-pins {
++          function = "ephy0_act_led";
++          pins = "gpio4";
++        };
++
++        pinctrl_ephy1_act_led: ephy1_act_led-pins {
++          function = "ephy1_act_led";
++          pins = "gpio5";
++        };
++
++        pinctrl_ephy2_act_led: ephy2_act_led-pins {
++          function = "ephy2_act_led";
++          pins = "gpio6";
++        };
++
++        pinctrl_ephy3_act_led: ephy3_act_led-pins {
++          function = "ephy3_act_led";
++          pins = "gpio7";
++        };
++
++        pinctrl_serial_led: serial_led-pins {
++          pinctrl_serial_led_data: serial_led_data-pins {
++            function = "serial_led_data";
++            pins = "gpio6";
++          };
++
++          pinctrl_serial_led_clk: serial_led_clk-pins {
++            function = "serial_led_clk";
++            pins = "gpio7";
++          };
++        };
++
++        pinctrl_inet_act_led: inet_act_led-pins {
++          function = "inet_act_led";
++          pins = "gpio8";
++        };
++
++        pinctrl_inet_fail_led: inet_fail_led-pins {
++          function = "inet_fail_led";
++          pins = "gpio9";
++        };
++
++        pinctrl_dsl_led: dsl_led-pins {
++          function = "dsl_led";
++          pins = "gpio10";
++        };
++
++        pinctrl_post_fail_led: post_fail_led-pins {
++          function = "post_fail_led";
++          pins = "gpio11";
++        };
++
++        pinctrl_wlan_wps_led: wlan_wps_led-pins {
++          function = "wlan_wps_led";
++          pins = "gpio12";
++        };
++
++        pinctrl_usb_pwron: usb_pwron-pins {
++          function = "usb_pwron";
++          pins = "gpio13";
++        };
++
++        pinctrl_usb_device_led: usb_device_led-pins {
++          function = "usb_device_led";
++          pins = "gpio13";
++        };
++
++        pinctrl_usb_active: usb_active-pins {
++          function = "usb_active";
++          pins = "gpio40";
++        };
++      };
++    };
diff --git a/target/linux/bmips/patches-5.10/411-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch b/target/linux/bmips/patches-5.10/073-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch
index b57b49d35f..afd8d9e1fa 100644
--- a/target/linux/bmips/patches-5.10/411-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch
+++ b/target/linux/bmips/patches-5.10/073-v5.13-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch
@@ -1,7 +1,7 @@
-From e1764f96eb563a11c822ff91d1c6d7ed01c3925b Mon Sep 17 00:00:00 2001
+From d28039fccf948a407de69106465caa465b1dcf32 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 24 Jun 2016 22:20:39 +0200
-Subject: [PATCH 12/12] pinctrl: add a pincontrol driver for BCM6318
+Date: Wed, 24 Mar 2021 09:19:23 +0100
+Subject: [PATCH 22/22] pinctrl: add a pincontrol driver for BCM6318
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -11,48 +11,48 @@ to different functions. BCM6318 is similar to BCM6328 with the addition
 of a pad register, and the GPIO meaning of the mux register changes
 based on the GPIO number.
 
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Co-developed-by: Jonas Gorski <jonas.gorski@gmail.com>
 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Link: https://lore.kernel.org/r/20210324081923.20379-23-noltari@gmail.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
- drivers/pinctrl/bcm/Kconfig           |  11 +
+ drivers/pinctrl/bcm/Kconfig           |   8 +
  drivers/pinctrl/bcm/Makefile          |   1 +
- drivers/pinctrl/bcm/pinctrl-bcm6318.c | 674 ++++++++++++++++++++++++++
- 3 files changed, 686 insertions(+)
+ drivers/pinctrl/bcm/pinctrl-bcm6318.c | 498 ++++++++++++++++++++++++++
+ 3 files changed, 507 insertions(+)
  create mode 100644 drivers/pinctrl/bcm/pinctrl-bcm6318.c
 
 --- a/drivers/pinctrl/bcm/Kconfig
 +++ b/drivers/pinctrl/bcm/Kconfig
-@@ -29,6 +29,17 @@ config PINCTRL_BCM2835
- 	help
- 	   Say Y here to enable the Broadcom BCM2835 GPIO driver.
+@@ -36,6 +36,14 @@ config PINCTRL_BCM63XX
+ 	select PINCONF
+ 	select PINMUX
  
 +config PINCTRL_BCM6318
 +	bool "Broadcom BCM6318 GPIO driver"
-+	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
-+	select PINMUX
-+	select PINCONF
-+	select GENERIC_PINCONF
-+	select MFD_SYSCON
++	depends on (BMIPS_GENERIC || COMPILE_TEST)
++	select PINCTRL_BCM63XX
 +	default BMIPS_GENERIC
 +	help
 +	   Say Y here to enable the Broadcom BCM6318 GPIO driver.
 +
  config PINCTRL_BCM6328
  	bool "Broadcom BCM6328 GPIO driver"
- 	depends on OF_GPIO && (BMIPS_GENERIC || COMPILE_TEST)
+ 	depends on (BMIPS_GENERIC || COMPILE_TEST)
 --- a/drivers/pinctrl/bcm/Makefile
 +++ b/drivers/pinctrl/bcm/Makefile
-@@ -3,6 +3,7 @@
- 
+@@ -4,6 +4,7 @@
  obj-$(CONFIG_PINCTRL_BCM281XX)		+= pinctrl-bcm281xx.o
  obj-$(CONFIG_PINCTRL_BCM2835)		+= pinctrl-bcm2835.o
+ obj-$(CONFIG_PINCTRL_BCM63XX)		+= pinctrl-bcm63xx.o
 +obj-$(CONFIG_PINCTRL_BCM6318)		+= pinctrl-bcm6318.o
  obj-$(CONFIG_PINCTRL_BCM6328)		+= pinctrl-bcm6328.o
  obj-$(CONFIG_PINCTRL_BCM6358)		+= pinctrl-bcm6358.o
  obj-$(CONFIG_PINCTRL_BCM6362)		+= pinctrl-bcm6362.o
 --- /dev/null
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm6318.c
-@@ -0,0 +1,674 @@
+@@ -0,0 +1,498 @@
 +// SPDX-License-Identifier: GPL-2.0+
 +/*
 + * Driver for BCM6318 GPIO unit (pinctrl + GPIO)
@@ -61,36 +61,26 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 + * Copyright (C) 2016 Jonas Gorski <jonas.gorski@gmail.com>
 + */
 +
-+#include <linux/bitops.h>
-+#include <linux/gpio.h>
++#include <linux/bits.h>
++#include <linux/gpio/driver.h>
 +#include <linux/kernel.h>
-+#include <linux/mfd/syscon.h>
 +#include <linux/of.h>
-+#include <linux/of_gpio.h>
-+#include <linux/of_irq.h>
++#include <linux/pinctrl/pinmux.h>
 +#include <linux/platform_device.h>
 +#include <linux/regmap.h>
 +
-+#include <linux/pinctrl/machine.h>
-+#include <linux/pinctrl/pinconf.h>
-+#include <linux/pinctrl/pinconf-generic.h>
-+#include <linux/pinctrl/pinmux.h>
-+
-+#include "../core.h"
 +#include "../pinctrl-utils.h"
 +
-+#define MODULE_NAME		"bcm6318-pinctrl"
++#include "pinctrl-bcm63xx.h"
++
 +#define BCM6318_NUM_GPIOS	50
 +#define BCM6318_NUM_MUX		48
 +
-+#define BANK_SIZE		sizeof(uint32_t)
-+#define PINS_PER_BANK		(BANK_SIZE * BITS_PER_BYTE)
-+
-+#define BCM6318_DIROUT_REG	0x04
-+#define BCM6318_DATA_REG	0x0c
 +#define BCM6318_MODE_REG	0x18
 +#define BCM6318_MUX_REG		0x1c
++#define  BCM6328_MUX_MASK	GENMASK(1, 0)
 +#define BCM6318_PAD_REG		0x54
++#define  BCM6328_PAD_MASK	GENMASK(3, 0)
 +
 +struct bcm6318_pingroup {
 +	const char *name;
@@ -107,16 +97,6 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	unsigned mux_val:2;
 +};
 +
-+struct bcm6318_pinctrl {
-+	struct device *dev;
-+	struct regmap *regs;
-+
-+	struct pinctrl_dev *pctl_dev;
-+	struct gpio_chip gpio_chip;
-+	struct pinctrl_desc pctl_desc;
-+	struct pinctrl_gpio_range gpio_range;
-+};
-+
 +static const struct pinctrl_pin_desc bcm6318_pins[] = {
 +	PINCTRL_PIN(0, "gpio0"),
 +	PINCTRL_PIN(1, "gpio1"),
@@ -420,116 +400,14 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	BCM6318_MUX_FUN(usb_active, 2),
 +};
 +
-+static inline unsigned int bcm6318_bank_pin(unsigned int pin)
-+{
-+	return pin % PINS_PER_BANK;
-+}
-+
 +static inline unsigned int bcm6318_mux_off(unsigned int pin)
 +{
-+	return BCM6318_MUX_REG + (pin / 16) * BANK_SIZE;
++	return BCM6318_MUX_REG + (pin / 16) * 4;
 +}
 +
 +static inline unsigned int bcm6318_pad_off(unsigned int pin)
 +{
-+	return BCM6318_PAD_REG + (pin / 8) * BANK_SIZE;
-+}
-+
-+static inline unsigned int bcm6318_reg_off(unsigned int reg, unsigned int pin)
-+{
-+	return reg - (pin / PINS_PER_BANK) * BANK_SIZE;
-+}
-+
-+static int bcm6318_gpio_direction_input(struct gpio_chip *chip,
-+					unsigned int pin)
-+{
-+	struct bcm6318_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6318_reg_off(BCM6318_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6318_bank_pin(pin);
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an input GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_input(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), 0);
-+
-+	return 0;
-+}
-+
-+static int bcm6318_gpio_direction_output(struct gpio_chip *chip,
-+					 unsigned int pin, int value)
-+{
-+	struct bcm6318_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6318_reg_off(BCM6318_DATA_REG, pin);
-+	unsigned int dirout = bcm6318_reg_off(BCM6318_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6318_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+	int ret;
-+
-+	/*
-+	 * Check with the pinctrl driver whether this pin is usable as
-+	 * an output GPIO
-+	 */
-+	ret = pinctrl_gpio_direction_output(chip->base + pin);
-+	if (ret)
-+		return ret;
-+
-+	regmap_update_bits(pc->regs, dirout, BIT(bank_pin), BIT(bank_pin));
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+
-+	return 0;
-+}
-+
-+static int bcm6318_gpio_get(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6318_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6318_reg_off(BCM6318_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6318_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, data, &val);
-+
-+	return !!(val & BIT(bank_pin));
-+}
-+
-+static int bcm6318_gpio_get_direction(struct gpio_chip *chip, unsigned int pin)
-+{
-+	struct bcm6318_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int dirout = bcm6318_reg_off(BCM6318_DIROUT_REG, pin);
-+	unsigned int bank_pin = bcm6318_bank_pin(pin);
-+	unsigned int val;
-+
-+	regmap_read(pc->regs, dirout, &val);
-+
-+	if (val & BIT(bank_pin))
-+		return GPIO_LINE_DIRECTION_OUT;
-+
-+	return GPIO_LINE_DIRECTION_IN;
-+}
-+
-+static void bcm6318_gpio_set(struct gpio_chip *chip, unsigned int pin,
-+			     int value)
-+{
-+	struct bcm6318_pinctrl *pc = gpiochip_get_data(chip);
-+	unsigned int data = bcm6318_reg_off(BCM6318_DATA_REG, pin);
-+	unsigned int bank_pin = bcm6318_bank_pin(pin);
-+	unsigned int val = value ? BIT(bank_pin) : 0;
-+
-+	regmap_update_bits(pc->regs, data, BIT(bank_pin), val);
-+}
-+
-+static int bcm6318_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
-+{
-+	char irq_name[7];
-+
-+	sprintf(irq_name, "gpio%d", gpio);
-+
-+	return of_irq_get_byname(chip->of_node, irq_name);
++	return BCM6318_PAD_REG + (pin / 8) * 4;
 +}
 +
 +static int bcm6318_pinctrl_get_group_count(struct pinctrl_dev *pctldev)
@@ -575,32 +453,32 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +	return 0;
 +}
 +
-+static inline void bcm6318_rmw_mux(struct bcm6318_pinctrl *pc, unsigned pin,
++static inline void bcm6318_rmw_mux(struct bcm63xx_pinctrl *pc, unsigned pin,
 +				   unsigned int mode, unsigned int mux)
 +{
-+	if (pin < PINS_PER_BANK)
++	if (pin < BCM63XX_BANK_GPIOS)
 +		regmap_update_bits(pc->regs, BCM6318_MODE_REG, BIT(pin),
 +				   mode ? BIT(pin) : 0);
 +
 +	if (pin < BCM6318_NUM_MUX)
 +		regmap_update_bits(pc->regs,
 +				   bcm6318_mux_off(pin),
-+				   3UL << ((pin % 16) * 2),
++				   BCM6328_MUX_MASK << ((pin % 16) * 2),
 +				   mux << ((pin % 16) * 2));
 +}
 +
-+static inline void bcm6318_set_pad(struct bcm6318_pinctrl *pc, unsigned pin,
++static inline void bcm6318_set_pad(struct bcm63xx_pinctrl *pc, unsigned pin,
 +				   uint8_t val)
 +{
 +	regmap_update_bits(pc->regs, bcm6318_pad_off(pin),
-+			   0xfUL << ((pin % 8) * 4),
++			   BCM6328_PAD_MASK << ((pin % 8) * 4),
 +			   val << ((pin % 8) * 4));
 +}
 +
 +static int bcm6318_pinctrl_set_mux(struct pinctrl_dev *pctldev,
 +				   unsigned selector, unsigned group)
 +{
-+	struct bcm6318_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +	const struct bcm6318_pingroup *pg = &bcm6318_groups[group];
 +	const struct bcm6318_function *f = &bcm6318_funcs[selector];
 +
@@ -613,7 +491,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +				       struct pinctrl_gpio_range *range,
 +				       unsigned offset)
 +{
-+	struct bcm6318_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
++	struct bcm63xx_pinctrl *pc = pinctrl_dev_get_drvdata(pctldev);
 +
 +	/* disable all functions using this pin */
 +	if (offset < 13) {
@@ -630,98 +508,44 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
 +}
 +
 +static struct pinctrl_ops bcm6318_pctl_ops = {
-+	.get_groups_count = bcm6318_pinctrl_get_group_count,
++	.dt_free_map = pinctrl_utils_free_map,
++	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
 +	.get_group_name = bcm6318_pinctrl_get_group_name,
 +	.get_group_pins = bcm6318_pinctrl_get_group_pins,
-+	.dt_node_to_map = pinconf_generic_dt_node_to_map_pin,
-+	.dt_free_map = pinctrl_utils_free_map,
++	.get_groups_count = bcm6318_pinctrl_get_group_count,
 +};
 +
 +static struct pinmux_ops bcm6318_pmx_ops = {
-+	.get_functions_count = bcm6318_pinctrl_get_func_count,
-+	.get_function_name = bcm6318_pinctrl_get_func_name,
 +	.get_function_groups = bcm6318_pinctrl_get_groups,
-+	.set_mux = bcm6318_pinctrl_set_mux,
++	.get_function_name = bcm6318_pinctrl_get_func_name,
++	.get_functions_count = bcm6318_pinctrl_get_func_count,
 +	.gpio_request_enable = bcm6318_gpio_request_enable,
++	.set_mux = bcm6318_pinctrl_set_mux,
 +	.strict = true,
 +};
 +
++static const struct bcm63xx_pinctrl_soc bcm6318_soc = {
++	.ngpios = BCM6318_NUM_GPIOS,
++	.npins = ARRAY_SIZE(bcm6318_pins),
++	.pctl_ops = &bcm6318_pctl_ops,
++	.pins = bcm6318_pins,
++	.pmx_ops = &bcm6318_pmx_ops,
++};
++
 +static int bcm6318_pinctrl_probe(struct platform_device *pdev)
 +{
-+	struct device *dev = &pdev->dev;
-+	struct device_node *np = dev->of_node;
-+	struct bcm6318_pinctrl *pc;
-+	int err;
-+
-+	pc = devm_kzalloc(dev, sizeof(*pc), GFP_KERNEL);
-+	if (!pc)
-+		return -ENOMEM;
-+
-+	platform_set_drvdata(pdev, pc);
-+	pc->dev = dev;
-+
-+	pc->regs = syscon_node_to_regmap(dev->parent->of_node);
-+	if (IS_ERR(pc->regs))
-+		return PTR_ERR(pc->regs);
-+
-+	pc->gpio_chip.label = MODULE_NAME;
-+	pc->gpio_chip.owner = THIS_MODULE;
-+	pc->gpio_chip.request = gpiochip_generic_request;
-+	pc->gpio_chip.free = gpiochip_generic_free;
-+	pc->gpio_chip.direction_input = bcm6318_gpio_direction_input;
-+	pc->gpio_chip.direction_output = bcm6318_gpio_direction_output;
-+	pc->gpio_chip.get_direction = bcm6318_gpio_get_direction;
-+	pc->gpio_chip.get = bcm6318_gpio_get;
-+	pc->gpio_chip.set = bcm6318_gpio_set;
-+	pc->gpio_chip.set_config = gpiochip_generic_config;
-+	pc->gpio_chip.base = -1;
-+	pc->gpio_chip.ngpio = BCM6318_NUM_GPIOS;
-+	pc->gpio_chip.can_sleep = false;
-+	pc->gpio_chip.parent = dev;
-+	pc->gpio_chip.of_node = np;
-+
-+	if (of_get_property(np, "interrupt-names", NULL))
-+		pc->gpio_chip.to_irq = bcm6318_gpio_to_irq;
-+
-+	err = gpiochip_add_data(&pc->gpio_chip, pc);
-+	if (err) {
-+		dev_err(dev, "could not add GPIO chip\n");
-+		return err;
-+	}
-+
-+	pc->pctl_desc.name = MODULE_NAME,
-+	pc->pctl_desc.pins = bcm6318_pins,
-+	pc->pctl_desc.npins = ARRAY_SIZE(bcm6318_pins),
-+	pc->pctl_desc.pctlops = &bcm6318_pctl_ops,
-+	pc->pctl_desc.pmxops = &bcm6318_pmx_ops,
-+	pc->pctl_desc.owner = THIS_MODULE,
-+
-+	pc->pctl_dev = devm_pinctrl_register(dev, &pc->pctl_desc, pc);
-+	if (IS_ERR(pc->pctl_dev)) {
-+		gpiochip_remove(&pc->gpio_chip);
-+		return PTR_ERR(pc->pctl_dev);
-+	}
-+
-+	pc->gpio_range.name = MODULE_NAME;
-+	pc->gpio_range.npins = BCM6318_NUM_GPIOS;
-+	pc->gpio_range.base = pc->gpio_chip.base;
-+	pc->gpio_range.gc = &pc->gpio_chip;
-+	pinctrl_add_gpio_range(pc->pctl_dev, &pc->gpio_range);
-+
-+	dev_info(dev, "registered\n");
-+
-+	return 0;
++	return bcm63xx_pinctrl_probe(pdev, &bcm6318_soc, NULL);
 +}
 +
 +static const struct of_device_id bcm6318_pinctrl_match[] = {
 +	{ .compatible = "brcm,bcm6318-pinctrl", },
-+	{ },
++	{ /* sentinel */ }
 +};
 +
 +static struct platform_driver bcm6318_pinctrl_driver = {
 +	.probe = bcm6318_pinctrl_probe,
 +	.driver = {
-+		.name = MODULE_NAME,
++		.name = "bcm6318-pinctrl",
 +		.of_match_table = bcm6318_pinctrl_match,
 +	},
 +};
diff --git a/target/linux/bmips/patches-5.10/400-Documentation-add-BCM6328-pincontroller-binding-docu.patch b/target/linux/bmips/patches-5.10/400-Documentation-add-BCM6328-pincontroller-binding-docu.patch
deleted file mode 100644
index 4ad97ad1e0..0000000000
--- a/target/linux/bmips/patches-5.10/400-Documentation-add-BCM6328-pincontroller-binding-docu.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 3b6d70e7bae0dbba02435c53f878a042d6d4bd4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:33:56 +0200
-Subject: [PATCH 01/12] Documentation: add BCM6328 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in BCM6328 SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm6328-pinctrl.yaml         | 161 ++++++++++++++++++
- 1 file changed, 161 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6328-pinctrl.yaml
-@@ -0,0 +1,161 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6328-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM6328 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm6328-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 4 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 4
-+    maxItems: 4
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ serial_led_data, serial_led_clk, inet_act_led, pcie_clkreq,
-+                  led, ephy0_act_led, ephy1_act_led, ephy2_act_led,
-+                  ephy3_act_led, hsspi_cs1, usb_device_port, usb_host_port ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ gpio6, gpio7, gpio11, gpio16, gpio17, gpio18, gpio19,
-+                  gpio20, gpio25, gpio26, gpio27, gpio28, hsspi_cs1,
-+                  usb_port1 ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@10000080 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0x10000080 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm6328-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc 3 0>,
-+                              <&ext_intc 2 0>,
-+                              <&ext_intc 1 0>,
-+                              <&ext_intc 0 0>;
-+        interrupt-names = "gpio12",
-+                          "gpio15",
-+                          "gpio23",
-+                          "gpio24";
-+
-+        pinctrl_serial_led: serial_led {
-+          pinctrl_serial_led_data: serial_led_data {
-+            function = "serial_led_data";
-+            pins = "gpio6";
-+          };
-+
-+          pinctrl_serial_led_clk: serial_led_clk {
-+            function = "serial_led_clk";
-+            pins = "gpio7";
-+          };
-+        };
-+
-+        pinctrl_inet_act_led: inet_act_led {
-+          function = "inet_act_led";
-+          pins = "gpio11";
-+        };
-+
-+        pinctrl_pcie_clkreq: pcie_clkreq {
-+          function = "pcie_clkreq";
-+          pins = "gpio16";
-+        };
-+
-+        pinctrl_ephy0_spd_led: ephy0_spd_led {
-+          function = "led";
-+          pins = "gpio17";
-+        };
-+
-+        pinctrl_ephy1_spd_led: ephy1_spd_led {
-+          function = "led";
-+          pins = "gpio18";
-+        };
-+
-+        pinctrl_ephy2_spd_led: ephy2_spd_led {
-+          function = "led";
-+          pins = "gpio19";
-+        };
-+
-+        pinctrl_ephy3_spd_led: ephy3_spd_led {
-+          function = "led";
-+          pins = "gpio20";
-+        };
-+
-+        pinctrl_ephy0_act_led: ephy0_act_led {
-+          function = "ephy0_act_led";
-+          pins = "gpio25";
-+        };
-+
-+        pinctrl_ephy1_act_led: ephy1_act_led {
-+          function = "ephy1_act_led";
-+          pins = "gpio26";
-+        };
-+
-+        pinctrl_ephy2_act_led: ephy2_act_led {
-+          function = "ephy2_act_led";
-+          pins = "gpio27";
-+        };
-+
-+        pinctrl_ephy3_act_led: ephy3_act_led {
-+          function = "ephy3_act_led";
-+          pins = "gpio28";
-+        };
-+
-+        pinctrl_hsspi_cs1: hsspi_cs1 {
-+          function = "hsspi_cs1";
-+          pins = "hsspi_cs1";
-+        };
-+
-+        pinctrl_usb_port1_device: usb_port1_device {
-+          function = "usb_device_port";
-+          pins = "usb_port1";
-+        };
-+
-+        pinctrl_usb_port1_host: usb_port1_host {
-+          function = "usb_host_port";
-+          pins = "usb_port1";
-+        };
-+      };
-+    };
diff --git a/target/linux/bmips/patches-5.10/402-Documentation-add-BCM6358-pincontroller-binding-docu.patch b/target/linux/bmips/patches-5.10/402-Documentation-add-BCM6358-pincontroller-binding-docu.patch
deleted file mode 100644
index e4c6343e3f..0000000000
--- a/target/linux/bmips/patches-5.10/402-Documentation-add-BCM6358-pincontroller-binding-docu.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 9fbcbe08479bcb3609952b66627e2d612173229a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:36:00 +0200
-Subject: [PATCH 03/12] Documentation: add BCM6358 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in BCM6358 SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm6358-pinctrl.yaml         | 131 ++++++++++++++++++
- 1 file changed, 131 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6358-pinctrl.yaml
-@@ -0,0 +1,131 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6358-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM6358 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm6358-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 4 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 6
-+    maxItems: 6
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ ebi_cs, uart1, serial_led, legacy_led, led, spi_cs, utopia,
-+                  pwm_syn_clk, sys_irq ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ ebi_cs_grp, uart1_grp, serial_led_grp, legacy_led_grp,
-+                  led_grp, spi_cs_grp, utopia_grp, pwm_syn_clk, sys_irq_grp ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@fffe0080 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0xfffe0080 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm6358-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc1 0 0>,
-+                              <&ext_intc1 1 0>,
-+                              <&ext_intc0 0 0>,
-+                              <&ext_intc0 1 0>,
-+                              <&ext_intc0 2 0>,
-+                              <&ext_intc0 3 0>;
-+        interrupt-names = "gpio32",
-+                          "gpio33",
-+                          "gpio34",
-+                          "gpio35",
-+                          "gpio36",
-+                          "gpio37";
-+
-+        pinctrl_ebi_cs: ebi_cs {
-+          function = "ebi_cs";
-+          groups = "ebi_cs_grp";
-+        };
-+
-+        pinctrl_uart1: uart1 {
-+          function = "uart1";
-+          groups = "uart1_grp";
-+        };
-+
-+        pinctrl_serial_led: serial_led {
-+          function = "serial_led";
-+          groups = "serial_led_grp";
-+        };
-+
-+        pinctrl_legacy_led: legacy_led {
-+          function = "legacy_led";
-+          groups = "legacy_led_grp";
-+        };
-+
-+        pinctrl_led: led {
-+          function = "led";
-+          groups = "led_grp";
-+        };
-+
-+        pinctrl_spi_cs_23: spi_cs {
-+          function = "spi_cs";
-+          groups = "spi_cs_grp";
-+        };
-+
-+        pinctrl_utopia: utopia {
-+          function = "utopia";
-+          groups = "utopia_grp";
-+        };
-+
-+        pinctrl_pwm_syn_clk: pwm_syn_clk {
-+          function = "pwm_syn_clk";
-+          groups = "pwm_syn_clk_grp";
-+        };
-+
-+        pinctrl_sys_irq: sys_irq {
-+          function = "sys_irq";
-+          groups = "sys_irq_grp";
-+        };
-+      };
-+    };
diff --git a/target/linux/bmips/patches-5.10/404-Documentation-add-BCM6362-pincontroller-binding-docu.patch b/target/linux/bmips/patches-5.10/404-Documentation-add-BCM6362-pincontroller-binding-docu.patch
deleted file mode 100644
index 18739091aa..0000000000
--- a/target/linux/bmips/patches-5.10/404-Documentation-add-BCM6362-pincontroller-binding-docu.patch
+++ /dev/null
@@ -1,261 +0,0 @@
-From 1c839f287a008023b3b3ae7d892b4d25e3d224ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:36:18 +0200
-Subject: [PATCH 05/12] Documentation: add BCM6362 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in BCM6362 SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm6362-pinctrl.yaml         | 240 ++++++++++++++++++
- 1 file changed, 240 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6362-pinctrl.yaml
-@@ -0,0 +1,240 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6362-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM6362 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm6362-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 4 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 4
-+    maxItems: 4
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ usb_device_led, sys_irq, serial_led_clk, serial_led_data,
-+                  robosw_led_data, robosw_led_clk, robosw_led0, robosw_led1,
-+                  inet_led, spi_cs2, spi_cs3, ntr_pulse, uart1_scts,
-+                  uart1_srts, uart1_sdin, uart1_sdout, adsl_spi_miso,
-+                  adsl_spi_mosi, adsl_spi_clk, adsl_spi_cs, ephy0_led,
-+                  ephy1_led, ephy2_led, ephy3_led, ext_irq0, ext_irq1,
-+                  ext_irq2, ext_irq3, nand ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
-+                  gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio14,
-+                  gpio15, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
-+                  gpio22, gpio23, gpio24, gpio25, gpio26, gpio27, nand_grp ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@10000080 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0x10000080 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm6362-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc 0 0>,
-+                              <&ext_intc 1 0>,
-+                              <&ext_intc 2 0>,
-+                              <&ext_intc 3 0>;
-+        interrupt-names = "gpio24",
-+                          "gpio25",
-+                          "gpio26",
-+                          "gpio27";
-+
-+        pinctrl_usb_device_led: usb_device_led {
-+          function = "usb_device_led";
-+          pins = "gpio0";
-+        };
-+
-+        pinctrl_sys_irq: sys_irq {
-+          function = "sys_irq";
-+          pins = "gpio1";
-+        };
-+
-+        pinctrl_serial_led: serial_led {
-+          pinctrl_serial_led_clk: serial_led_clk {
-+            function = "serial_led_clk";
-+            pins = "gpio2";
-+          };
-+
-+          pinctrl_serial_led_data: serial_led_data {
-+            function = "serial_led_data";
-+            pins = "gpio3";
-+          };
-+        };
-+
-+        pinctrl_robosw_led_data: robosw_led_data {
-+          function = "robosw_led_data";
-+          pins = "gpio4";
-+        };
-+
-+        pinctrl_robosw_led_clk: robosw_led_clk {
-+          function = "robosw_led_clk";
-+          pins = "gpio5";
-+        };
-+
-+        pinctrl_robosw_led0: robosw_led0 {
-+          function = "robosw_led0";
-+          pins = "gpio6";
-+        };
-+
-+        pinctrl_robosw_led1: robosw_led1 {
-+          function = "robosw_led1";
-+          pins = "gpio7";
-+        };
-+
-+        pinctrl_inet_led: inet_led {
-+          function = "inet_led";
-+          pins = "gpio8";
-+        };
-+
-+        pinctrl_spi_cs2: spi_cs2 {
-+          function = "spi_cs2";
-+          pins = "gpio9";
-+        };
-+
-+        pinctrl_spi_cs3: spi_cs3 {
-+          function = "spi_cs3";
-+          pins = "gpio10";
-+        };
-+
-+        pinctrl_ntr_pulse: ntr_pulse {
-+          function = "ntr_pulse";
-+          pins = "gpio11";
-+        };
-+
-+        pinctrl_uart1_scts: uart1_scts {
-+          function = "uart1_scts";
-+          pins = "gpio12";
-+        };
-+
-+        pinctrl_uart1_srts: uart1_srts {
-+          function = "uart1_srts";
-+          pins = "gpio13";
-+        };
-+
-+        pinctrl_uart1: uart1 {
-+          pinctrl_uart1_sdin: uart1_sdin {
-+            function = "uart1_sdin";
-+            pins = "gpio14";
-+          };
-+
-+          pinctrl_uart1_sdout: uart1_sdout {
-+            function = "uart1_sdout";
-+            pins = "gpio15";
-+          };
-+        };
-+
-+        pinctrl_adsl_spi: adsl_spi {
-+          pinctrl_adsl_spi_miso: adsl_spi_miso {
-+            function = "adsl_spi_miso";
-+            pins = "gpio16";
-+          };
-+
-+          pinctrl_adsl_spi_mosi: adsl_spi_mosi {
-+            function = "adsl_spi_mosi";
-+            pins = "gpio17";
-+          };
-+
-+          pinctrl_adsl_spi_clk: adsl_spi_clk {
-+            function = "adsl_spi_clk";
-+            pins = "gpio18";
-+          };
-+
-+          pinctrl_adsl_spi_cs: adsl_spi_cs {
-+            function = "adsl_spi_cs";
-+            pins = "gpio19";
-+          };
-+        };
-+
-+        pinctrl_ephy0_led: ephy0_led {
-+          function = "ephy0_led";
-+          pins = "gpio20";
-+        };
-+
-+        pinctrl_ephy1_led: ephy1_led {
-+          function = "ephy1_led";
-+          pins = "gpio21";
-+        };
-+
-+        pinctrl_ephy2_led: ephy2_led {
-+          function = "ephy2_led";
-+          pins = "gpio22";
-+        };
-+
-+        pinctrl_ephy3_led: ephy3_led {
-+          function = "ephy3_led";
-+          pins = "gpio23";
-+        };
-+
-+        pinctrl_ext_irq0: ext_irq0 {
-+          function = "ext_irq0";
-+          pins = "gpio24";
-+        };
-+
-+        pinctrl_ext_irq1: ext_irq1 {
-+          function = "ext_irq1";
-+          pins = "gpio25";
-+        };
-+
-+        pinctrl_ext_irq2: ext_irq2 {
-+          function = "ext_irq2";
-+          pins = "gpio26";
-+        };
-+
-+        pinctrl_ext_irq3: ext_irq3 {
-+          function = "ext_irq3";
-+          pins = "gpio27";
-+        };
-+
-+        pinctrl_nand: nand {
-+          function = "nand";
-+          group = "nand_grp";
-+        };
-+      };
-+    };
diff --git a/target/linux/bmips/patches-5.10/406-Documentation-add-BCM6368-pincontroller-binding-docu.patch b/target/linux/bmips/patches-5.10/406-Documentation-add-BCM6368-pincontroller-binding-docu.patch
deleted file mode 100644
index 59fbdaeaaa..0000000000
--- a/target/linux/bmips/patches-5.10/406-Documentation-add-BCM6368-pincontroller-binding-docu.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-From 12f1d5123ee405266596eaea238d9810e0628d18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:36:51 +0200
-Subject: [PATCH 07/12] Documentation: add BCM6368 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in BCM6368 SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm6368-pinctrl.yaml         | 255 ++++++++++++++++++
- 1 file changed, 255 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6368-pinctrl.yaml
-@@ -0,0 +1,255 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6368-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM6368 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm6368-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 6 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 6
-+    maxItems: 6
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ analog_afe_0, analog_afe_1, sys_irq, serial_led_data,
-+                  serial_led_clk, inet_led, ephy0_led, ephy1_led, ephy2_led,
-+                  ephy3_led, robosw_led_data, robosw_led_clk, robosw_led0,
-+                  robosw_led1, usb_device_led, pci_req1, pci_gnt1, pci_intb,
-+                  pci_req0, pci_gnt0, pcmcia_cd1, pcmcia_cd2, pcmcia_vs1,
-+                  pcmcia_vs2, ebi_cs2, ebi_cs3, spi_cs2, spi_cs3, spi_cs4,
-+                  spi_cs5, uart1 ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
-+                  gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio14,
-+                  gpio16, gpio17, gpio18, gpio19, gpio20, gpio22, gpio23,
-+                  gpio24, gpio25, gpio26, gpio27, gpio28, gpio29, gpio30,
-+                  gpio31, uart1_grp ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@10000080 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0x10000080 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm6368-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc1 0 0>,
-+                              <&ext_intc1 1 0>,
-+                              <&ext_intc0 0 0>,
-+                              <&ext_intc0 1 0>,
-+                              <&ext_intc0 2 0>,
-+                              <&ext_intc0 3 0>;
-+        interrupt-names = "gpio32",
-+                          "gpio33",
-+                          "gpio34",
-+                          "gpio35",
-+                          "gpio36",
-+                          "gpio37";
-+
-+        pinctrl_analog_afe_0: analog_afe_0 {
-+          function = "analog_afe_0";
-+          pins = "gpio0";
-+        };
-+
-+        pinctrl_analog_afe_1: analog_afe_1 {
-+          function = "analog_afe_1";
-+          pins = "gpio1";
-+        };
-+
-+        pinctrl_sys_irq: sys_irq {
-+          function = "sys_irq";
-+          pins = "gpio2";
-+        };
-+
-+        pinctrl_serial_led: serial_led {
-+          pinctrl_serial_led_data: serial_led_data {
-+            function = "serial_led_data";
-+            pins = "gpio3";
-+          };
-+
-+          pinctrl_serial_led_clk: serial_led_clk {
-+            function = "serial_led_clk";
-+            pins = "gpio4";
-+          };
-+        };
-+
-+        pinctrl_inet_led: inet_led {
-+          function = "inet_led";
-+          pins = "gpio5";
-+        };
-+
-+        pinctrl_ephy0_led: ephy0_led {
-+          function = "ephy0_led";
-+          pins = "gpio6";
-+        };
-+
-+        pinctrl_ephy1_led: ephy1_led {
-+          function = "ephy1_led";
-+          pins = "gpio7";
-+        };
-+
-+        pinctrl_ephy2_led: ephy2_led {
-+          function = "ephy2_led";
-+          pins = "gpio8";
-+        };
-+
-+        pinctrl_ephy3_led: ephy3_led {
-+          function = "ephy3_led";
-+          pins = "gpio9";
-+        };
-+
-+        pinctrl_robosw_led_data: robosw_led_data {
-+          function = "robosw_led_data";
-+          pins = "gpio10";
-+        };
-+
-+        pinctrl_robosw_led_clk: robosw_led_clk {
-+          function = "robosw_led_clk";
-+          pins = "gpio11";
-+        };
-+
-+        pinctrl_robosw_led0: robosw_led0 {
-+          function = "robosw_led0";
-+          pins = "gpio12";
-+        };
-+
-+        pinctrl_robosw_led1: robosw_led1 {
-+          function = "robosw_led1";
-+          pins = "gpio13";
-+        };
-+
-+        pinctrl_usb_device_led: usb_device_led {
-+          function = "usb_device_led";
-+          pins = "gpio14";
-+        };
-+
-+        pinctrl_pci: pci {
-+          pinctrl_pci_req1: pci_req1 {
-+            function = "pci_req1";
-+            pins = "gpio16";
-+          };
-+
-+          pinctrl_pci_gnt1: pci_gnt1 {
-+            function = "pci_gnt1";
-+            pins = "gpio17";
-+          };
-+
-+          pinctrl_pci_intb: pci_intb {
-+            function = "pci_intb";
-+            pins = "gpio18";
-+          };
-+
-+          pinctrl_pci_req0: pci_req0 {
-+            function = "pci_req0";
-+            pins = "gpio19";
-+          };
-+
-+          pinctrl_pci_gnt0: pci_gnt0 {
-+            function = "pci_gnt0";
-+            pins = "gpio20";
-+          };
-+        };
-+
-+        pinctrl_pcmcia: pcmcia {
-+          pinctrl_pcmcia_cd1: pcmcia_cd1 {
-+            function = "pcmcia_cd1";
-+            pins = "gpio22";
-+          };
-+
-+          pinctrl_pcmcia_cd2: pcmcia_cd2 {
-+            function = "pcmcia_cd2";
-+            pins = "gpio23";
-+          };
-+
-+          pinctrl_pcmcia_vs1: pcmcia_vs1 {
-+            function = "pcmcia_vs1";
-+            pins = "gpio24";
-+          };
-+
-+          pinctrl_pcmcia_vs2: pcmcia_vs2 {
-+            function = "pcmcia_vs2";
-+            pins = "gpio25";
-+          };
-+        };
-+
-+        pinctrl_ebi_cs2: ebi_cs2 {
-+          function = "ebi_cs2";
-+          pins = "gpio26";
-+        };
-+
-+        pinctrl_ebi_cs3: ebi_cs3 {
-+          function = "ebi_cs3";
-+          pins = "gpio27";
-+        };
-+
-+        pinctrl_spi_cs2: spi_cs2 {
-+          function = "spi_cs2";
-+          pins = "gpio28";
-+        };
-+
-+        pinctrl_spi_cs3: spi_cs3 {
-+          function = "spi_cs3";
-+          pins = "gpio29";
-+        };
-+
-+        pinctrl_spi_cs4: spi_cs4 {
-+          function = "spi_cs4";
-+          pins = "gpio30";
-+        };
-+
-+        pinctrl_spi_cs5: spi_cs5 {
-+          function = "spi_cs5";
-+          pins = "gpio31";
-+        };
-+
-+        pinctrl_uart1: uart1 {
-+          function = "uart1";
-+          group = "uart1_grp";
-+        };
-+      };
-+    };
diff --git a/target/linux/bmips/patches-5.10/408-Documentation-add-BCM63268-pincontroller-binding-doc.patch b/target/linux/bmips/patches-5.10/408-Documentation-add-BCM63268-pincontroller-binding-doc.patch
deleted file mode 100644
index d51af84328..0000000000
--- a/target/linux/bmips/patches-5.10/408-Documentation-add-BCM63268-pincontroller-binding-doc.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 826266914f8397c996d2d4d821b315d614bfc325 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:37:08 +0200
-Subject: [PATCH 09/12] Documentation: add BCM63268 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in the BCM63268
-family SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm63268-pinctrl.yaml        | 198 ++++++++++++++++++
- 1 file changed, 198 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm63268-pinctrl.yaml
-@@ -0,0 +1,198 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm63268-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM63268 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm63268-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 4 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 4
-+    maxItems: 4
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ serial_led_clk, serial_led_data, hsspi_cs4, hsspi_cs5,
-+                  hsspi_cs6, hsspi_cs7, adsl_spi_miso, adsl_spi_mosi,
-+                  vreq_clk, pcie_clkreq_b, robosw_led_clk, robosw_led_data,
-+                  nand, gpio35_alt, dectpd, vdsl_phy_override_0,
-+                  vdsl_phy_override_1, vdsl_phy_override_2,
-+                  vdsl_phy_override_3, dsl_gpio8, dsl_gpio9 ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ gpio0, gpio1, gpio16, gpio17, gpio8, gpio9, gpio18, gpio19,
-+                  gpio22, gpio23, gpio30, gpio31, nand_grp, gpio35
-+                  dectpd_grp, vdsl_phy_override_0_grp,
-+                  vdsl_phy_override_1_grp, vdsl_phy_override_2_grp,
-+                  vdsl_phy_override_3_grp, dsl_gpio8, dsl_gpio9 ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@100000c0 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0x100000c0 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm63268-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc 0 0>,
-+                              <&ext_intc 1 0>,
-+                              <&ext_intc 2 0>,
-+                              <&ext_intc 3 0>;
-+        interrupt-names = "gpio32",
-+                          "gpio33",
-+                          "gpio34",
-+                          "gpio35";
-+
-+        pinctrl_serial_led: serial_led {
-+          pinctrl_serial_led_clk: serial_led_clk {
-+            function = "serial_led_clk";
-+            pins = "gpio0";
-+          };
-+
-+          pinctrl_serial_led_data: serial_led_data {
-+            function = "serial_led_data";
-+            pins = "gpio1";
-+          };
-+        };
-+
-+        pinctrl_hsspi_cs4: hsspi_cs4 {
-+          function = "hsspi_cs4";
-+          pins = "gpio16";
-+        };
-+
-+        pinctrl_hsspi_cs5: hsspi_cs5 {
-+          function = "hsspi_cs5";
-+          pins = "gpio17";
-+        };
-+
-+        pinctrl_hsspi_cs6: hsspi_cs6 {
-+          function = "hsspi_cs6";
-+          pins = "gpio8";
-+        };
-+
-+        pinctrl_hsspi_cs7: hsspi_cs7 {
-+          function = "hsspi_cs7";
-+          pins = "gpio9";
-+        };
-+
-+        pinctrl_adsl_spi: adsl_spi {
-+          pinctrl_adsl_spi_miso: adsl_spi_miso {
-+            function = "adsl_spi_miso";
-+            pins = "gpio18";
-+          };
-+
-+          pinctrl_adsl_spi_mosi: adsl_spi_mosi {
-+            function = "adsl_spi_mosi";
-+            pins = "gpio19";
-+          };
-+        };
-+
-+        pinctrl_vreq_clk: vreq_clk {
-+          function = "vreq_clk";
-+          pins = "gpio22";
-+        };
-+
-+        pinctrl_pcie_clkreq_b: pcie_clkreq_b {
-+          function = "pcie_clkreq_b";
-+          pins = "gpio23";
-+        };
-+
-+        pinctrl_robosw_led_clk: robosw_led_clk {
-+          function = "robosw_led_clk";
-+          pins = "gpio30";
-+        };
-+
-+        pinctrl_robosw_led_data: robosw_led_data {
-+          function = "robosw_led_data";
-+          pins = "gpio31";
-+        };
-+
-+        pinctrl_nand: nand {
-+          function = "nand";
-+          group = "nand_grp";
-+        };
-+
-+        pinctrl_gpio35_alt: gpio35_alt {
-+          function = "gpio35_alt";
-+          pin = "gpio35";
-+        };
-+
-+        pinctrl_dectpd: dectpd {
-+          function = "dectpd";
-+          group = "dectpd_grp";
-+        };
-+
-+        pinctrl_vdsl_phy_override_0: vdsl_phy_override_0 {
-+          function = "vdsl_phy_override_0";
-+          group = "vdsl_phy_override_0_grp";
-+        };
-+
-+        pinctrl_vdsl_phy_override_1: vdsl_phy_override_1 {
-+          function = "vdsl_phy_override_1";
-+          group = "vdsl_phy_override_1_grp";
-+        };
-+
-+        pinctrl_vdsl_phy_override_2: vdsl_phy_override_2 {
-+          function = "vdsl_phy_override_2";
-+          group = "vdsl_phy_override_2_grp";
-+        };
-+
-+        pinctrl_vdsl_phy_override_3: vdsl_phy_override_3 {
-+          function = "vdsl_phy_override_3";
-+          group = "vdsl_phy_override_3_grp";
-+        };
-+
-+        pinctrl_dsl_gpio8: dsl_gpio8 {
-+          function = "dsl_gpio8";
-+          group = "dsl_gpio8";
-+        };
-+
-+        pinctrl_dsl_gpio9: dsl_gpio9 {
-+          function = "dsl_gpio9";
-+          group = "dsl_gpio9";
-+        };
-+      };
-+    };
diff --git a/target/linux/bmips/patches-5.10/410-Documentation-add-BCM6318-pincontroller-binding-docu.patch b/target/linux/bmips/patches-5.10/410-Documentation-add-BCM6318-pincontroller-binding-docu.patch
deleted file mode 100644
index 6577038756..0000000000
--- a/target/linux/bmips/patches-5.10/410-Documentation-add-BCM6318-pincontroller-binding-docu.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From f909bf5d5cf3db6b35c082f27f7982dfcb1447c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Wed, 27 Jul 2016 11:38:05 +0200
-Subject: [PATCH 11/12] Documentation: add BCM6318 pincontroller binding
- documentation
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add binding documentation for the pincontrol core found in BCM6318 SoCs.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
----
- .../pinctrl/brcm,bcm6318-pinctrl.yaml         | 173 ++++++++++++++++++
- 1 file changed, 173 insertions(+)
- create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml
-
---- /dev/null
-+++ b/Documentation/devicetree/bindings/pinctrl/brcm,bcm6318-pinctrl.yaml
-@@ -0,0 +1,173 @@
-+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/pinctrl/brcm,bcm6318-pinctrl.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Broadcom BCM6318 pin controller
-+
-+maintainers:
-+  - Álvaro Fernández Rojas <noltari@gmail.com>
-+  - Jonas Gorski <jonas.gorski@gmail.com>
-+
-+description: |+
-+  The pin controller node should be the child of a syscon node.
-+
-+  Refer to the the bindings described in
-+  Documentation/devicetree/bindings/mfd/syscon.yaml
-+
-+properties:
-+  compatible:
-+    const: brcm,bcm6318-pinctrl
-+
-+  gpio-controller: true
-+
-+  '#gpio-cells':
-+    description:
-+      Specifies the pin number and flags, as defined in
-+      include/dt-bindings/gpio/gpio.h
-+    const: 2
-+
-+  interrupts-extended:
-+    description:
-+      One interrupt per each of the 2 GPIO ports supported by the controller,
-+      sorted by port number ascending order.
-+    minItems: 2
-+    maxItems: 2
-+
-+patternProperties:
-+  '^.*$':
-+    if:
-+      type: object
-+    then:
-+      properties:
-+        function:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ ephy0_spd_led, ephy1_spd_led, ephy2_spd_led, ephy3_spd_led,
-+                  ephy0_act_led, ephy1_act_led, ephy2_act_led, ephy3_act_led,
-+                  serial_led_data, serial_led_clk, inet_act_led, inet_fail_led,
-+                  dsl_led, post_fail_led, wlan_wps_led, usb_pwron,
-+                  usb_device_led, usb_active ]
-+
-+        pins:
-+          $ref: "/schemas/types.yaml#/definitions/string"
-+          enum: [ gpio0, gpio1, gpio2, gpio3, gpio4, gpio5, gpio6, gpio7,
-+                  gpio8, gpio9, gpio10, gpio11, gpio12, gpio13, gpio40 ]
-+
-+required:
-+  - compatible
-+  - gpio-controller
-+  - '#gpio-cells'
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    gpio@10000080 {
-+      compatible = "syscon", "simple-mfd";
-+      reg = <0x10000080 0x80>;
-+
-+      pinctrl: pinctrl {
-+        compatible = "brcm,bcm6318-pinctrl";
-+
-+        gpio-controller;
-+        #gpio-cells = <2>;
-+
-+        interrupts-extended = <&ext_intc 0 0>,
-+                              <&ext_intc 1 0>;
-+        interrupt-names = "gpio33",
-+                          "gpio34";
-+
-+        pinctrl_ephy0_spd_led: ephy0_spd_led {
-+          function = "ephy0_spd_led";
-+          pins = "gpio0";
-+        };
-+
-+        pinctrl_ephy1_spd_led: ephy1_spd_led {
-+          function = "ephy1_spd_led";
-+          pins = "gpio1";
-+        };
-+
-+        pinctrl_ephy2_spd_led: ephy2_spd_led {
-+          function = "ephy2_spd_led";
-+          pins = "gpio2";
-+        };
-+
-+        pinctrl_ephy3_spd_led: ephy3_spd_led {
-+          function = "ephy3_spd_led";
-+          pins = "gpio3";
-+        };
-+
-+        pinctrl_ephy0_act_led: ephy0_act_led {
-+          function = "ephy0_act_led";
-+          pins = "gpio4";
-+        };
-+
-+        pinctrl_ephy1_act_led: ephy1_act_led {
-+          function = "ephy1_act_led";
-+          pins = "gpio5";
-+        };
-+
-+        pinctrl_ephy2_act_led: ephy2_act_led {
-+          function = "ephy2_act_led";
-+          pins = "gpio6";
-+        };
-+
-+        pinctrl_ephy3_act_led: ephy3_act_led {
-+          function = "ephy3_act_led";
-+          pins = "gpio7";
-+        };
-+
-+        pinctrl_serial_led: serial_led {
-+          pinctrl_serial_led_data: serial_led_data {
-+            function = "serial_led_data";
-+            pins = "gpio6";
-+          };
-+
-+          pinctrl_serial_led_clk: serial_led_clk {
-+            function = "serial_led_clk";
-+            pins = "gpio7";
-+          };
-+        };
-+
-+        pinctrl_inet_act_led: inet_act_led {
-+          function = "inet_act_led";
-+          pins = "gpio8";
-+        };
-+
-+        pinctrl_inet_fail_led: inet_fail_led {
-+          function = "inet_fail_led";
-+          pins = "gpio9";
-+        };
-+
-+        pinctrl_dsl_led: dsl_led {
-+          function = "dsl_led";
-+          pins = "gpio10";
-+        };
-+
-+        pinctrl_post_fail_led: post_fail_led {
-+          function = "post_fail_led";
-+          pins = "gpio11";
-+        };
-+
-+        pinctrl_wlan_wps_led: wlan_wps_led {
-+          function = "wlan_wps_led";
-+          pins = "gpio12";
-+        };
-+
-+        pinctrl_usb_pwron: usb_pwron {
-+          function = "usb_pwron";
-+          pins = "gpio13";
-+        };
-+
-+        pinctrl_usb_device_led: usb_device_led {
-+          function = "usb_device_led";
-+          pins = "gpio13";
-+        };
-+
-+        pinctrl_usb_active: usb_active {
-+          function = "usb_active";
-+          pins = "gpio40";
-+        };
-+      };
-+    };