[openwrt/openwrt] ramips: mt7628: create shared DTSI for Xiaomi Mi Router 4A/4C
LEDE Commits
lede-commits at lists.infradead.org
Tue Dec 8 11:31:41 EST 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/89e6cc5c76e675e94c070b920dbe1ff58cfd4436
commit 89e6cc5c76e675e94c070b920dbe1ff58cfd4436
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Tue Dec 8 15:33:32 2020 +0100
ramips: mt7628: create shared DTSI for Xiaomi Mi Router 4A/4C
The Xiaomi Mi Router 4A (100M) and 4C are relatively similar in
their specs. Create a shared DTSI for them.
Partitions are split in preparation for Mi Router 4AC.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
...ter-4c.dts => mt7628an_xiaomi_mi-router-4.dtsi} | 61 +++--------
.../ramips/dts/mt7628an_xiaomi_mi-router-4c.dts | 120 +++------------------
.../ramips/dts/mt7628an_xiaomi_mir4a-100m.dts | 115 ++------------------
3 files changed, 43 insertions(+), 253 deletions(-)
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
similarity index 72%
copy from target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
copy to target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
index f459ae0358..0f5897f5c5 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4.dtsi
@@ -6,15 +6,11 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "xiaomi,mi-router-4c", "mediatek,mt7628an-soc";
- model = "Xiaomi Mi Router 4C";
-
aliases {
led-boot = &led_power_yellow;
led-failsafe = &led_power_yellow;
led-running = &led_power_blue;
led-upgrade = &led_power_yellow;
- label-mac-device = ðernet;
};
chosen {
@@ -46,43 +42,15 @@
};
};
-&state_default {
- gpio {
- groups = "gpio", "wdt", "wled_an";
- function = "gpio";
- };
-};
-
-&ehci {
- status = "disabled";
-};
-
-&ohci {
- status = "disabled";
-};
-
-&esw {
- mediatek,portmap = <0x3d>;
- mediatek,portdisable = <0x29>;
-};
-
-&wmac {
- status = "okay";
-};
-
-ðernet {
- mtd-mac-address = <&factory 0x28>;
-};
-
&spi0 {
status = "okay";
- flash at 0 {
+ flash0: flash at 0 {
compatible = "jedec,spi-nor";
reg = <0>;
- spi-max-frequency = <40000000>;
+ spi-max-frequency = <10000000>;
- partitions {
+ partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
@@ -117,17 +85,18 @@
read-only;
};
- partition at 60000 {
- label = "overlay";
- reg = <0x60000 0x100000>;
- read-only;
- };
-
- partition at 160000 {
- label = "firmware";
- reg = <0x160000 0xea0000>;
- compatible = "denx,uimage";
- };
+ /* additional partitions in DTS */
};
};
};
+
+&state_default {
+ gpio {
+ groups = "gpio", "wdt", "wled_an";
+ function = "gpio";
+ };
+};
+
+&wmac {
+ status = "okay";
+};
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
index f459ae0358..4389a9daf4 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mi-router-4c.dts
@@ -1,55 +1,31 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7628an.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7628an_xiaomi_mi-router-4.dtsi"
/ {
compatible = "xiaomi,mi-router-4c", "mediatek,mt7628an-soc";
model = "Xiaomi Mi Router 4C";
aliases {
- led-boot = &led_power_yellow;
- led-failsafe = &led_power_yellow;
- led-running = &led_power_blue;
- led-upgrade = &led_power_yellow;
label-mac-device = ðernet;
};
+};
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
- leds {
- compatible = "gpio-leds";
-
- led_power_blue: power_blue {
- label = "blue:power";
- gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
- };
-
- led_power_yellow: power_yellow {
- label = "yellow:power";
- gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
- };
- };
-
- keys {
- compatible = "gpio-keys";
+&flash0 {
+ spi-max-frequency = <40000000>;
+};
- reset {
- label = "reset";
- gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
+&partitions {
+ partition at 60000 {
+ label = "overlay";
+ reg = <0x60000 0x100000>;
+ read-only;
};
-};
-&state_default {
- gpio {
- groups = "gpio", "wdt", "wled_an";
- function = "gpio";
+ partition at 160000 {
+ label = "firmware";
+ reg = <0x160000 0xea0000>;
+ compatible = "denx,uimage";
};
};
@@ -61,73 +37,11 @@
status = "disabled";
};
-&esw {
- mediatek,portmap = <0x3d>;
- mediatek,portdisable = <0x29>;
-};
-
-&wmac {
- status = "okay";
-};
-
ðernet {
mtd-mac-address = <&factory 0x28>;
};
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <40000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootloader";
- reg = <0x0 0x20000>;
- read-only;
- };
-
- partition at 20000 {
- label = "config";
- reg = <0x20000 0x10000>;
- read-only;
- };
-
- factory: partition at 30000 {
- label = "factory";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- partition at 40000 {
- label = "crash";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition at 50000 {
- label = "cfg_bak";
- reg = <0x50000 0x10000>;
- read-only;
- };
-
- partition at 60000 {
- label = "overlay";
- reg = <0x60000 0x100000>;
- read-only;
- };
-
- partition at 160000 {
- label = "firmware";
- reg = <0x160000 0xea0000>;
- compatible = "denx,uimage";
- };
- };
- };
+&esw {
+ mediatek,portmap = <0x3d>;
+ mediatek,portdisable = <0x29>;
};
diff --git a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
index c4912048f5..a1a7dc7383 100644
--- a/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
+++ b/target/linux/ramips/dts/mt7628an_xiaomi_mir4a-100m.dts
@@ -1,105 +1,23 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-#include "mt7628an.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7628an_xiaomi_mi-router-4.dtsi"
/ {
compatible = "xiaomi,mir4a-100m", "mediatek,mt7628an-soc";
model = "Xiaomi Mi Router 4A (100M Edition)";
-
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
- aliases {
- led-boot = &power_yellow;
- led-failsafe = &power_yellow;
- led-running = &power_blue;
- led-upgrade = &power_yellow;
- };
-
- leds {
- compatible = "gpio-leds";
-
- power_blue: power_blue {
- label = "blue:power";
- gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
- };
-
- power_yellow: power_yellow {
- label = "yellow:power";
- gpios = <&gpio 44 GPIO_ACTIVE_LOW>;
- };
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio 38 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
};
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <10000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootloader";
- reg = <0x0 0x20000>;
- read-only;
- };
-
- partition at 20000 {
- label = "config";
- reg = <0x20000 0x10000>;
- read-only;
- };
-
- factory: partition at 30000 {
- label = "factory";
- reg = <0x30000 0x10000>;
- read-only;
- };
-
- partition at 40000 {
- label = "crash";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition at 50000 {
- label = "cfg_bak";
- reg = <0x50000 0x10000>;
- read-only;
- };
-
- partition at 60000 {
- label = "overlay";
- reg = <0x60000 0x100000>;
- read-only;
- };
+&partitions {
+ partition at 60000 {
+ label = "overlay";
+ reg = <0x60000 0x100000>;
+ read-only;
+ };
- partition at 160000 {
- label = "firmware";
- reg = <0x160000 0xea0000>;
- compatible = "denx,uimage";
- };
- };
+ partition at 160000 {
+ label = "firmware";
+ reg = <0x160000 0xea0000>;
+ compatible = "denx,uimage";
};
};
@@ -116,13 +34,6 @@
};
};
-&state_default {
- gpio {
- groups = "gpio", "wdt", "wled_an";
- function = "gpio";
- };
-};
-
ðernet {
mtd-mac-address = <&factory 0x4>;
mtd-mac-address-increment = <(-1)>;
@@ -132,7 +43,3 @@
mediatek,portmap = <0x3e>;
mediatek,portdisable = <0x2a>;
};
-
-&wmac {
- status = "okay";
-};
More information about the lede-commits
mailing list