1 files changed, 86 insertions, 85 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";
+				};
 			};
 		};