[openwrt/openwrt] ramips: create shared DTSI for MT7620 Phicomm K2x series devices
LEDE Commits
lede-commits at lists.infradead.org
Sun Mar 21 21:45:33 GMT 2021
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/df6154848a1486c6dcbf2566ea9fd9bf2e094a40
commit df6154848a1486c6dcbf2566ea9fd9bf2e094a40
Author: Shiji Yang <yangshiji66 at qq.com>
AuthorDate: Sun Mar 21 16:45:24 2021 +0800
ramips: create shared DTSI for MT7620 Phicomm K2x series devices
Improve compatibility of the device tree include file. Now a new .dtsi
file will support both PSG1218A, PSG1218B and K2G.
Signed-off-by: Shiji Yang <yangshiji66 at qq.com>
[improve commit title, rebase]
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
target/linux/ramips/dts/mt7620a_phicomm_k2g.dts | 112 ++-------------------
...icomm_psg1218.dtsi => mt7620a_phicomm_k2x.dtsi} | 14 +--
.../linux/ramips/dts/mt7620a_phicomm_psg1218a.dts | 10 +-
.../linux/ramips/dts/mt7620a_phicomm_psg1218b.dts | 10 +-
4 files changed, 31 insertions(+), 115 deletions(-)
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
index 2684da6ac3..a153520e2f 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2g.dts
@@ -1,100 +1,21 @@
-#include "mt7620a.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7620a_phicomm_k2x.dtsi"
/ {
compatible = "phicomm,k2g", "ralink,mt7620a-soc";
model = "Phicomm K2G";
-
- aliases {
- led-boot = &led_blue;
- led-failsafe = &led_blue;
- led-running = &led_blue;
- led-upgrade = &led_blue;
- };
-
- leds {
- compatible = "gpio-leds";
-
- led_blue: blue {
- label = "blue:status";
- gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
- };
-
- yellow {
- label = "yellow:status";
- gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
- };
-
- red {
- label = "red:status";
- gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
- };
- };
-
- keys {
- compatible = "gpio-keys";
-
- reset {
- label = "reset";
- gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
};
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <80000000>;
- m25p,fast-read;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- reg = <0x0 0x30000>;
- label = "u-boot";
- read-only;
- };
-
- partition at 30000 {
- reg = <0x30000 0x10000>;
- label = "u-boot-env";
- read-only;
- };
-
- factory: partition at 40000 {
- reg = <0x40000 0x10000>;
- label = "factory";
- read-only;
- };
-
- partition at 50000 {
- reg = <0x50000 0x50000>;
- label = "permanent_config";
- read-only;
- };
-
- partition at a0000 {
- compatible = "denx,uimage";
- reg = <0xa0000 0x760000>;
- label = "firmware";
- };
- };
+&partitions {
+ partition at 50000 {
+ reg = <0x50000 0x50000>;
+ label = "permanent_config";
+ read-only;
};
-};
-&state_default {
- gpio {
- groups = "i2c", "uartf";
- function = "gpio";
+ partition at a0000 {
+ compatible = "denx,uimage";
+ reg = <0xa0000 0x760000>;
+ label = "firmware";
};
};
@@ -122,20 +43,7 @@
};
};
-&pcie {
- status = "okay";
-};
-
-&pcie0 {
- mt76 at 0,0 {
- reg = <0x0000 0 0 0 0>;
- mediatek,mtd-eeprom = <&factory 0x8000>;
- ieee80211-freq-limit = <5000000 6000000>;
- };
-};
-
&wmac {
- ralink,mtd-eeprom = <&factory 0x0>;
pinctrl-names = "default";
pinctrl-0 = <&pa_pins>;
};
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi b/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
similarity index 86%
rename from target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
rename to target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
index 4d518bf206..c7728e0442 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218.dtsi
+++ b/target/linux/ramips/dts/mt7620a_phicomm_k2x.dtsi
@@ -4,8 +4,6 @@
#include <dt-bindings/input/input.h>
/ {
- compatible = "phicomm,psg1218", "ralink,mt7620a-soc";
-
aliases {
led-boot = &led_blue;
led-failsafe = &led_blue;
@@ -53,7 +51,7 @@
spi-max-frequency = <80000000>;
m25p,fast-read;
- partitions {
+ partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
@@ -64,23 +62,17 @@
read-only;
};
- partition at 20000 {
+ partition at 30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
- factory: partition at 30000 {
+ factory: partition at 40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
-
- partition at 40000 {
- compatible = "denx,uimage";
- label = "firmware";
- reg = <0x50000 0x7b0000>;
- };
};
};
};
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
index d17f2fce59..d5aa159498 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218a.dts
@@ -1,10 +1,18 @@
-#include "mt7620a_phicomm_psg1218.dtsi"
+#include "mt7620a_phicomm_k2x.dtsi"
/ {
compatible = "phicomm,psg1218a", "phicomm,psg1218", "ralink,mt7620a-soc";
model = "Phicomm PSG1218 rev.A";
};
+&partitions {
+ partition at 50000 {
+ compatible = "denx,uimage";
+ label = "firmware";
+ reg = <0x50000 0x7b0000>;
+ };
+};
+
ðernet {
mtd-mac-address = <&factory 0x28>;
diff --git a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
index 822fb13b6f..4143d5e4d6 100644
--- a/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
+++ b/target/linux/ramips/dts/mt7620a_phicomm_psg1218b.dts
@@ -1,10 +1,18 @@
-#include "mt7620a_phicomm_psg1218.dtsi"
+#include "mt7620a_phicomm_k2x.dtsi"
/ {
compatible = "phicomm,psg1218b", "phicomm,psg1218", "ralink,mt7620a-soc";
model = "Phicomm PSG1218 rev.B";
};
+&partitions {
+ partition at 50000 {
+ compatible = "denx,uimage";
+ label = "firmware";
+ reg = <0x50000 0x7b0000>;
+ };
+};
+
ðernet {
mtd-mac-address = <&factory 0x28>;
};
More information about the lede-commits
mailing list