bmips: rewrite pin controllers

This is needed in order to upstream them.

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

6 files changed, 624 insertions, 607 deletions

diff --git a/target/linux/bmips/dts/bcm6318.dtsi b/target/linux/bmips/dts/bcm6318.dtsi
index ba12390814..d19f8ec964 100644
--- a/target/linux/bmips/dts/bcm6318.dtsi
+++ b/target/linux/bmips/dts/bcm6318.dtsi
@@ -143,112 +143,113 @@
 			mask = <0x1>;
 		};
 
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6318-pinctrl";
-			reg = <0x10000080 0x08>,
-			      <0x10000088 0x08>,
-			      <0x10000098 0x04>,
-			      <0x1000009c 0x0c>,
-			      <0x100000d4 0x18>;
-			reg-names = "dirout", "dat", "mode", "mux", "pad";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <0 0>, <1 0>;
-			interrupt-names = "gpio33", "gpio34";
-
-			pinctrl_ephy0_spd_led: ephy0_spd_led {
-				function = "ephy0_spd_led";
-				pins = "gpio0";
-			};
+		gpio: syscon@10000080 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x10000080 0x80>;
+			native-endian;
 
-			pinctrl_ephy1_spd_led: ephy1_spd_led {
-				function = "ephy1_spd_led";
-				pins = "gpio1";
-			};
+			pinctrl: pin-controller {
+				compatible = "brcm,bcm6318-pinctrl";
 
-			pinctrl_ephy2_spd_led: ephy2_spd_led {
-				function = "ephy2_spd_led";
-				pins = "gpio2";
-			};
+				gpio-controller;
+				#gpio-cells = <2>;
 
-			pinctrl_ephy3_spd_led: ephy3_spd_led {
-				function = "ephy3_spd_led";
-				pins = "gpio3";
-			};
+				interrupts-extended = <&ext_intc 0 0>,
+						      <&ext_intc 1 0>;
+				interrupt-names = "gpio33",
+						  "gpio34";
 
-			pinctrl_ephy0_act_led: ephy0_act_led {
-				function = "ephy0_act_led";
-				pins = "gpio4";
-			};
+				pinctrl_ephy0_spd_led: ephy0_spd_led {
+					function = "ephy0_spd_led";
+					pins = "gpio0";
+				};
 
-			pinctrl_ephy1_act_led: ephy1_act_led {
-				function = "ephy1_act_led";
-				pins = "gpio5";
-			};
+				pinctrl_ephy1_spd_led: ephy1_spd_led {
+					function = "ephy1_spd_led";
+					pins = "gpio1";
+				};
 
-			pinctrl_ephy2_act_led: ephy2_act_led {
-				function = "ephy2_act_led";
-				pins = "gpio6";
-			};
+				pinctrl_ephy2_spd_led: ephy2_spd_led {
+					function = "ephy2_spd_led";
+					pins = "gpio2";
+				};
 
-			pinctrl_ephy3_act_led: ephy3_act_led {
-				function = "ephy3_act_led";
-				pins = "gpio7";
-			};
+				pinctrl_ephy3_spd_led: ephy3_spd_led {
+					function = "ephy3_spd_led";
+					pins = "gpio3";
+				};
 
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
+				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_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
+				pinctrl_ephy3_act_led: ephy3_act_led {
+					function = "ephy3_act_led";
 					pins = "gpio7";
 				};
-			};
 
-			pinctrl_inet_act_led: inet_act_led {
-				function = "inet_act_led";
-				pins = "gpio8";
-			};
+				pinctrl_serial_led: serial_led {
+					pinctrl_serial_led_data: serial_led_data {
+						function = "serial_led_data";
+						pins = "gpio6";
+					};
 
-			pinctrl_inet_fail_led: inet_fail_led {
-				function = "inet_fail_led";
-				pins = "gpio9";
-			};
+					pinctrl_serial_led_clk: serial_led_clk {
+						function = "serial_led_clk";
+						pins = "gpio7";
+					};
+				};
 
-			pinctrl_dsl_led: dsl_led {
-				function = "dsl_led";
-				pins = "gpio10";
-			};
+				pinctrl_inet_act_led: inet_act_led {
+					function = "inet_act_led";
+					pins = "gpio8";
+				};
 
