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>

1 files changed, 23 insertions, 26 deletions

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";
 				};