brcm63xx: drop linux,part-probe usage where possible

[openwrt/openwrt.git] / target / linux / brcm63xx / dts / homehub2a.dts

diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index 28de52871c1b0c9be5dab7d81407110fb6d08b07..dfc3f1380b2c56dedcdce9154da53d2f3d2c953c 100644 (file)
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -1,30 +1,16 @@
 /dts-v1/;
 
-/include/ "bcm6358.dtsi"
+#include "bcm6358.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        model = "BT Home Hub 2.0 Type A";
        compatible = "thomson,homehub2a", "brcm,bcm6358";
 
-       spi-gpio {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "spi-gpio";
-
-               gpio-mosi = <&gpio0 7 0>;
-               gpio-sck = <&gpio0 6 0>;
-               cs-gpios = <&gpio0 5 0>;
-               num-chipselects = <1>;
-
-               hc595: gpio-spi-controller@0 {
-                       compatible = "fairchild,74hc595";
-                       reg = <0>;
-                       registers-number = <2>;
-                       spi-max-frequency = <100000>;
-
-                       gpio-controller;
-                       #gpio-cells = <2>;
-               };
+       chosen {
+               bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+               stdout-path = "serial0:115200n8";
        };
 
        gpio-keys-polled {
@@ -36,105 +22,146 @@
 
                phone {
                        label = "phone";
-                       gpios = <&gpio0 1 1>;
-                       linux,code = <169>;
+                       gpios = <&pinctrl 1 1>;
+                       linux,code = <KEY_PHONE>;
                };
                reset {
                        label = "reset";
-                       gpios = <&gpio0 9 1>;
-                       linux,code = <0x198>;
+                       gpios = <&pinctrl 9 1>;
+                       linux,code = <KEY_RESTART>;
                };
                wps {
                        label = "wps";
-                       gpios = <&gpio0 11 1>;
-                       linux,code = <0x211>;
+                       gpios = <&pinctrl 11 1>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
+};
 
-       gpio-leds {
-               compatible = "gpio-leds";
+&leds {
+       status = "ok";
 
-               power_red {
-                       label = "HOMEHUB2A:red:power";
-                       gpios = <&hc595 0 1>;
-               };
-               power_green {
-                       label = "HOMEHUB2A:green:power";
-                       gpios = <&hc595 1 1>;
-                       default-state = "on";
-               };
-               power_blue {
-                       label = "HOMEHUB2A:blue:power";
-                       gpios = <&hc595 2 1>;
-               };
-               broadband_red {
-                       label = "HOMEHUB2A:red:broadband";
-                       gpios = <&hc595 3 1>;
-               };
-               broadband_green {
-                       label = "HOMEHUB2A:green:broadband";
-                       gpios = <&hc595 4 1>;
-               };
-               broadband_blue {
-                       label = "HOMEHUB2A:blue:broadband";
-                       gpios = <&hc595 5 1>;
-               };
-               wireless_red {
-                       label = "HOMEHUB2A:red:wireless";
-                       gpios = <&hc595 6 1>;
-               };
-               wireless_green {
-                       label = "HOMEHUB2A:green:wireless";
-                       gpios = <&hc595 7 1>;
-               };
-               wireless_blue {
-                       label = "HOMEHUB2A:blue:wireless";
-                       gpios = <&hc595 8 1>;
-               };
-               phone_red {
-                       label = "HOMEHUB2A:red:phone";
-                       gpios = <&hc595 9 1>;
-               };
-               phone_green {
-                       label = "HOMEHUB2A:green:phone";
-                       gpios = <&hc595 10 1>;
-               };
-               phone_blue {
-                       label = "HOMEHUB2A:blue:phone";
-                       gpios = <&hc595 11 1>;
-               };
-               upgrading_red {
-                       label = "HOMEHUB2A:red:upgrading";
-                       gpios = <&hc595 12 1>;
-               };
-               upgrading_green {
-                       label = "HOMEHUB2A:green:upgrading";
-                       gpios = <&hc595 13 1>;
-               };
-               upgrading_blue {
-                       label = "HOMEHUB2A:blue:upgrading";
-                       gpios = <&hc595 14 1>;
-               };
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_serial_led>;
+
+       led@0 {
+               reg = <0>;
+               active-low;
+               label = "HOMEHUB2A:red:power";
+       };
+
+       led@1 {
+               reg = <0>;
+               active-low;
+               label = "HOMEHUB2A:green:power";
+               default-state = "on";
+       };
+
+       led@2 {
+               reg = <2>;
+               active-low;
+               label = "HOMEHUB2A:blue:power";
+       };
+
+       led@3 {
+               reg = <3>;
+               active-low;
+               label = "HOMEHUB2A:red:broadband";
+       };
+
+       led@4 {
+               reg = <4>;
+               active-low;
+               label = "HOMEHUB2A:green:broadband";
+       };
+
+       led@5 {
+               reg = <5>;
+               active-low;
+               label = "HOMEHUB2A:blue:broadband";
+       };
+
+       led@6 {
+               reg = <6>;
+               active-low;
+               label = "HOMEHUB2A:red:wireless";
+       };
+
+       led@7 {
+               reg = <7>;
+               active-low;
+               label = "HOMEHUB2A:green:wireless";
+       };
+
+       led@8 {
+               reg = <8>;
+               active-low;
+               label = "HOMEHUB2A:blue:wireless";
+       };
+
+       led@9 {
+               reg = <9>;
+               active-low;
+               label = "HOMEHUB2A:red:phone";
+       };
+
+       led@10 {
+               reg = <10>;
+               active-low;
+               label = "HOMEHUB2A:green:phone";
+       };
+
+       led@11 {
+               reg = <11>;
+               active-low;
+               label = "HOMEHUB2A:blue:phone";
+       };
+
+       led@12 {
+               reg = <12>;
+               active-low;
+               label = "HOMEHUB2A:red:upgrading";
+       };
+
+       led@13 {
+               reg = <13>;
+               active-low;
+               label = "HOMEHUB2A:green:upgrading";
+       };
+
+       led@14 {
+               reg = <14>;
+               active-low;
+               label = "HOMEHUB2A:blue:upgrading";
        };
 };
 
 &pflash {
        status = "ok";
 
-       linux,part-probe = "bcm63xxpart";
+       partitions {
+               compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-       cfe@0 {
-               label = "CFE";
-               reg = <0x000000 0x020000>;
-       };
+               cfe@0 {
+                       label = "CFE";
+                       reg = <0x000000 0x020000>;
+               };
 
-       linux@20000 {
-               label = "linux";
-               reg = <0x020000 0xfc0000>;
-       };
+               linux@20000 {
+                       label = "linux";
+                       reg = <0x020000 0xfc0000>;
+                       compatible = "brcm,bcm963xx-imagetag";
+               };
 
-       nvram@fe0000 {
-               label = "nvram";
-               reg = <0xfe0000 0x020000>;
+               nvram@fe0000 {
+                       label = "nvram";
+                       reg = <0xfe0000 0x020000>;
+               };
        };
 };
+
+&uart0 {
+       status = "ok";
+};