mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
5695267847
Edgerouter X currently has its eth1 port on the switch missing since there
is a naming conflict currently.
So, as the root cause is mixing kernel support for DSA interfaces having
predictable names set via "label" property vs others having it assigned
dynamically lets avoid the conflict by using our own custom property as
suggested upstream [1].
So, add support via "openwrt,netdev-name" property and use it on ERX.
Fixes: 2a25c6ace8 ("ramips: get rid of downstream network device label patch")
Fixes: #15643
Link: https://github.com/openwrt/openwrt/pull/17062
Signed-off-by: Robert Marko <robimarko@gmail.com>
157 lines
2.6 KiB
Plaintext
157 lines
2.6 KiB
Plaintext
#include "mt7621.dtsi"
|
|
|
|
#include <dt-bindings/gpio/gpio.h>
|
|
#include <dt-bindings/input/input.h>
|
|
|
|
/ {
|
|
aliases {
|
|
label-mac-device = &gmac0;
|
|
};
|
|
|
|
keys {
|
|
compatible = "gpio-keys";
|
|
|
|
reset {
|
|
label = "reset";
|
|
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
|
|
linux,code = <KEY_RESTART>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&gmac0 {
|
|
nvmem-cells = <&macaddr_factory_22 0>;
|
|
nvmem-cell-names = "mac-address";
|
|
openwrt,netdev-name = "dsa";
|
|
};
|
|
|
|
&switch0 {
|
|
ports {
|
|
port@0 {
|
|
status = "okay";
|
|
openwrt,netdev-name = "eth0";
|
|
/delete-property/ label;
|
|
};
|
|
|
|
port@1 {
|
|
status = "okay";
|
|
openwrt,netdev-name = "eth1";
|
|
nvmem-cells = <&macaddr_factory_22 1>;
|
|
nvmem-cell-names = "mac-address";
|
|
/delete-property/ label;
|
|
};
|
|
|
|
port@2 {
|
|
status = "okay";
|
|
openwrt,netdev-name = "eth2";
|
|
nvmem-cells = <&macaddr_factory_22 2>;
|
|
nvmem-cell-names = "mac-address";
|
|
/delete-property/ label;
|
|
};
|
|
|
|
port@3 {
|
|
status = "okay";
|
|
openwrt,netdev-name = "eth3";
|
|
nvmem-cells = <&macaddr_factory_22 3>;
|
|
nvmem-cell-names = "mac-address";
|
|
/delete-property/ label;
|
|
};
|
|
|
|
port@4 {
|
|
status = "okay";
|
|
openwrt,netdev-name = "eth4";
|
|
nvmem-cells = <&macaddr_factory_22 4>;
|
|
nvmem-cell-names = "mac-address";
|
|
/delete-property/ label;
|
|
};
|
|
};
|
|
};
|
|
|
|
&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;
|
|
};
|
|
|
|
partition@e0000 {
|
|
label = "factory";
|
|
reg = <0xe0000 0x60000>;
|
|
|
|
nvmem-layout {
|
|
compatible = "fixed-layout";
|
|
#address-cells = <1>;
|
|
#size-cells = <1>;
|
|
|
|
macaddr_factory_22: macaddr@22 {
|
|
compatible = "mac-base";
|
|
reg = <0x22 0x6>;
|
|
#nvmem-cell-cells = <1>;
|
|
};
|
|
};
|
|
};
|
|
|
|
partition@140000 {
|
|
label = "kernel";
|
|
reg = <0x140000 0x600000>;
|
|
};
|
|
|
|
partition@740000 {
|
|
label = "ubi";
|
|
reg = <0x740000 0xf7c0000>;
|
|
};
|
|
};
|
|
};
|
|
|
|
&state_default {
|
|
gpio {
|
|
groups = "uart2", "uart3", "pcie", "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";
|
|
|
|
flash@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";
|
|
};
|