X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm63xx%2Fdts%2Fnb4-ser-r0.dts;h=09b34cc9dea483e86a2eb3015653bb908b06e273;hb=7880a6f7fee89efe9e5e4c707b59ba45f02e21cf;hp=75cb214e4418282bdc6edc599597c4eef4df1c19;hpb=97b36aca09da7a1b214f4616a8549e99ff2d92aa;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
index 75cb214e44..09b34cc9de 100644
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
@@ -9,27 +9,8 @@
 	compatible = "sfr,nb4-ser-r0", "brcm,bcm6358";
 
 	chosen {
-		bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
-	};
-
-	spi-gpio {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		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>;
-		};
+		bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+		stdout-path = "serial0:115200n8";
 	};
 
 	gpio-keys-polled {
@@ -41,22 +22,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>;
 		};
 	};
@@ -66,45 +47,66 @@
 
 		traffic_white {
 			label = "NB4-SER-r0:white:traffic";
-			gpios = <&gpio0 2 1>;
+			gpios = <&pinctrl 2 1>;
 		};
 		service_blue {
 			label = "NB4-SER-r0:blue:service";
-			gpios = <&gpio0 4 1>;
+			gpios = <&pinctrl 4 1>;
 		};
 		wifi_white {
 			label = "NB4-SER-r0:white:wifi";
-			gpios = <&gpio0 15 1>;
+			gpios = <&pinctrl 15 1>;
 		};
 		service_red {
 			label = "NB4-SER-r0:red:service";
-			gpios = <&gpio0 29 1>;
+			gpios = <&pinctrl 29 1>;
 		};
 		service_green {
 			label = "NB4-SER-r0:green:service";
-			gpios = <&gpio0 30 1>;
-		};
-		alarm_white {
-			label = "NB4-SER-r0:white:alarm";
-			gpios = <&hc595 0 1>;
-		};
-		tv_white {
-			label = "NB4-SER-r0:white:tv";
-			gpios = <&hc595 2 1>;
-		};
-		tel_white {
-			label = "NB4-SER-r0:white:tel";
-			gpios = <&hc595 3 1>;
-		};
-		adsl_white {
-			label = "NB4-SER-r0:white:adsl";
-			gpios = <&hc595 4 1>;
+			gpios = <&pinctrl 30 1>;
 		};
 	};
 };
 
+&leds {
+	status = "ok";
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_serial_led>;
+
+	led@0 {
+		reg = <0>;
+		active-low;
+		label = "NB4-SER-r0:white:alarm";
+	};
+
+	led@2 {
+		reg = <2>;
+		active-low;
+		label = "NB4-SER-r0:white:tv";
+	};
+
+	led@3 {
+		reg = <3>;
+		active-low;
+		label = "NB4-SER-r0:white:tel";
+	};
+
+	led@4 {
+		reg = <4>;
+		active-low;
+		label = "NB4-SER-r0:white:adsl";
+	};
+};
+
 &pflash {
 	status = "ok";
 
-	linux,part-probe = "bcm63xxpart";
+	partitions {
+		compatible = "brcm,bcm963xx-cfe-nor-partitions";
+	};
+};
+
+&uart0 {
+	status = "ok";
 };