lantiq: ARV7519RW22: several fixes

- Fix ethernet ports.
- Clean DTS files.
- WiFi is lantiq based (not supported yet), remove ath9k.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 40519
This commit is contained in:
John Crispin 2014-04-16 12:01:09 +00:00
parent ba62f78e2e
commit c4aae8fbc5
4 changed files with 101 additions and 129 deletions

View File

@ -1,23 +1,54 @@
/include/ "vr9.dtsi" /include/ "vr9.dtsi"
/ { / {
model = "ARV7519 - Astoria Networks ARV7519RW22-A-LT"; model = "ARV7519 - Astoria Networks ARV7519RW22-A-LT";
chosen { chosen {
bootargs = "console=ttyLTQ0,115200 init=/etc/preinit"; bootargs = "console=ttyLTQ0,115200 init=/etc/preinit";
}; };
memory@0 { memory@0 {
reg = <0x0 0x8000000>; reg = <0x0 0x8000000>;
}; };
fpi@10000000 { fpi@10000000 {
localbus@0 {
nor-boot@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "uboot";
reg = <0x0 0x60000>;
read-only;
};
partition@60000 {
label = "uboot_cfg";
reg = <0x60000 0x20000>;
read-only;
};
partition@80000 {
label = "firmware";
reg = <0x80000 0x1f00000>;
};
partition@1f80000 {
label = "boardconfig";
reg = <0x1f80000 0x80000>;
read-only;
};
};
};
gpio: pinmux@E100B10 { gpio: pinmux@E100B10 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&state_default>; pinctrl-0 = <&state_default>;
state_default: pinmux { state_default: pinmux {
mdio { mdio {
lantiq,groups = "mdio"; lantiq,groups = "mdio";
@ -63,20 +94,32 @@
reg = <0>; reg = <0>;
mac-address = [ 00 11 22 33 44 55 ]; mac-address = [ 00 11 22 33 44 55 ];
ethernet@1 {
compatible = "lantiq,xrx200-pdi-port";
reg = <4>;
phy-mode = "mii";
phy-handle = <&phy13>;
};
ethernet@2 { ethernet@2 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <2>; reg = <5>;
phy-mode = "gmii"; phy-mode = "mii";
phy-handle = <&phy11>; phy-handle = <&phy14>;
}; };
ethernet@3 { ethernet@3 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <4>; reg = <2>;
phy-mode = "gmii"; phy-mode = "mii";
phy-handle = <&phy13>; phy-handle = <&phy11>;
};
ethernet@4 {
compatible = "lantiq,xrx200-pdi-port";
reg = <3>;
phy-mode = "mii";
phy-handle = <&phy12>;
}; };
}; };
wan: interface@1 { wan: interface@1 {
compatible = "lantiq,xrx200-pdi"; compatible = "lantiq,xrx200-pdi";
#address-cells = <1>; #address-cells = <1>;
@ -84,7 +127,7 @@
reg = <1>; reg = <1>;
mac-address = [ 00 11 22 33 44 56 ]; mac-address = [ 00 11 22 33 44 56 ];
lantiq,wan; lantiq,wan;
ethernet@4 { ethernet@0 {
compatible = "lantiq,xrx200-pdi-port"; compatible = "lantiq,xrx200-pdi-port";
reg = <0>; reg = <0>;
phy-mode = "rgmii"; phy-mode = "rgmii";
@ -102,11 +145,19 @@
}; };
phy11: ethernet-phy@11 { phy11: ethernet-phy@11 {
reg = <0x11>; reg = <0x11>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
};
phy12: ethernet-phy@12 {
reg = <0x12>;
compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
}; };
phy13: ethernet-phy@13 { phy13: ethernet-phy@13 {
reg = <0x13>; reg = <0x13>;
compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22"; compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
};
phy14: ethernet-phy@14 {
reg = <0x14>;
compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
}; };
}; };
}; };
@ -116,7 +167,7 @@
gpios = <&gpio 32 0>; gpios = <&gpio 32 0>;
lantiq,portmask = <0x3>; lantiq,portmask = <0x3>;
}; };
pcie@d900000 { pcie@d900000 {
status = "disabled"; status = "disabled";
compatible = "lantiq,pcie-xway"; compatible = "lantiq,pcie-xway";
@ -133,54 +184,55 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
poll-interval = <100>; poll-interval = <100>;
wps {
label = "wps";
gpios = <&gpio 20 1>;
linux,code = <0x211>;
};
reset { reset {
label = "reset"; label = "reset";
gpios = <&gpio 22 1>; gpios = <&gpio 22 1>;
linux,code = <0x198>; linux,code = <0x198>;
}; };
rfkill { rfkill {
label = "rfkill"; label = "rfkill";
gpios = <&gpio 45 1>; gpios = <&gpio 45 1>;
linux,code = <0xf7>; linux,code = <0xf7>;
}; };
wps {
gpios = <&gpio 20 1>;
linux,code = <0x211>;
};
}; };
gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
lan{ /* green */ lan_green {
label = "lan"; label = "lan";
gpios = <&gpio 02 1>; gpios = <&gpio 2 1>;
}; };
voice { /* green */ message_red {
label = "voice"; label = "message_red";
gpios = <&gpio 29 1>;
};
message1 { /* red */
label = "message1";
gpios = <&gpio 10 1>; gpios = <&gpio 10 1>;
}; };
message2 { /* green */ power_red {
label = "message2";
gpios = <&gpio 19 1>;
};
message3 { /* orange */
label = "message3";
gpios = <&gpio 28 1>;
};
alarm { /* blue */
label = "alarm";
gpios = <&gpio 15 1>;
};
power { /* red */
label = "power"; label = "power";
gpios = <&gpio 14 1>; gpios = <&gpio 14 1>;
default-state = "on"; default-state = "on";
}; };
alarm_blue {
label = "alarm";
gpios = <&gpio 15 1>;
};
message_orange {
label = "message_orange";
gpios = <&gpio 19 1>;
};
message_green {
label = "message_green";
gpios = <&gpio 28 1>;
};
voice_green {
label = "voice";
gpios = <&gpio 29 1>;
};
}; };
}; };