-			pinctrl_post_fail_led: post_fail_led {
-				function = "post_fail_led";
-				pins = "gpio11";
-			};
+				pinctrl_inet_fail_led: inet_fail_led {
+					function = "inet_fail_led";
+					pins = "gpio9";
+				};
 
-			pinctrl_wlan_wps_led: wlan_wps_led {
-				function = "wlan_wps_led";
-				pins = "gpio12";
-			};
+				pinctrl_dsl_led: dsl_led {
+					function = "dsl_led";
+					pins = "gpio10";
+				};
 
-			pinctrl_usb_pwron: usb_pwron {
-				function = "usb_pwron";
-				pins = "gpio13";
-			};
+				pinctrl_post_fail_led: post_fail_led {
+					function = "post_fail_led";
+					pins = "gpio11";
+				};
 
-			pinctrl_usb_device_led: usb_device_led {
-				function = "usb_device_led";
-				pins = "gpio13";
-			};
+				pinctrl_wlan_wps_led: wlan_wps_led {
+					function = "wlan_wps_led";
+					pins = "gpio12";
+				};
 
-			pinctrl_usb_active: usb_active {
-				function = "usb_active";
-				pins = "gpio40";
+				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";
+				};
 			};
 		};
 
diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index be98bf181e..538b43754b 100644
--- a/target/linux/bmips/dts/bcm63268.dtsi
+++ b/target/linux/bmips/dts/bcm63268.dtsi
@@ -147,131 +147,134 @@
 			timeout-sec = <30>;
 		};
 
-		pinctrl: pin-controller@100000c0 {
-			compatible = "brcm,bcm63268-pinctrl";
-			reg = <0x100000c0 0x8>,
-			      <0x100000c8 0x8>,
-			      <0x100000d0 0x4>,
-			      <0x100000d8 0x4>,
-			      <0x100000dc 0x4>,
-			      <0x100000f8 0x4>;
-			reg-names = "dirout", "dat", "led", "mode",
-				    "ctrl", "basemode";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <0 0>, <1 0>, <2 0>, <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";
+		gpio: syscon@100000c0 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x100000c0 0x80>;
+			native-endian;
+
+			pinctrl: pin-controller {
+				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_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio1";
+				pinctrl_hsspi_cs4: hsspi_cs4 {
+					function = "hsspi_cs4";
+					pins = "gpio16";
 				};
-			};
 
-			pinctrl_hsspi_cs4: hsspi_cs4 {
-				function = "hsspi_cs4";
-				pins = "gpio16";
-			};
+				pinctrl_hsspi_cs5: hsspi_cs5 {
+					function = "hsspi_cs5";
+					pins = "gpio17";
+				};
 
-			pinctrl_hsspi_cs5: hsspi_cs5 {
-				function = "hsspi_cs5";
-				pins = "gpio17";
-			};
+				pinctrl_hsspi_cs6: hsspi_cs6 {
+					function = "hsspi_cs6";
+					pins = "gpio8";
+				};
 
-			pinctrl_hsspi_cs6: hsspi_cs6 {
-				function = "hsspi_cs6";
-				pins = "gpio8";
-			};
+				pinctrl_hsspi_cs7: hsspi_cs7 {
+					function = "hsspi_cs7";
+					pins = "gpio9";
+				};
 
-			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: 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_adsl_spi_mosi: adsl_spi_mosi {
-					function = "adsl_spi_mosi";
-					pins = "gpio19";
+				pinctrl_vreq_clk: vreq_clk {
+					function = "vreq_clk";
+					pins = "gpio22";
 				};
-			};
 
-			pinctrl_vreq_clk: vreq_clk {
-				function = "vreq_clk";
-				pins = "gpio22";
-			};
-
-			pinctrl_pcie_clkreq_b: pcie_clkreq_b {
-				function = "pcie_clkreq_b";
-				pins = "gpio23";
-			};
+				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_clk: robosw_led_clk {
+					function = "robosw_led_clk";
+					pins = "gpio30";
+				};
 
-			pinctrl_robosw_led_data: robosw_led_data {
-				function = "robosw_led_data";
-				pins = "gpio31";
-			};
+				pinctrl_robosw_led_data: robosw_led_data {
+					function = "robosw_led_data";
+					pins = "gpio31";
+				};
 
-			pinctrl_nand: nand {
-				function = "nand";
-				group = "nand_grp";
-			};
+				pinctrl_nand: nand {
+					function = "nand";
+					group = "nand_grp";
+				};
 
-			pinctrl_gpio35_alt: gpio35_alt {
-				function = "gpio35_alt";
-				pin = "gpio35";
-			};
+				pinctrl_gpio35_alt: gpio35_alt {
+					function = "gpio35_alt";
+					pin = "gpio35";
+				};
 
-			pinctrl_dectpd: dectpd {
-				function = "dectpd";
-				group = "dectpd_grp";
-			};
+				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_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_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_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_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_gpio8: dsl_gpio8 {
+					function = "dsl_gpio8";
+					group = "dsl_gpio8";
+				};
 
-			pinctrl_dsl_gpio9: dsl_gpio9 {
-				function = "dsl_gpio9";
-				group = "dsl_gpio9";
+				pinctrl_dsl_gpio9: dsl_gpio9 {
+					function = "dsl_gpio9";
+					group = "dsl_gpio9";
+				};
 			};
 		};
 
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";
+				};
 			};
 		};
 
diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi
index 83cfb0ad90..8e2c9fa0ee 100644
--- a/target/linux/bmips/dts/bcm6358.dtsi
+++ b/target/linux/bmips/dts/bcm6358.dtsi
@@ -158,76 +158,77 @@
 			timeout-sec = <30>;
 		};
 
-		pinctrl: pin-controller@fffe0080 {
-			compatible = "brcm,bcm6358-pinctrl";
-			reg = <0xfffe0080 0x8>,
-			      <0xfffe0088 0x8>;
-			reg-names = "dirout", "dat", "mode";
-			brcm,gpiomode = <&gpiomode>;
-
-			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";
-			};
+		gpio: syscon@fffe0080 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0xfffe0080 0x50>;
+			native-endian;
 
-			pinctrl_sys_irq: sys_irq {
-				function = "sys_irq";
-				groups = "sys_irq_grp";
+			pinctrl: pin-controller {
+				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";
+				};
 			};
 		};
 
-		gpiomode: gpiomode@fffe0098 {
-			compatible = "brcm,bcm6358-gpiomode", "syscon";
-			reg = <0xfffe0098 0x4>;
-		};
-
 		leds: led-controller@fffe00d0 {
 			#address-cells = <1>;
 			#size-cells = <0>;
diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi
index 724ce5a2f8..d531ed4fe5 100644
--- a/target/linux/bmips/dts/bcm6362.dtsi
+++ b/target/linux/bmips/dts/bcm6362.dtsi
@@ -147,174 +147,176 @@
 			timeout-sec = <30>;
 		};
 
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6362-pinctrl";
-			reg = <0x10000080 0x8>,
-			      <0x10000088 0x8>,
-			      <0x10000090 0x4>,
-			      <0x10000098 0x4>,
-			      <0x1000009c 0x4>,
-			      <0x100000b8 0x4>;
-			reg-names = "dirout", "dat", "led",
-				    "mode", "ctrl", "basemode";
-
-			gpio-controller;
-			#gpio-cells = <2>;
-
-			interrupt-parent = <&ext_intc>;
-			interrupts = <0 0>, <1 0>, <2 0>, <3 0>;
-			interrupt-names = "gpio24", "gpio25",
-					  "gpio26", "gpio27";
-
-			pinctrl_usb_device_led: usb_device_led {
-				function = "usb_device_led";
-				pins = "gpio0";
-			};
+		gpio: syscon@10000080 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x10000080 0x80>;
+			native-endian;
 
-			pinctrl_sys_irq: sys_irq {
-				function = "sys_irq";
-				pins = "gpio1";
-			};
+			pinctrl: pin-controller {
+				compatible = "brcm,bcm6362-pinctrl";
 
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio2";
-				};
+				gpio-controller;
+				#gpio-cells = <2>;
 
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio3";
-				};
-			};
+				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_robosw_led_data: robosw_led_data {
-				function = "robosw_led_data";
-				pins = "gpio4";
-			};
+				pinctrl_usb_device_led: usb_device_led {
+					function = "usb_device_led";
+					pins = "gpio0";
+				};
 
