[openwrt/openwrt] ramips/mt7621: create common DTSI for Mikrotik devices
LEDE Commits
lede-commits at lists.infradead.org
Thu Aug 13 07:10:42 EDT 2020
adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ddf3e5c22d8a9706e92920a16ee74ee8c16b2ce3
commit ddf3e5c22d8a9706e92920a16ee74ee8c16b2ce3
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Wed Aug 12 20:10:12 2020 +0200
ramips/mt7621: create common DTSI for Mikrotik devices
This moves some common definitions for Mikrotik devices, mainly
routerboot partitions and reset key, to a common DTSI file.
While at it, remove unused hard_config DT label.
Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
target/linux/ramips/dts/mt7621_mikrotik.dtsi | 72 +++++++++++++++++
.../dts/mt7621_mikrotik_routerboard-750gr3.dts | 89 ++++------------------
.../dts/mt7621_mikrotik_routerboard-m11g.dts | 77 ++-----------------
.../dts/mt7621_mikrotik_routerboard-m33g.dts | 69 +----------------
4 files changed, 93 insertions(+), 214 deletions(-)
diff --git a/target/linux/ramips/dts/mt7621_mikrotik.dtsi b/target/linux/ramips/dts/mt7621_mikrotik.dtsi
new file mode 100644
index 0000000000..1fc523ea14
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_mikrotik.dtsi
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "mt7621.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ };
+
+ keys: keys {
+ compatible = "gpio-keys";
+
+ reset {
+ label = "reset";
+ gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ };
+ };
+};
+
+&spi0 {
+ status = "okay";
+
+ flash at 0 {
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <33000000>;
+
+ partitions: partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "RouterBoot";
+ reg = <0x0 0x40000>;
+ read-only;
+ compatible = "mikrotik,routerboot-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ partition at 0 {
+ label = "bootloader1";
+ reg = <0x0 0x0>;
+ read-only;
+ };
+
+ hard_config {
+ read-only;
+ };
+
+ partition at 10000 {
+ label = "bootloader2";
+ reg = <0x10000 0xf000>;
+ read-only;
+ };
+
+ soft_config {
+ };
+
+ partition at 30000 {
+ label = "bios";
+ reg = <0x30000 0x1000>;
+ read-only;
+ };
+ };
+ };
+ };
+};
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
index f767599e98..60315a46e7 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-750gr3.dts
@@ -1,10 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
-#include "mt7621.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7621_mikrotik.dtsi"
/ {
compatible = "mikrotik,routerboard-750gr3", "mediatek,mt7621-soc";
@@ -17,10 +14,6 @@
led-upgrade = &led_usr;
};
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
leds {
compatible = "gpio-leds";
@@ -36,22 +29,6 @@
};
};
- keys {
- compatible = "gpio-keys";
-
- mode {
- label = "mode";
- gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
- linux,code = <BTN_0>;
- };
-
- reset {
- label = "reset";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-
gpio_export {
compatible = "gpio-export";
#size-cells = <0>;
@@ -71,59 +48,19 @@
};
};
-&spi0 {
- status = "okay";
+&keys {
+ mode {
+ label = "mode";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ linux,code = <BTN_0>;
+ };
+};
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <20000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "RouterBoot";
- reg = <0x0 0x40000>;
- read-only;
- compatible = "mikrotik,routerboot-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootloader1";
- reg = <0x0 0x0>;
- read-only;
- };
-
- hard_config: hard_config {
- read-only;
- };
-
- partition at 10000 {
- label = "bootloader2";
- reg = <0x10000 0xf000>;
- read-only;
- };
-
- soft_config {
- };
-
- partition at 30000 {
- label = "bios";
- reg = <0x30000 0x1000>;
- read-only;
- };
- };
-
- partition at 40000 {
- compatible = "mikrotik,minor";
- label = "firmware";
- reg = <0x040000 0xfc0000>;
- };
- };
+&partitions {
+ partition at 40000 {
+ compatible = "mikrotik,minor";
+ label = "firmware";
+ reg = <0x040000 0xfc0000>;
};
};
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
index cb13590017..4e352bb122 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m11g.dts
@@ -1,9 +1,6 @@
/dts-v1/;
-#include "mt7621.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7621_mikrotik.dtsi"
/ {
compatible = "mikrotik,routerboard-m11g", "mediatek,mt7621-soc";
@@ -16,10 +13,6 @@
led-upgrade = &led_usr;
};
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
leds {
compatible = "gpio-leds";
@@ -54,16 +47,6 @@
};
};
- keys {
- compatible = "gpio-keys";
-
- res {
- label = "reset";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-
pcie0_vcc_reg {
compatible = "regulator-fixed";
regulator-name = "pcie0_vcc";
@@ -77,59 +60,11 @@
};
};
-&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <33000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "RouterBoot";
- reg = <0x0 0x40000>;
- read-only;
- compatible = "mikrotik,routerboot-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootloader1";
- reg = <0x0 0x0>;
- read-only;
- };
-
- hard_config: hard_config {
- read-only;
- };
-
- partition at 10000 {
- label = "bootloader2";
- reg = <0x10000 0xf000>;
- read-only;
- };
-
- soft_config {
- };
-
- partition at 30000 {
- label = "bios";
- reg = <0x30000 0x1000>;
- read-only;
- };
- };
-
- partition at 40000 {
- compatible = "mikrotik,minor";
- label = "firmware";
- reg = <0x040000 0xFC0000>;
- };
- };
+&partitions {
+ partition at 40000 {
+ compatible = "mikrotik,minor";
+ label = "firmware";
+ reg = <0x040000 0xfc0000>;
};
};
diff --git a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
index ebe85b09a1..48d368a5a9 100644
--- a/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
+++ b/target/linux/ramips/dts/mt7621_mikrotik_routerboard-m33g.dts
@@ -1,9 +1,6 @@
/dts-v1/;
-#include "mt7621.dtsi"
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/gpio/gpio.h>
+#include "mt7621_mikrotik.dtsi"
/ {
compatible = "mikrotik,routerboard-m33g", "mediatek,mt7621-soc";
@@ -16,10 +13,6 @@
led-upgrade = &led_usr;
};
- chosen {
- bootargs = "console=ttyS0,115200";
- };
-
leds {
compatible = "gpio-leds";
@@ -29,16 +22,6 @@
};
};
- keys {
- compatible = "gpio-keys";
-
- res {
- label = "res";
- gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
- linux,code = <KEY_RESTART>;
- };
- };
-
pcie0_vcc_reg {
compatible = "regulator-fixed";
regulator-name = "pcie0_vcc";
@@ -88,54 +71,6 @@
};
&spi0 {
- status = "okay";
-
- flash at 0 {
- compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <33000000>;
-
- partitions {
- compatible = "fixed-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "RouterBoot";
- reg = <0x0 0x40000>;
- read-only;
- compatible = "mikrotik,routerboot-partitions";
- #address-cells = <1>;
- #size-cells = <1>;
-
- partition at 0 {
- label = "bootloader1";
- reg = <0x0 0x0>;
- read-only;
- };
-
- hard_config: hard_config {
- read-only;
- };
-
- partition at 10000 {
- label = "bootloader2";
- reg = <0x10000 0xf000>;
- read-only;
- };
-
- soft_config {
- };
-
- partition at 30000 {
- label = "bios";
- reg = <0x30000 0x1000>;
- read-only;
- };
- };
- };
- };
-
flash at 1 {
compatible = "jedec,spi-nor";
reg = <1>;
@@ -151,7 +86,7 @@
partition at 40000 {
compatible = "mikrotik,minor";
label = "firmware";
- reg = <0x040000 0xFC0000>;
+ reg = <0x040000 0xfc0000>;
};
};
};
More information about the lede-commits
mailing list