bmips: rewrite pin controllers

This is needed in order to upstream them.

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

1 files changed, 81 insertions, 76 deletions

diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi
index 07ae773fe4..f4f86c381e 100644
--- a/target/linux/bmips/dts/bcm6328.dtsi
+++ b/target/linux/bmips/dts/bcm6328.dtsi
@@ -146,97 +146,102 @@
 			mask = <0x1>;
 		};
 
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6328-pinctrl";
-			reg = <0x10000080 0x8>,
-			      <0x10000088 0x8>,
-			      <0x10000098 0x4>,
-			      <0x1000009c 0xc>;
-			reg-names = "dirout", "dat", "mode", "mux";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <3 0>, <2 0>, <0 0>, <1 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";
-				};
+		gpio: syscon@10000080 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x10000080 0x80>;
+			native-endian;
 
-				pinctrl_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio7";
+			pinctrl: pin-controller {
+				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_inet_act_led: inet_act_led {
+					function = "inet_act_led";
+					pins = "gpio11";
+				};
 
-			pinctrl_pcie_clkreq: pcie_clkreq {
-				function = "pcie_clkreq";
-				pins = "gpio16";
-			};
+				pinctrl_pcie_clkreq: pcie_clkreq {
+					function = "pcie_clkreq";
+					pins = "gpio16";
+				};
 
-			pinctrl_ephy0_spd_led: ephy0_spd_led {
-				function = "led";
-				pins = "gpio17";
-			};
+				pinctrl_ephy0_spd_led: ephy0_spd_led {
+					function = "led";
+					pins = "gpio17";
+				};
 
-			pinctrl_ephy1_spd_led: ephy1_spd_led {
-				function = "led";
-				pins = "gpio18";
-			};
+				pinctrl_ephy1_spd_led: ephy1_spd_led {
+					function = "led";
+					pins = "gpio18";
+				};
 
-			pinctrl_ephy2_spd_led: ephy2_spd_led {
-				function = "led";
-				pins = "gpio19";
-			};
+				pinctrl_ephy2_spd_led: ephy2_spd_led {
+					function = "led";
+					pins = "gpio19";
+				};
 
-			pinctrl_ephy3_spd_led: ephy3_spd_led {
-				function = "led";
-				pins = "gpio20";
-			};
+				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_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_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_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_ephy3_act_led: ephy3_act_led {
+					function = "ephy3_act_led";
+					pins = "gpio28";
+				};
 
-			pinctrl_hsspi_cs1: hsspi_cs1 {
-				function = "hsspi_cs1";
-				pins = "hsspi_cs1";
-			};
+				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_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";
+				pinctrl_usb_port1_host: usb_port1_host {
+					function = "usb_host_port";
+					pins = "usb_port1";
+				};
 			};
 		};