-			pinctrl_robosw_led_clk: robosw_led_clk {
-				function = "robosw_led_clk";
-				pins = "gpio5";
-			};
+				pinctrl_sys_irq: sys_irq {
+					function = "sys_irq";
+					pins = "gpio1";
+				};
 
-			pinctrl_robosw_led0: robosw_led0 {
-				function = "robosw_led0";
-				pins = "gpio6";
-			};
+				pinctrl_serial_led: serial_led {
+					pinctrl_serial_led_clk: serial_led_clk {
+						function = "serial_led_clk";
+						pins = "gpio2";
+					};
 
-			pinctrl_robosw_led1: robosw_led1 {
-				function = "robosw_led1";
-				pins = "gpio7";
-			};
+					pinctrl_serial_led_data: serial_led_data {
+						function = "serial_led_data";
+						pins = "gpio3";
+					};
+				};
 
-			pinctrl_inet_led: inet_led {
-				function = "inet_led";
-				pins = "gpio8";
-			};
+				pinctrl_robosw_led_data: robosw_led_data {
+					function = "robosw_led_data";
+					pins = "gpio4";
+				};
 
-			pinctrl_spi_cs2: spi_cs2 {
-				function = "spi_cs2";
-				pins = "gpio9";
-			};
+				pinctrl_robosw_led_clk: robosw_led_clk {
+					function = "robosw_led_clk";
+					pins = "gpio5";
+				};
 
-			pinctrl_spi_cs3: spi_cs3 {
-				function = "spi_cs3";
-				pins = "gpio10";
-			};
+				pinctrl_robosw_led0: robosw_led0 {
+					function = "robosw_led0";
+					pins = "gpio6";
+				};
 
-			pinctrl_ntr_pulse: ntr_pulse {
-				function = "ntr_pulse";
-				pins = "gpio11";
-			};
+				pinctrl_robosw_led1: robosw_led1 {
+					function = "robosw_led1";
+					pins = "gpio7";
+				};
 
-			pinctrl_uart1_scts: uart1_scts {
-				function = "uart1_scts";
-				pins = "gpio12";
-			};
+				pinctrl_inet_led: inet_led {
+					function = "inet_led";
+					pins = "gpio8";
+				};
 
-			pinctrl_uart1_srts: uart1_srts {
-				function = "uart1_srts";
-				pins = "gpio13";
-			};
+				pinctrl_spi_cs2: spi_cs2 {
+					function = "spi_cs2";
+					pins = "gpio9";
+				};
 
