ramips: dts: Unify naming of gpio-keys nodes

[openwrt/openwrt.git] / target / linux / ramips / dts / F5D8235_V1.dts

diff --git a/target/linux/ramips/dts/F5D8235_V1.dts b/target/linux/ramips/dts/F5D8235_V1.dts
index 32850b4a0747cff666d25e789565775ad7aaa8bb..591b1f7b5e9dc4353dd4d102889dff2ae5901763 100644 (file)
--- a/target/linux/ramips/dts/F5D8235_V1.dts
+++ b/target/linux/ramips/dts/F5D8235_V1.dts
@@ -12,11 +12,8 @@
        model = "Belkin F5D8235 v1";
 
        aliases {
-               led-status = &led_wired_blue;
-       };
-
-       pci@440000 {
-               status = "ok";
+               led-boot = &led_wired_blue;
+               led-failsafe = &led_wired_blue;
        };
 
        cfi@1f000000 {
@@ -24,30 +21,35 @@
                reg = <0xbc400000 0x800000>;
                bank-width = <2>;
                device-width = <2>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               partition@0 {
-                       label = "uboot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "uboot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x7b0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "uboot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "uboot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
+                       };
                };
        };
 
@@ -98,10 +100,8 @@
                realtek,green-ethernet-features;
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <100>;
 
                wps {
@@ -148,6 +148,8 @@
                storage {
                        label = "f5d8235-v1:blue:storage";
                        gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                storage2 {
@@ -209,6 +211,34 @@
        };
 };
 
+&pci {
+       status = "okay";
+
+       usb@11,0 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "pci1033,0035";
+               reg = <0x8800 0 0 0 0>;
+
+               ohci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
+       };
+
+       usb@11,1 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "pci1033,00e0";
+               reg = <0x8900 0 0 0 0>;
+
+               ehci_port1: port@1 {
+                       reg = <1>;
+                       #trigger-source-cells = <0>;
+               };
+       };
+};
+
 &wmac {
        status = "okay";
        ralink,mtd-eeprom = <&factory 0x0>;