lantiq: fix switch configuration for EASY80920

The device tree description misses some Ethernet ports and there was no
model specified for this board. In addition there was no switch
specific default configuration created.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2016-07-27 21:27:54 +02:00
parent 6b5a418512
commit 47cce1d5e4
4 changed files with 27 additions and 24 deletions

View file

@ -157,6 +157,13 @@ WBMR300)
"2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0" "2:lan:2" "3:lan:3" "5:lan:4" "4:wan:1" "6t@eth0"
;; ;;
EASY80920NAND|EASY80920NOR)
lan_mac=$(mtd_get_mac_ascii uboot_env ethaddr)
wan_mac=$(macaddr_add "$lan_mac" 1)
ucidef_add_switch "switch0" \
"4:lan:1" "2:lan:2" "1:lan:3" "0:lan:3" "5:wan:1" "6t@eth0"
;;
*) *)
ucidef_set_interface_lan 'eth0' ucidef_set_interface_lan 'eth0'
;; ;;

View file

@ -266,13 +266,19 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0>; reg = <0>;
mac-address = [ 00 11 22 33 44 55 ]; lantiq,switch;
ethernet@0 { ethernet@4 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <0>; reg = <4>;
phy-mode = "rgmii"; phynmode0 = "gmii";
phy-handle = <&phy0>; phy-handle = <&phy13>;
};
ethernet@2 {
compatible = "lantiq,xrx200-pdi-port";
reg = <2>;
phy-mode = "gmii";
phy-handle = <&phy11>;
}; };
ethernet@1 { ethernet@1 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
@ -280,11 +286,11 @@
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-handle = <&phy1>; phy-handle = <&phy1>;
}; };
ethernet@2 { ethernet@0 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <2>; reg = <0>;
phy-mode = "gmii"; phy-mode = "rgmii";
phy-handle = <&phy11>; phy-handle = <&phy0>;
}; };
}; };
@ -293,8 +299,8 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <1>; reg = <1>;
mac-address = [ 00 11 22 33 44 56 ];
lantiq,wan; lantiq,wan;
ethernet@5 { ethernet@5 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <5>; reg = <5>;
@ -303,20 +309,6 @@
}; };
}; };
test: interface@2 {
compatible = "lantiq,xrx200-pdi";
#address-cells = <1>;
#size-cells = <0>;
reg = <2>;
mac-address = [ 00 11 22 33 44 57 ];
ethernet@4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phynmode0 = "gmii";
phy-handle = <&phy13>;
};
};
mdio@0 { mdio@0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

View file

@ -4,6 +4,8 @@
/include/ "EASY80920.dtsi" /include/ "EASY80920.dtsi"
/ { / {
model = "EASY80920NAND - Intel EASY80920 Nand";
chosen { chosen {
bootargs = "ubi.mtd=ubi ubi.block=0,rootfsA root=/dev/ubiblock0_1"; bootargs = "ubi.mtd=ubi ubi.block=0,rootfsA root=/dev/ubiblock0_1";
}; };

View file

@ -4,6 +4,8 @@
/include/ "EASY80920.dtsi" /include/ "EASY80920.dtsi"
/ { / {
model = "EASY80920NOR - Intel EASY80920 Nor";
fpi@10000000 { fpi@10000000 {
localbus@0 { localbus@0 {
ranges = <0 0 0x0 0x3ffffff>; ranges = <0 0 0x0 0x3ffffff>;