From ddf3e5c22d8a9706e92920a16ee74ee8c16b2ce3 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 12 Aug 2020 20:10:12 +0200 Subject: [PATCH] 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 --- target/linux/ramips/dts/mt7621_mikrotik.dtsi | 72 +++++++++++++++ .../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(-) create mode 100644 target/linux/ramips/dts/mt7621_mikrotik.dtsi diff --git a/target/linux/ramips/dts/mt7621_mikrotik.dtsi b/target/linux/ramips/dts/mt7621_mikrotik.dtsi new file mode 100644 index 000000000000..1fc523ea14a8 --- /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 +#include + +/ { + chosen { + bootargs = "console=ttyS0,115200"; + }; + + keys: keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 18 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&spi0 { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <33000000>; + + partitions: partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "RouterBoot"; + reg = <0x0 0x40000>; + read-only; + compatible = "mikrotik,routerboot-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "bootloader1"; + reg = <0x0 0x0>; + read-only; + }; + + hard_config { + read-only; + }; + + partition@10000 { + label = "bootloader2"; + reg = <0x10000 0xf000>; + read-only; + }; + + soft_config { + }; + + partition@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 f767599e98c3..60315a46e720 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 -#include +#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 = ; - }; - - reset { - label = "reset"; - gpios = <&gpio 18 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; - 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 = ; + }; +}; - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <20000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "RouterBoot"; - reg = <0x0 0x40000>; - read-only; - compatible = "mikrotik,routerboot-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "bootloader1"; - reg = <0x0 0x0>; - read-only; - }; - - hard_config: hard_config { - read-only; - }; - - partition@10000 { - label = "bootloader2"; - reg = <0x10000 0xf000>; - read-only; - }; - - soft_config { - }; - - partition@30000 { - label = "bios"; - reg = <0x30000 0x1000>; - read-only; - }; - }; - - partition@40000 { - compatible = "mikrotik,minor"; - label = "firmware"; - reg = <0x040000 0xfc0000>; - }; - }; +&partitions { + partition@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 cb1359001765..4e352bb122c4 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 -#include +#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 = ; - }; - }; - pcie0_vcc_reg { compatible = "regulator-fixed"; regulator-name = "pcie0_vcc"; @@ -77,59 +60,11 @@ }; }; -&spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <33000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "RouterBoot"; - reg = <0x0 0x40000>; - read-only; - compatible = "mikrotik,routerboot-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "bootloader1"; - reg = <0x0 0x0>; - read-only; - }; - - hard_config: hard_config { - read-only; - }; - - partition@10000 { - label = "bootloader2"; - reg = <0x10000 0xf000>; - read-only; - }; - - soft_config { - }; - - partition@30000 { - label = "bios"; - reg = <0x30000 0x1000>; - read-only; - }; - }; - - partition@40000 { - compatible = "mikrotik,minor"; - label = "firmware"; - reg = <0x040000 0xFC0000>; - }; - }; +&partitions { + partition@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 ebe85b09a162..48d368a5a94c 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 -#include +#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 = ; - }; - }; - pcie0_vcc_reg { compatible = "regulator-fixed"; regulator-name = "pcie0_vcc"; @@ -88,54 +71,6 @@ }; &spi0 { - status = "okay"; - - flash@0 { - compatible = "jedec,spi-nor"; - reg = <0>; - spi-max-frequency = <33000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "RouterBoot"; - reg = <0x0 0x40000>; - read-only; - compatible = "mikrotik,routerboot-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "bootloader1"; - reg = <0x0 0x0>; - read-only; - }; - - hard_config: hard_config { - read-only; - }; - - partition@10000 { - label = "bootloader2"; - reg = <0x10000 0xf000>; - read-only; - }; - - soft_config { - }; - - partition@30000 { - label = "bios"; - reg = <0x30000 0x1000>; - read-only; - }; - }; - }; - }; - flash@1 { compatible = "jedec,spi-nor"; reg = <1>; @@ -151,7 +86,7 @@ partition@40000 { compatible = "mikrotik,minor"; label = "firmware"; - reg = <0x040000 0xFC0000>; + reg = <0x040000 0xfc0000>; }; }; }; -- 2.30.2