-			pinctrl_uart1: uart1 {
-				pinctrl_uart1_sdin: uart1_sdin {
-					function = "uart1_sdin";
-					pins = "gpio14";
+				pinctrl_spi_cs3: spi_cs3 {
+					function = "spi_cs3";
+					pins = "gpio10";
 				};
 
-				pinctrl_uart1_sdout: uart1_sdout {
-					function = "uart1_sdout";
-					pins = "gpio15";
+				pinctrl_ntr_pulse: ntr_pulse {
+					function = "ntr_pulse";
+					pins = "gpio11";
 				};
-			};
 
-			pinctrl_adsl_spi: adsl_spi {
-				pinctrl_adsl_spi_miso: adsl_spi_miso {
-					function = "adsl_spi_miso";
-					pins = "gpio16";
+				pinctrl_uart1_scts: uart1_scts {
+					function = "uart1_scts";
+					pins = "gpio12";
 				};
 
-				pinctrl_adsl_spi_mosi: adsl_spi_mosi {
-					function = "adsl_spi_mosi";
-					pins = "gpio17";
+				pinctrl_uart1_srts: uart1_srts {
+					function = "uart1_srts";
+					pins = "gpio13";
 				};
 
-				pinctrl_adsl_spi_clk: adsl_spi_clk {
-					function = "adsl_spi_clk";
-					pins = "gpio18";
+				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_cs: adsl_spi_cs {
-					function = "adsl_spi_cs";
-					pins = "gpio19";
+				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_ephy0_led: ephy0_led {
+					function = "ephy0_led";
+					pins = "gpio20";
+				};
 
-			pinctrl_ephy1_led: ephy1_led {
-				function = "ephy1_led";
-				pins = "gpio21";
-			};
+				pinctrl_ephy1_led: ephy1_led {
+					function = "ephy1_led";
+					pins = "gpio21";
+				};
 
-			pinctrl_ephy2_led: ephy2_led {
-				function = "ephy2_led";
-				pins = "gpio22";
-			};
+				pinctrl_ephy2_led: ephy2_led {
+					function = "ephy2_led";
+					pins = "gpio22";
+				};
 
-			pinctrl_ephy3_led: ephy3_led {
-				function = "ephy3_led";
-				pins = "gpio23";
-			};
+				pinctrl_ephy3_led: ephy3_led {
+					function = "ephy3_led";
+					pins = "gpio23";
+				};
 
-			pinctrl_ext_irq0: ext_irq0 {
-				function = "ext_irq0";
-				pins = "gpio24";
-			};
+				pinctrl_ext_irq0: ext_irq0 {
+					function = "ext_irq0";
+					pins = "gpio24";
+				};
 
-			pinctrl_ext_irq1: ext_irq1 {
-				function = "ext_irq1";
-				pins = "gpio25";
-			};
+				pinctrl_ext_irq1: ext_irq1 {
+					function = "ext_irq1";
+					pins = "gpio25";
+				};
 
-			pinctrl_ext_irq2: ext_irq2 {
-				function = "ext_irq2";
-				pins = "gpio26";
-			};
+				pinctrl_ext_irq2: ext_irq2 {
+					function = "ext_irq2";
+					pins = "gpio26";
+				};
 
-			pinctrl_ext_irq3: ext_irq3 {
-				function = "ext_irq3";
-				pins = "gpio27";
-			};
+				pinctrl_ext_irq3: ext_irq3 {
+					function = "ext_irq3";
+					pins = "gpio27";
+				};
 
-			pinctrl_nand: nand {
-				function = "nand";
-				group = "nand_grp";
+				pinctrl_nand: nand {
+					function = "nand";
+					group = "nand_grp";
+				};
 			};
 		};
 
diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index babd8c7385..0b434c5c01 100644
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -149,185 +149,190 @@
 			timeout-sec = <30>;
 		};
 
-		pinctrl: pin-controller@10000080 {
-			compatible = "brcm,bcm6368-pinctrl";
-			reg = <0x10000080 0x8>,
-			      <0x10000088 0x8>,
-			      <0x10000098 0x4>;
-			reg-names = "dirout", "dat", "mode";
-			brcm,gpiobasemode = <&gpiobasemode>;
-
-			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";
-			};
+		gpio: syscon@10000080 {
+			compatible = "syscon", "simple-mfd";
+			reg = <0x10000080 0x80>;
+			native-endian;
 
-			pinctrl_serial_led: serial_led {
-				pinctrl_serial_led_data: serial_led_data {
-					function = "serial_led_data";
-					pins = "gpio3";
+			pinctrl: pin-controller {
+				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_serial_led_clk: serial_led_clk {
-					function = "serial_led_clk";
-					pins = "gpio4";
+				pinctrl_analog_afe_1: analog_afe_1 {
+					function = "analog_afe_1";
+					pins = "gpio1";
 				};
-			};
-
-			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_sys_irq: sys_irq {
+					function = "sys_irq";
+					pins = "gpio2";
+				};
 
-			pinctrl_robosw_led_data: robosw_led_data {
-				function = "robosw_led_data";
-				pins = "gpio10";
-			};
+				pinctrl_serial_led: serial_led {
+					pinctrl_serial_led_data: serial_led_data {
+						function = "serial_led_data";
+						pins = "gpio3";
+					};
 
-			pinctrl_robosw_led_clk: robosw_led_clk {
-				function = "robosw_led_clk";
-				pins = "gpio11";
-			};
+					pinctrl_serial_led_clk: serial_led_clk {
+						function = "serial_led_clk";
+						pins = "gpio4";
+					};
+				};
 
-			pinctrl_robosw_led0: robosw_led0 {
-				function = "robosw_led0";
-				pins = "gpio12";
-			};
+				pinctrl_inet_led: inet_led {
+					function = "inet_led";
+					pins = "gpio5";
+				};
 
-			pinctrl_robosw_led1: robosw_led1 {
-				function = "robosw_led1";
-				pins = "gpio13";
-			};
+				pinctrl_ephy0_led: ephy0_led {
+					function = "ephy0_led";
+					pins = "gpio6";
+				};
 
-			pinctrl_usb_device_led: usb_device_led {
-				function = "usb_device_led";
-				pins = "gpio14";
-			};
+				pinctrl_ephy1_led: ephy1_led {
+					function = "ephy1_led";
+					pins = "gpio7";
+				};
 
-			pinctrl_pci: pci {
-				pinctrl_pci_req1: pci_req1 {
-					function = "pci_req1";
-					pins = "gpio16";
+				pinctrl_ephy2_led: ephy2_led {
+					function = "ephy2_led";
+					pins = "gpio8";
 				};
 
-				pinctrl_pci_gnt1: pci_gnt1 {
-					function = "pci_gnt1";
-					pins = "gpio17";
+				pinctrl_ephy3_led: ephy3_led {
+					function = "ephy3_led";
+					pins = "gpio9";
 				};
 
-				pinctrl_pci_intb: pci_intb {
-					function = "pci_intb";
-					pins = "gpio18";
+				pinctrl_robosw_led_data: robosw_led_data {
+					function = "robosw_led_data";
+					pins = "gpio10";
 				};
 
-				pinctrl_pci_req0: pci_req0 {
-					function = "pci_req0";
-					pins = "gpio19";
+				pinctrl_robosw_led_clk: robosw_led_clk {
+					function = "robosw_led_clk";
+					pins = "gpio11";
 				};
 
-				pinctrl_pci_gnt0: pci_gnt0 {
-					function = "pci_gnt0";
-					pins = "gpio20";
+				pinctrl_robosw_led0: robosw_led0 {
+					function = "robosw_led0";
+					pins = "gpio12";
 				};
-			};
 
-			pinctrl_pcmcia: pcmcia {
-				pinctrl_pcmcia_cd1: pcmcia_cd1 {
-					function = "pcmcia_cd1";
-					pins = "gpio22";
+				pinctrl_robosw_led1: robosw_led1 {
+					function = "robosw_led1";
+					pins = "gpio13";
 				};
 
-				pinctrl_pcmcia_cd2: pcmcia_cd2 {
-					function = "pcmcia_cd2";
-					pins = "gpio23";
+				pinctrl_usb_device_led: usb_device_led {
+					function = "usb_device_led";
+					pins = "gpio14";
 				};
 
-				pinctrl_pcmcia_vs1: pcmcia_vs1 {
-					function = "pcmcia_vs1";
-					pins = "gpio24";
+				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_vs2: pcmcia_vs2 {
-					function = "pcmcia_vs2";
-					pins = "gpio25";
+				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_cs2: ebi_cs2 {
+					function = "ebi_cs2";
+					pins = "gpio26";
+				};
 
-			pinctrl_ebi_cs3: ebi_cs3 {
-				function = "ebi_cs2";
-				pins = "gpio27";
-			};
+				pinctrl_ebi_cs3: ebi_cs3 {
+					function = "ebi_cs3";
+					pins = "gpio27";
+				};
 
-			pinctrl_spi_cs2: spi_cs2 {
-				function = "spi_cs2";
-				pins = "gpio28";
-			};
+				pinctrl_spi_cs2: spi_cs2 {
+					function = "spi_cs2";
+					pins = "gpio28";
+				};
 
-			pinctrl_spi_cs3: spi_cs3 {
-				function = "spi_cs3";
-				pins = "gpio29";
-			};
+				pinctrl_spi_cs3: spi_cs3 {
+					function = "spi_cs3";
+					pins = "gpio29";
+				};
 
-			pinctrl_spi_cs4: spi_cs4 {
-				function = "spi_cs4";
-				pins = "gpio30";
-			};
+				pinctrl_spi_cs4: spi_cs4 {
+					function = "spi_cs4";
+					pins = "gpio30";
+				};
 
-			pinctrl_spi_cs5: spi_cs5 {
-				function = "spi_cs5";
-				pins = "gpio31";
-			};
+				pinctrl_spi_cs5: spi_cs5 {
+					function = "spi_cs5";
+					pins = "gpio31";
+				};
 
-			pinctrl_uart1: uart1 {
-				function = "uart1";
-				group = "uart1_grp";
+				pinctrl_uart1: uart1 {
+					function = "uart1";
+					group = "uart1_grp";
+				};
 			};
 		};