ath79: ar933x: Update dts for current ag71xx driver

gmac0 is always connected to switch phy4 and mdio1 is always needed.
So add phy handle for eth0 and enable mdio1 by default.
Move fixed-link for gmac1 from device dts to ar9331.dtsi because gmac1 is always connected to builtin switch.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
This commit is contained in:
Chuanhong Guo 2018-07-17 17:09:14 +08:00 committed by John Crispin
parent f6c99241ba
commit c7c807cb8c
7 changed files with 43 additions and 82 deletions

View file

@ -160,28 +160,44 @@
resets = <&rst 9>;
reset-names = "mac";
};
&mdio0 {
regmap = <&eth1>;
builtin-switch;
resets = <&rst 23>;
reset-names = "mdio";
phy-mode = "mii";
phy-handle = <&swphy4>;
};
&mdio1 {
status = "okay";
resets = <&rst 23>;
reset-names = "mdio";
builtin-switch;
builtin_switch: switch0@1f {
compatible = "qca,ar8216-builtin";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x1f>;
mdio-bus {
swphy4: ethernet-phy@4 {
reg = <4>;
phy-mode = "mii";
};
};
};
};
&eth1 {
compatible = "qca,ar9330-eth", "syscon";
compatible = "qca,ar9330-eth", "syscon", "simple-mfd";
pll-data = <0x00110000 0x00001099 0x00991099>;
phy-mode = "gmii";
resets = <&rst 13>;
reset-names = "mac";
fixed-link {
speed = <1000>;
full-duplex;
};
};

View file

@ -123,21 +123,10 @@
};
};
&mdio0 {
status = "okay";
phy4: ethernet-phy@4 {
reg = <4>;
phy-mode = "mii";
};
};
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
phy-handle = <&phy4>;
};
&eth1 {
@ -145,11 +134,6 @@
mtd-mac-address = <&art 0x0>;
fixed-link {
speed = <1000>;
full-duplex;
};
gmac-config {
device = <&gmac>;

View file

@ -108,12 +108,6 @@
mtd-mac-address = <&art 0x1002>;
mtd-mac-address-increment = <0x40>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
&mdio1 {

View file

@ -73,18 +73,9 @@
status = "okay";
};
&mdio0 {
status = "okay";
phy4: ethernet-phy@4 {
reg = <4>;
phy-mode = "mii";
};
};
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
phy-handle = <&phy4>;
gmac-config {
device = <&gmac>;
@ -93,6 +84,11 @@
};
};
&eth1 {
status = "okay";
compatible = "syscon", "simple-mfd";
};
&spi {
num-chipselects = <1>;
status = "okay";

View file

@ -155,29 +155,22 @@
};
};
&mdio1 {
&eth0 {
status = "okay";
phy4: ethernet-phy@4 {
reg = <4>;
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
device = <&gmac>;
switch-phy-addr-swap = <0>;
switch-phy-swap = <0>;
};
};
&eth1 {
status = "okay";
phy-handle = <&phy4>;
mtd-mac-address = <&uboot 0x1fc00>;
fixed-link {
speed = <1000>;
full-duplex;
};
gmac-config {
device = <&gmac>;
switch-phy-addr-swap = <1>;
switch-phy-swap = <1>;
};
compatible = "syscon", "simple-mfd";
};
&wmac {

View file

@ -84,8 +84,6 @@
&eth0 {
status = "okay";
phy-handle = <&phy4>;
mtd-mac-address = <&uboot 0x1fc00>;
gmac-config {
@ -96,17 +94,13 @@
};
};
&gpio {
&eth1 {
status = "okay";
compatible = "syscon", "simple-mfd";
};
&mdio0 {
&gpio {
status = "okay";
phy4: ethernet-phy@4 {
reg = <4>;
phy-mode = "mii";
};
};
&uart {

View file

@ -121,20 +121,9 @@
};
};
&mdio0 {
status = "okay";
phy4: ethernet-phy@4 {
reg = <4>;
phy-mode = "mii";
};
};
&eth0 {
status = "okay";
phy-handle = <&phy4>;
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <1>;
@ -151,11 +140,6 @@
mtd-mac-address = <&uboot 0x1fc00>;
mtd-mac-address-increment = <(-1)>;
fixed-link {
speed = <1000>;
full-duplex;
};
};
&gpio {