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, 45 insertions, 44 deletions

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