X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fdts%2Fnb4-fxc-r1.dts;h=3b8a15d2d6ff5f70cace3b93e8819d3bceb3e3b2;hb=7b75349b3a13074b63d5d7cabeea9c0e20faa265;hp=65f26c728129878e64f4fbc255d712c7d862ae2a;hpb=4981c7da0d8e4a7c882f0665f8857cfd56e7b797;p=openwrt%2Fstaging%2Fnoltari.git

diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index 65f26c7281..3b8a15d2d6 100644
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -8,24 +8,8 @@
 	model = "SFR Neuf Box 4 (Foxconn)";
 	compatible = "sfr,nb4-fxc-r1", "brcm,bcm6358";
 
-	spi-gpio {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "spi-gpio";
-
-		gpio-mosi = <&gpio0 7 0>;
-		gpio-sck = <&gpio0 6 0>;
-		num-chipselects = <0>;
-
-		hc595: gpio-spi-controller@0 {
-			compatible = "fairchild,74hc595";
-			reg = <0>;
-			registers-number = <1>;
-			spi-max-frequency = <100000>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-		};
+	chosen {
+		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
 	};
 
 	gpio-keys-polled {
@@ -37,22 +21,22 @@
 
 		service {
 			label = "service";
-			gpios = <&gpio0 27 1>;
+			gpios = <&pinctrl 27 1>;
 			linux,code = <BTN_0>;
 		};
 		clip {
 			label = "clip";
-			gpios = <&gpio0 31 1>;
+			gpios = <&pinctrl 31 1>;
 			linux,code = <BTN_1>;
 		};
 		reset {
 			label = "reset";
-			gpios = <&gpio1 2 1>;
+			gpios = <&pinctrl 34 1>;
 			linux,code = <KEY_RESTART>;
 		};
 		wps {
 			label = "wps";
-			gpios = <&gpio1 5 1>;
+			gpios = <&pinctrl 37 1>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 	};
@@ -62,39 +46,53 @@
 
 		traffic_white {
 			label = "NB4-FXC-r1:white:traffic";
-			gpios = <&gpio0 2 0>;
+			gpios = <&pinctrl 2 0>;
 		};
 		service_blue {
 			label = "NB4-FXC-r1:blue:service";
-			gpios = <&gpio0 4 0>;
+			gpios = <&pinctrl 4 0>;
 		};
 		wifi_white {
 			label = "NB4-FXC-r1:white:wifi";
-			gpios = <&gpio0 15 0>;
+			gpios = <&pinctrl 15 0>;
 		};
 		service_red {
 			label = "NB4-FXC-r1:red:service";
-			gpios = <&gpio0 29 0>;
+			gpios = <&pinctrl 29 0>;
 		};
 		service_green {
 			label = "NB4-FXC-r1:green:service";
-			gpios = <&gpio0 30 0>;
-		};
-		alarm_white {
-			label = "NB4-FXC-r1:white:alarm";
-			gpios = <&hc595 0 1>;
-		};
-		tv_white {
-			label = "NB4-FXC-r1:white:tv";
-			gpios = <&hc595 2 1>;
-		};
-		tel_white {
-			label = "NB4-FXC-r1:white:tel";
-			gpios = <&hc595 3 1>;
-		};
-		adsl_white {
-			label = "NB4-FXC-r0:white:adsl";
-			gpios = <&hc595 4 1>;
+			gpios = <&pinctrl 30 0>;
 		};
 	};
 };
+
+&leds0 {
+	status = "ok";
+
+	alarm_white@0 {
+		reg = <0>;
+		active-low;
+		label = "NB4-FXC-r1:white:alarm";
+	};
+	tv_white@2 {
+		reg = <2>;
+		active-low;
+		label = "NB4-FXC-r1:white:tv";
+	};
+	tel_white@3 {
+		reg = <3>;
+		active-low;
+		label = "NB4-FXC-r1:white:tel";
+	};
+	adsl_white@4 {
+		reg = <4>;
+		active-low;
+		label = "NB4-FXC-r0:white:adsl";
+ 	};
+};
+
+&pinctrl {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet1_mii_clk_inv>;
+};