aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2022-12-07 00:34:55 +0000
committerDaniel Golle <daniel@makrotopia.org>2022-12-07 00:46:26 +0000
commit9d22ab703fbaf8691b5b27073b940b6f002cd0eb (patch)
tree93aa0752973aaa763b7a1ca481f972366d8cba94 /target
parentf595bebc7fc67255dc05ec4c1b74b0349c1d2aa3 (diff)
downloadupstream-9d22ab703fbaf8691b5b27073b940b6f002cd0eb.tar.gz
upstream-9d22ab703fbaf8691b5b27073b940b6f002cd0eb.tar.bz2
upstream-9d22ab703fbaf8691b5b27073b940b6f002cd0eb.zip
mediatek: remove redundant flash entry from dtsi
Splitting-off the common parts of Ruijie RG-EW3200GX PRO and reyee AX3200-E5 went wrong because the flash descriptiom was kept also in the dtsi. Remove it there, as flash definition is added by both board dts files. Fixes: 7dbac3433f ("mediatek: add support for reyee AX3200-E5") Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'target')
-rw-r--r--target/linux/mediatek/dts/mt7622-reyee-ax3200-e5.dts8
-rw-r--r--target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi74
-rw-r--r--target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts8
3 files changed, 16 insertions, 74 deletions
diff --git a/target/linux/mediatek/dts/mt7622-reyee-ax3200-e5.dts b/target/linux/mediatek/dts/mt7622-reyee-ax3200-e5.dts
index c4ae63e800..3aa59b1c6d 100644
--- a/target/linux/mediatek/dts/mt7622-reyee-ax3200-e5.dts
+++ b/target/linux/mediatek/dts/mt7622-reyee-ax3200-e5.dts
@@ -76,3 +76,11 @@
};
};
};
+
+&wmac {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&epa_elna_pins>;
+ mediatek,mtd-eeprom = <&factory 0x0>;
+};
diff --git a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
index 86ef475733..9a04e79235 100644
--- a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
+++ b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200.dtsi
@@ -232,72 +232,6 @@
pinctrl-0 = <&pmic_bus_pins>;
};
-&nor_flash {
- status = "okay";
-
- pinctrl-names = "default";
- pinctrl-0 = <&spi_nor_pins>;
-
- flash@0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <50000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition@0 {
- label = "Preloader";
- reg = <0x0 0x40000>;
- read-only;
- };
-
- partition@40000 {
- label = "ATF";
- reg = <0x40000 0x20000>;
- read-only;
- };
-
- partition@60000 {
- label = "u-boot";
- reg = <0x60000 0x50000>;
- read-only;
- };
-
- partition@B0000 {
- label = "u-boot-env";
- reg = <0xb0000 0x20000>;
- };
-
- factory: partition@D0000 {
- label = "Factory";
- reg = <0xd0000 0x80000>;
- read-only;
- };
-
- partition@150000 {
- label = "product_info";
- reg = <0x150000 0x10000>;
- read-only;
- };
-
- partition@160000 {
- label = "kdump";
- reg = <0x160000 0x10000>;
- read-only;
- };
-
- partition@170000 {
- compatible = "denx,fit";
- label = "firmware";
- reg = <0x170000 0xe90000>;
- };
- };
- };
-};
-
&rtc {
status = "disabled";
};
@@ -315,11 +249,3 @@
pinctrl-names = "default";
pinctrl-0 = <&watchdog_pins>;
};
-
-&wmac {
- status = "okay";
-
- pinctrl-names = "default";
- pinctrl-0 = <&epa_elna_pins>;
- mediatek,mtd-eeprom = <&factory 0x0>;
-};
diff --git a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
index dacd5bed5f..53abf300cd 100644
--- a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
+++ b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
@@ -73,3 +73,11 @@
};
};
};
+
+&wmac {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&epa_elna_pins>;
+ mediatek,mtd-eeprom = <&factory 0x0>;
+};