From e8931b309f82a44b55e64af3668186cdf7bcde15 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Tue, 7 Apr 2020 10:47:18 +0200 Subject: ramips: mt7621: tidy up names for Ubiquiti devices The "proper" vendor prefix for Ubiquiti is "ubnt", this is used in all targets except ramips and also recommended by the kernel. This patch adjusts the various board/image/device name variables accordingly. Since we touch it anyway, this also adds the space in "EdgeRouter X" as a hyphen to those variables to really make them consistent with the model name. While at it, create a real shared definition for the devices in image/mt7621.mk instead of deriving one device from another. Signed-off-by: Adrian Schmutzler --- .../ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts | 17 --- .../ramips/dts/mt7621_ubiquiti_edgerouterx.dts | 8 -- .../ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi | 147 --------------------- .../ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts | 17 +++ .../linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts | 8 ++ .../linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi | 147 +++++++++++++++++++++ 6 files changed, 172 insertions(+), 172 deletions(-) delete mode 100644 target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts delete mode 100644 target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts delete mode 100644 target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi create mode 100644 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts create mode 100644 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts create mode 100644 target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi (limited to 'target/linux/ramips/dts') diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts deleted file mode 100644 index b4deb490ed..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts +++ /dev/null @@ -1,17 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX-SFP"; - compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc"; -}; - -&i2c { - status = "okay"; - - pca9555@25 { - compatible = "nxp,pca9555"; - reg = <0x25>; - }; -}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts deleted file mode 100644 index 5c1d9ec887..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts +++ /dev/null @@ -1,8 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX"; - compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc"; -}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi deleted file mode 100644 index 4503f67a64..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi +++ /dev/null @@ -1,147 +0,0 @@ -#include "mt7621.dtsi" - -#include -#include - -/ { - aliases { - label-mac-device = &gmac0; - }; - - chosen { - bootargs = "console=ttyS0,57600"; - }; - - keys { - compatible = "gpio-keys"; - - reset { - label = "reset"; - gpios = <&gpio 12 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - }; -}; - -&gmac0 { - mtd-mac-address = <&factory 0x22>; - label = "dsa"; -}; - -&switch0 { - ports { - port@0 { - status = "okay"; - label = "eth0"; - }; - - port@1 { - status = "okay"; - label = "eth1"; - mtd-mac-address = <&factory 0x22>; - mtd-mac-address-increment = <1>; - }; - - port@2 { - status = "okay"; - label = "eth2"; - mtd-mac-address = <&factory 0x22>; - mtd-mac-address-increment = <2>; - }; - - port@3 { - status = "okay"; - label = "eth3"; - mtd-mac-address = <&factory 0x22>; - mtd-mac-address-increment = <3>; - }; - - port@4 { - status = "okay"; - label = "eth4"; - mtd-mac-address = <&factory 0x22>; - mtd-mac-address-increment = <4>; - }; - }; -}; - -&nand { - status = "okay"; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x80000>; - read-only; - }; - - partition@80000 { - label = "u-boot-env"; - reg = <0x80000 0x60000>; - read-only; - }; - - factory: partition@e0000 { - label = "factory"; - reg = <0xe0000 0x60000>; - }; - - partition@140000 { - label = "kernel1"; - reg = <0x140000 0x300000>; - }; - - partition@440000 { - label = "kernel2"; - reg = <0x440000 0x300000>; - }; - - partition@740000 { - label = "ubi"; - reg = <0x740000 0xf7c0000>; - }; - }; -}; - -&state_default { - gpio { - groups = "uart2", "uart3", "pcie", "rgmii2", "jtag"; - function = "gpio"; - }; -}; - -&spi0 { - /* - * This board has 2Mb spi flash soldered in and visible - * from manufacturer's firmware. - * But this SoC shares spi and nand pins, - * and current driver doesn't handle this sharing well - */ - status = "disabled"; - - m25p80@1 { - compatible = "jedec,spi-nor"; - reg = <1>; - spi-max-frequency = <10000000>; - - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - partition@0 { - label = "spi"; - reg = <0x0 0x200000>; - read-only; - }; - }; - }; -}; - -&xhci { - status = "disabled"; -}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts new file mode 100644 index 0000000000..9515f1d8b5 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X SFP"; + compatible = "ubnt,edgerouter-x-sfp", "mediatek,mt7621-soc"; +}; + +&i2c { + status = "okay"; + + pca9555@25 { + compatible = "nxp,pca9555"; + reg = <0x25>; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts new file mode 100644 index 0000000000..260baf9cf9 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X"; + compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc"; +}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi new file mode 100644 index 0000000000..4503f67a64 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi @@ -0,0 +1,147 @@ +#include "mt7621.dtsi" + +#include +#include + +/ { + aliases { + label-mac-device = &gmac0; + }; + + chosen { + bootargs = "console=ttyS0,57600"; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + gpios = <&gpio 12 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&gmac0 { + mtd-mac-address = <&factory 0x22>; + label = "dsa"; +}; + +&switch0 { + ports { + port@0 { + status = "okay"; + label = "eth0"; + }; + + port@1 { + status = "okay"; + label = "eth1"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <1>; + }; + + port@2 { + status = "okay"; + label = "eth2"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <2>; + }; + + port@3 { + status = "okay"; + label = "eth3"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <3>; + }; + + port@4 { + status = "okay"; + label = "eth4"; + mtd-mac-address = <&factory 0x22>; + mtd-mac-address-increment = <4>; + }; + }; +}; + +&nand { + status = "okay"; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x0 0x80000>; + read-only; + }; + + partition@80000 { + label = "u-boot-env"; + reg = <0x80000 0x60000>; + read-only; + }; + + factory: partition@e0000 { + label = "factory"; + reg = <0xe0000 0x60000>; + }; + + partition@140000 { + label = "kernel1"; + reg = <0x140000 0x300000>; + }; + + partition@440000 { + label = "kernel2"; + reg = <0x440000 0x300000>; + }; + + partition@740000 { + label = "ubi"; + reg = <0x740000 0xf7c0000>; + }; + }; +}; + +&state_default { + gpio { + groups = "uart2", "uart3", "pcie", "rgmii2", "jtag"; + function = "gpio"; + }; +}; + +&spi0 { + /* + * This board has 2Mb spi flash soldered in and visible + * from manufacturer's firmware. + * But this SoC shares spi and nand pins, + * and current driver doesn't handle this sharing well + */ + status = "disabled"; + + m25p80@1 { + compatible = "jedec,spi-nor"; + reg = <1>; + spi-max-frequency = <10000000>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "spi"; + reg = <0x0 0x200000>; + read-only; + }; + }; + }; +}; + +&xhci { + status = "disabled"; +}; -- cgit v1.2.3