domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath79: dts: drop "simple-mfd" for gmacs in SoC dtsi

Browse Source 
With a proper probe deferring for ag71xx we don't need to explicitly
probe mdio1 before gmac0.
Drop all "simple-mfd" in SoC dtsi so that gmac orders can be the same
as ar71xx.
This makes eth0/eth1 order the same as those in ar71xx, which means
we don't need a migration script for this anymore and we can merge
incorrectly split gmac/mdio driver back together.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
This commit is contained in:
Chuanhong Guo
2019-05-10 23:28:47 +08:00
committed by Petr Štetiar
parent 32817580e7
commit 8dde11d521
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/dts/ar7241.dtsi
View File

@@ -78,7 +78,7 @@
}; };
&eth1 { &eth1 {
compatible = "qca,ar7241-eth", "syscon", "simple-mfd"; compatible = "qca,ar7241-eth", "syscon";
pll-data = <0x00110000 0x00001099 0x00991099>; pll-data = <0x00110000 0x00001099 0x00991099>;

4
target/linux/ath79/dts/ar7242.dtsi
View File

@@ -45,7 +45,7 @@
}; };
&eth0 { &eth0 {
compatible = "qca,ar7242-eth", "syscon", "simple-mfd"; compatible = "qca,ar7242-eth", "syscon";
pll-data = <0x16000000 0x00000101 0x00001616>; pll-data = <0x16000000 0x00000101 0x00001616>;
pll-reg = <0x4 0x2c 17>; pll-reg = <0x4 0x2c 17>;
@@ -72,7 +72,7 @@
}; };
&eth1 { &eth1 {
compatible = "qca,ar7242-eth", "syscon", "simple-mfd"; compatible = "qca,ar7242-eth", "syscon";
resets = <&rst 13>; resets = <&rst 13>;
reset-names = "mac"; reset-names = "mac";

2
target/linux/ath79/dts/ar9330.dtsi
View File

@@ -192,7 +192,7 @@
}; };
&eth1 { &eth1 {
compatible = "qca,ar9330-eth", "syscon", "simple-mfd"; compatible = "qca,ar9330-eth", "syscon";
pll-data = <0x00110000 0x00001099 0x00991099>; pll-data = <0x00110000 0x00001099 0x00991099>;
phy-mode = "gmii"; phy-mode = "gmii";

2
target/linux/ath79/dts/ar934x.dtsi
View File

@@ -240,7 +240,7 @@
}; };
&eth1 { &eth1 {
compatible = "qca,ar9340-eth", "syscon", "simple-mfd"; compatible = "qca,ar9340-eth", "syscon";
resets = <&rst 13>; resets = <&rst 13>;
reset-names = "mac"; reset-names = "mac";

4
target/linux/ath79/dts/ath79.dtsi
View File

@@ -43,7 +43,7 @@
eth0: eth@19000000 { eth0: eth@19000000 {
status = "disabled"; status = "disabled";
compatible = "qca,ath79-eth", "syscon", "simple-mfd"; compatible = "qca,ath79-eth", "syscon";
reg = <0x19000000 0x200>; reg = <0x19000000 0x200>;
interrupts = <4>; interrupts = <4>;
@@ -66,7 +66,7 @@
eth1: eth@1a000000 { eth1: eth@1a000000 {
status = "disabled"; status = "disabled";
compatible = "qca,ath79-eth", "syscon", "simple-mfd"; compatible = "qca,ath79-eth", "syscon";
reg = <0x1a000000 0x200>; reg = <0x1a000000 0x200>;
interrupts = <5>; interrupts = <5>;

2
target/linux/ath79/dts/qca953x.dtsi
View File

@@ -274,7 +274,7 @@
&eth1 { &eth1 {
status = "okay"; status = "okay";
compatible = "qca,qca9530-eth", "syscon", "simple-mfd"; compatible = "qca,qca9530-eth", "syscon";
resets = <&rst 13>; resets = <&rst 13>;
reset-names = "mac"; reset-names = "mac";

4
target/linux/ath79/dts/qca956x.dtsi
View File

@@ -257,7 +257,7 @@
}; };
&eth0 { &eth0 {
compatible = "qca,qca9560-eth", "syscon", "simple-mfd"; compatible = "qca,qca9560-eth", "syscon";
pll-data = <0x03000000 0x00000101 0x00001919>; pll-data = <0x03000000 0x00000101 0x00001919>;
pll-reg = <0 0x48 0>; pll-reg = <0 0x48 0>;
@@ -300,7 +300,7 @@
}; };
&eth1 { &eth1 {
compatible = "qca,qca9560-eth", "syscon", "simple-mfd"; compatible = "qca,qca9560-eth", "syscon";
phy-mode = "gmii"; phy-mode = "gmii";