brcm63xx: switch to new partition layout specification

[oweals/openwrt.git] / target / linux / brcm63xx / dts / nb4-fxc-r1.dts

diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index 0e9cc24986643c4219a75f9eaa09df20e8bbdce4..eba4b206fe0933ca5029a8b8d0d805ef16590441 100644 (file)
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -1,29 +1,16 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        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";
+               stdout-path = "serial0:115200n8";
        };
 
        gpio-keys-polled {
@@ -35,23 +22,23 @@
 
                service {
                        label = "service";
-                       gpios = <&gpio0 27 1>;
-                       linux,code = <0x100>;
+                       gpios = <&pinctrl 27 1>;
+                       linux,code = <BTN_0>;
                };
                clip {
                        label = "clip";
-                       gpios = <&gpio0 31 1>;
-                       linux,code = <0x101>;
+                       gpios = <&pinctrl 31 1>;
+                       linux,code = <BTN_1>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio1 2 1>;
-                       linux,code = <0x198>;
+                       gpios = <&pinctrl 34 1>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
-                       gpios = <&gpio1 5 1>;
-                       linux,code = <0x211>;
+                       gpios = <&pinctrl 37 1>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 
@@ -60,39 +47,68 @@
 
                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>;
                };
        };
 };
+
+&leds {
+       status = "ok";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_serial_led>;
+
+       led@0 {
+               reg = <0>;
+               active-low;
+               label = "NB4-FXC-r1:white:alarm";
+       };
+
+       led@2 {
+               reg = <2>;
+               active-low;
+               label = "NB4-FXC-r1:white:tv";
+       };
+
+       led@3 {
+               reg = <3>;
+               active-low;
+               label = "NB4-FXC-r1:white:tel";
+       };
+
+       led@4 {
+               reg = <4>;
+               active-low;
+               label = "NB4-FXC-r1:white:adsl";
+       };
+};
+
+&pflash {
+       status = "ok";
+
+       linux,part-probe = "bcm63xxpart";
+
+       partitions {
+               compatible = "brcm,bcm963xx-cfe-nor-partitions";
+       };
+};
+
+&uart0 {
+       status = "ok";
+};