View File

@ -1,50 +1,11 @@
/dts-v1/; /dts-v1/;
/include/ "ARV7519RW.dtsi" /include/ "ARV7519RW.dtsi"
/ { / {
fpi@10000000 {
localbus@0 {
nor-boot@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "uboot";
reg = <0x000000000000 0x00060000>;
read-only;
};
partition@60000 {
label = "uboot_cfg";
reg = <0x000000060000 0x00020000>;
read-only;
};
partition@80000 {
label = "firmware";
reg = <0x000000080000 0x01f00000>;
};
partition@1f80000 {
label = "boardconfig";
reg = <0x000001f80000 0x00080000>;
read-only;
};
};
};
};
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a1x.bin"; /*VR9 1.1*/ firmware = "lantiq/vr9_phy22f_a1x.bin"; /*VR9 1.1*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };
}; };

View File

@ -1,50 +1,11 @@
/dts-v1/; /dts-v1/;
/include/ "ARV7519RW.dtsi" /include/ "ARV7519RW.dtsi"
/ { / {
fpi@10000000 {
localbus@0 {
nor-boot@0 {
compatible = "lantiq,nor";
bank-width = <2>;
reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "uboot";
reg = <0x000000000000 0x00060000>;
read-only;
};
partition@60000 {
label = "uboot_cfg";
reg = <0x000000060000 0x00020000>;
read-only;
};
partition@80000 {
label = "firmware";
reg = <0x000000080000 0x01f00000>;
};
partition@1f80000 {
label = "boardconfig";
reg = <0x000001f80000 0x00080000>;
read-only;
};
};
};
};
gphy-xrx200 { gphy-xrx200 {
compatible = "lantiq,phy-xrx200"; compatible = "lantiq,phy-xrx200";
firmware = "lantiq/vr9_phy11g_a2x.bin"; /*VR9 1.2*/ firmware = "lantiq/vr9_phy22f_a2x.bin"; /*VR9 1.2*/
phys = [ 00 01 ]; phys = [ 00 01 ];
}; };
}; };

View File

@ -37,9 +37,8 @@ endef
$(eval $(call Profile,VGV7519BRN)) $(eval $(call Profile,VGV7519BRN))
define Profile/ARV7519RWV11 define Profile/ARV7519RWV11
NAME:=Livebox Astoria V1 NAME:=Livebox Astoria ARV7519 v1.1
PACKAGES:=kmod-ath9k wpad-mini \ PACKAGES:=kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \ kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \
kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \ kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \
ltq-vdsl-app ppp-mod-pppoa ltq-vdsl-app ppp-mod-pppoa
@ -48,9 +47,8 @@ endef
$(eval $(call Profile,ARV7519RWV11)) $(eval $(call Profile,ARV7519RWV11))
define Profile/ARV7519RWV12 define Profile/ARV7519RWV12
NAME:=Livebox Astoria V2 NAME:=Livebox Astoria ARV7519 v1.2
PACKAGES:=kmod-ath9k wpad-mini \ PACKAGES:=kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
kmod-ltq-deu-vr9 kmod-ltq-hcd-vr9 \
kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \ kmod-ltq-vdsl-vr9-mei kmod-ltq-vdsl-vr9 \
kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \ kmod-ltq-atm-vr9 ltq-vdsl-vr9-fw-installer \
ltq-vdsl-app ppp-mod-pppoa ltq-vdsl-app ppp-mod-pppoa