ramips: cleanup SPI flash device tree properties usage

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

diff --git a/target/linux/ramips/dts/HPM.dts b/target/linux/ramips/dts/HPM.dts
index c1b8ff3eee45b37015a91351faefd12eda16dade..ada12c1cf485bd69fbdaac1f9f271a9da590e1c6 100644 (file)
--- a/target/linux/ramips/dts/HPM.dts
+++ b/target/linux/ramips/dts/HPM.dts
@@ -1,6 +1,8 @@
 /dts-v1/;
 
-/include/ "rt3883.dtsi"
+#include "rt3883.dtsi"
+
+#include <dt-bindings/input/input.h>
 
 / {
        compatible = "HPM", "ralink,rt3883-soc";
@@ -10,78 +12,6 @@
                bootargs = "console=ttyS0,115200";
        };
 
-       palmbus@10000000 {
-               spi@b00 {
-                       status = "okay";
-
-                       m25p80@0 {
-                               compatible = "jedec,spi-nor";
-                               spi-max-frequency = <25000000>;
-                               reg = <0>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       reg = <0x0 0x0030000>;
-                                       label = "u-boot";
-                                       read-only;
-                               };
-
-                               partition@30000 {
-                                       reg = <0x00030000 0x00010000>;
-                                       label = "config";
-                                       read-only;
-                               };
-
-                               factory: partition@40000 {
-                                       reg = <0x00040000 0x00010000>;
-                                       label = "factory";
-                                       read-only;
-                               };
-
-                               partition@50000 {
-                                       reg = <0x00050000 0x00fb0000>;
-                                       label = "firmware";
-                               };
-                       };
-               };
-       };
-
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "jtag", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
-       };
-
-       ethernet@10100000 {
-               phy-handle = <&phy0>;
-               phy-mode = "rgmii";
-               mtd-mac-address = <&factory 0x28>;
-
-               mdio-bus {
-                       status = "okay";
-
-                       phy0: ethernet-phy@4 {
-                               reg = <4>;
-                       };
-               };
-       };
-
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
-
-       ehci@101c0000 {
-               status = "okay";
-       };
-
-       ohci@101c1000 {
-               status = "okay";
-       };
-
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
@@ -91,7 +21,7 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 14 0>;
-                       linux,code = <0x198>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 
@@ -147,3 +77,73 @@
                };
        };
 };
+
+&spi0 {
+       status = "okay";
+
+       m25p80@0 {
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <25000000>;
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+
+               partition@0 {
+                       reg = <0x0 0x0030000>;
+                       label = "u-boot";
+                       read-only;
+               };
+
+               partition@30000 {
+                       reg = <0x00030000 0x00010000>;
+                       label = "config";
+                       read-only;
+               };
+
+               factory: partition@40000 {
+                       reg = <0x00040000 0x00010000>;
+                       label = "factory";
+                       read-only;
+               };
+
+               partition@50000 {
+                       reg = <0x00050000 0x00fb0000>;
+                       label = "firmware";
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "jtag", "uartf";
+                       ralink,function = "gpio";
+               };
+       };
+};
+
+&ethernet {
+       phy-handle = <&phy0>;
+       phy-mode = "rgmii";
+       mtd-mac-address = <&factory 0x28>;
+
+       mdio-bus {
+               status = "okay";
+
+               phy0: ethernet-phy@4 {
+                       reg = <4>;
+               };
+       };
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&ehci {
+       status = "okay";
+};
+
+&ohci {
+       status = "okay";
+};