[source] ramips: cleanup AsiaRF AWM002 eval board support
LEDE Commits
lede-commits at lists.infradead.org
Wed Aug 2 15:12:59 PDT 2017
mkresin pushed a commit to source.git, branch master:
https://git.lede-project.org/419fa7a15f04c03788de956d6c8eb1ade2346be9
commit 419fa7a15f04c03788de956d6c8eb1ade2346be9
Author: Mathias Kresin <dev at kresin.me>
AuthorDate: Sun Jul 30 11:08:03 2017 +0200
ramips: cleanup AsiaRF AWM002 eval board support
Cleanup the dtsi files and remove one layer of dtsi. Set the size of
the firmware partition to a value matching the flash size from the
board (variant) name.
Remove the usb led trigger. There is neither a default config for the
usb led trigger nor a LED for usb activity indication.
Signed-off-by: Mathias Kresin <dev at kresin.me>
---
target/linux/ramips/dts/AWM002-4M.dtsi | 10 ----
target/linux/ramips/dts/AWM002-8M.dtsi | 10 ----
target/linux/ramips/dts/AWM002-EVB-4M.dts | 66 +++++++++-------------
target/linux/ramips/dts/AWM002-EVB-8M.dts | 66 +++++++++-------------
.../dts/{AWM002-EVB-4M.dts => AWM002-EVB.dtsi} | 27 +++++++--
target/linux/ramips/dts/AWM002.dtsi | 62 --------------------
target/linux/ramips/image/rt305x.mk | 4 +-
7 files changed, 79 insertions(+), 166 deletions(-)
diff --git a/target/linux/ramips/dts/AWM002-4M.dtsi b/target/linux/ramips/dts/AWM002-4M.dtsi
deleted file mode 100644
index 3ea20e6..0000000
--- a/target/linux/ramips/dts/AWM002-4M.dtsi
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "AWM002.dtsi"
-
-/ {
- compatible = "AWM002", "ralink,rt5350-soc";
- model = "AsiaRF AWM002";
-};
-
-&m25p80 {
- compatible = "jedec,spi-nor";
-};
diff --git a/target/linux/ramips/dts/AWM002-8M.dtsi b/target/linux/ramips/dts/AWM002-8M.dtsi
deleted file mode 100644
index 3ea20e6..0000000
--- a/target/linux/ramips/dts/AWM002-8M.dtsi
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "AWM002.dtsi"
-
-/ {
- compatible = "AWM002", "ralink,rt5350-soc";
- model = "AsiaRF AWM002";
-};
-
-&m25p80 {
- compatible = "jedec,spi-nor";
-};
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts
index a8afab8..b139440 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts
@@ -1,55 +1,43 @@
/dts-v1/;
-#include "AWM002-4M.dtsi"
-
-#include <dt-bindings/input/input.h>
+#include "AWM002-EVB.dtsi"
/ {
+ compatible = "asiarf,awm002-evb-4m", "ralink,rt5350-soc";
model = "AsiaRF AWM002 EVB (4M)";
+};
- gpio-leds {
- compatible = "gpio-leds";
-
- tx {
- label = "awm002-evb:green:tx";
- gpios = <&gpio0 15 1>;
- };
+&spi0 {
+ status = "okay";
- rx {
- label = "awm002-evb:green:rx";
- gpios = <&gpio0 16 1>;
+ m25p80: m25p80 at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0>;
+ compatible = "jedec,spi-nor";
+ spi-max-frequency = <10000000>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0 0x30000>;
+ read-only;
};
- wps {
- label = "awm002-evb:green:wps";
- gpios = <&gpio0 21 1>;
+ partition at 30000 {
+ label = "u-boot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
};
- };
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
-
- reset_wps {
- label = "reset_wps";
- gpios = <&gpio0 0 1>;
- linux,code = <KEY_RESTART>;
+ factory: partition at 40000 {
+ label = "factory";
+ reg = <0x40000 0x10000>;
+ read-only;
};
- mode {
- label = "mode";
- gpios = <&gpio0 20 1>;
- linux,code = <BTN_0>;
+ partition at 50000 {
+ label = "firmware";
+ reg = <0x50000 0x3b0000>;
};
};
};
-
-ðernet {
- mtd-mac-address = <&factory 0x28>;
-};
-
-&wmac {
- ralink,mtd-eeprom = <&factory 0>;
-};
diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts
index 19b78aa..52d5ed7 100644
--- a/target/linux/ramips/dts/AWM002-EVB-8M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts
@@ -1,55 +1,43 @@
/dts-v1/;
-#include "AWM002-8M.dtsi"
-
-#include <dt-bindings/input/input.h>
+#include "AWM002-EVB.dtsi"
/ {
+ compatible = "asiarf,awm002-evb-8m", "ralink,rt5350-soc";
model = "AsiaRF AWM002 EVB (8M)";
+};
- gpio-leds {
- compatible = "gpio-leds";
-
- tx {
- label = "awm002-evb:green:tx";
- gpios = <&gpio0 15 1>;
- };
+&spi0 {
+ status = "okay";
- rx {
- label = "awm002-evb:green:rx";
- gpios = <&gpio0 16 1>;
+ m25p80: m25p80 at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0>;
+ compatible = "jedec,spi-nor";
+ spi-max-frequency = <10000000>;
+
+ partition at 0 {
+ label = "u-boot";
+ reg = <0x0 0x30000>;
+ read-only;
};
- wps {
- label = "awm002-evb:green:wps";
- gpios = <&gpio0 21 1>;
+ partition at 30000 {
+ label = "u-boot-env";
+ reg = <0x30000 0x10000>;
+ read-only;
};
- };
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
-
- reset_wps {
- label = "reset_wps";
- gpios = <&gpio0 0 1>;
- linux,code = <KEY_RESTART>;
+ factory: partition at 40000 {
+ label = "factory";
+ reg = <0x40000 0x10000>;
+ read-only;
};
- mode {
- label = "mode";
- gpios = <&gpio0 20 1>;
- linux,code = <BTN_0>;
+ partition at 50000 {
+ label = "firmware";
+ reg = <0x50000 0x7b0000>;
};
};
};
-
-ðernet {
- mtd-mac-address = <&factory 0x28>;
-};
-
-&wmac {
- ralink,mtd-eeprom = <&factory 0>;
-};
diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB.dtsi
similarity index 70%
copy from target/linux/ramips/dts/AWM002-EVB-4M.dts
copy to target/linux/ramips/dts/AWM002-EVB.dtsi
index a8afab8..0e82436 100644
--- a/target/linux/ramips/dts/AWM002-EVB-4M.dts
+++ b/target/linux/ramips/dts/AWM002-EVB.dtsi
@@ -1,11 +1,9 @@
-/dts-v1/;
-
-#include "AWM002-4M.dtsi"
+#include "rt5350.dtsi"
#include <dt-bindings/input/input.h>
/ {
- model = "AsiaRF AWM002 EVB (4M)";
+ compatible = "asiarf,awm002-evb", "ralink,rt5350-soc";
gpio-leds {
compatible = "gpio-leds";
@@ -53,3 +51,24 @@
&wmac {
ralink,mtd-eeprom = <&factory 0>;
};
+
+&pinctrl {
+ state_default: pinctrl0 {
+ gpio {
+ ralink,group = "i2c", "jtag";
+ ralink,function = "gpio";
+ };
+ };
+};
+
+&esw {
+ mediatek,portmap = <0x3f>;
+};
+
+&ehci {
+ status = "okay";
+};
+
+&ohci {
+ status = "okay";
+};
diff --git a/target/linux/ramips/dts/AWM002.dtsi b/target/linux/ramips/dts/AWM002.dtsi
deleted file mode 100644
index 00a4ddb..0000000
--- a/target/linux/ramips/dts/AWM002.dtsi
+++ /dev/null
@@ -1,62 +0,0 @@
-#include "rt5350.dtsi"
-
-/ {
- compatible = "AWM002", "ralink,rt5350-soc";
- model = "AsiaRF AWM002";
-};
-
-&spi0 {
- status = "okay";
-
- m25p80: m25p80 at 0 {
- #address-cells = <1>;
- #size-cells = <1>;
- reg = <0>;
- compatible = "jedec,spi-nor";
- spi-max-frequency = <10000000>;
-
- partition at 0 {
- label = "u-boot";
- reg = <0x0 0x30000>;
- read-only;
- };
-
- partition at 30000 {
- label = "u-boot-env";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- factory: partition at 40000 {
- label = "factory";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition at 50000 {
- label = "firmware";
- reg = <0x50000 0x1fb0000>;
- };
- };
-};
-
-&pinctrl {
- state_default: pinctrl0 {
- gpio {
- ralink,group = "i2c", "jtag";
- ralink,function = "gpio";
- };
- };
-};
-
-&esw {
- mediatek,portmap = <0x3f>;
-};
-
-&ehci {
- status = "okay";
-};
-
-&ohci {
- status = "okay";
-};
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index 013f6c1..4e82eb4 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -137,7 +137,7 @@ define Device/awm002-evb-4M
DTS := AWM002-EVB-4M
IMAGE_SIZE := $(ralink_default_fw_size_4M)
DEVICE_TITLE := AsiaRF AWM002-EVB (4M)
- DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-gpio
endef
TARGET_DEVICES += awm002-evb-4M
@@ -145,7 +145,7 @@ TARGET_DEVICES += awm002-evb-4M
define Device/awm002-evb-8M
DTS := AWM002-EVB-8M
DEVICE_TITLE := AsiaRF AWM002-EVB (8M)/AsiaRF AWM003 EVB
- DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
+ DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 \
kmod-i2c-core kmod-i2c-gpio
endef
TARGET_DEVICES += awm002-evb-8M
More information about the lede-commits
mailing list