ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 07:46:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

ath79: harmonize ethernet-phy naming scheme

Browse Source 
A minority of ethernet-phy definitions seems to use numbers in label,
name and reg property relatively random. This patch aligns their
use to have the same numeric value for all of them.

While at it, improve order of properties/add newlines for the ethX
nodes where necessary.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
This commit is contained in:
Adrian Schmutzler 2020-01-27 14:15:56 +01:00
parent 1ab81bf02d
commit c8190713cb
6 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts
View File

@ -110,7 +110,7 @@
&mdio0 { &mdio0 {
status = "okay"; status = "okay";
phy0: ethernet-phy@c { phy12: ethernet-phy@c {
reg = <0xc>; reg = <0xc>;
phy-mode = "mii"; phy-mode = "mii";
}; };
@ -122,7 +122,7 @@
phy-mode = "mii"; phy-mode = "mii";
mtd-mac-address = <&uboot 0x1fc00>; mtd-mac-address = <&uboot 0x1fc00>;
phy-handle = <&phy0>; phy-handle = <&phy12>;
}; };
&wmac { &wmac {

4
target/linux/ath79/dts/ar9342_ubnt_nanostation-m-xw.dts
View File

@ -17,7 +17,7 @@
phy4-mii-enable; phy4-mii-enable;
phy-mask = <0x23>; phy-mask = <0x23>;
phy4: ethernet-phy@0 { phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
phy-mode = "mii"; phy-mode = "mii";
}; };
@ -27,7 +27,7 @@
status = "okay"; status = "okay";
phy-mode = "mii"; phy-mode = "mii";
phy-handle = <&phy4>; phy-handle = <&phy0>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;

7
target/linux/ath79/dts/qca9558_tplink_re350k-v1.dts
View File

@ -88,7 +88,7 @@
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>, gpios = <&gpio 23 GPIO_ACTIVE_HIGH>,
<&gpio 18 GPIO_ACTIVE_HIGH>; <&gpio 18 GPIO_ACTIVE_HIGH>;
phy0: ethernet-phy@4 { phy4: ethernet-phy@4 {
reg = <4>; reg = <4>;
phy-mode = "rgmii-rxid"; phy-mode = "rgmii-rxid";
@ -101,9 +101,10 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
mtd-mac-address = <&config 0x10008>; phy-handle = <&phy4>;
pll-data = <0x9e000000 0x80000101 0x80001313>; pll-data = <0x9e000000 0x80000101 0x80001313>;
phy-handle = <&phy0>;
mtd-mac-address = <&config 0x10008>;
gmac-config { gmac-config {
device = <&gmac>; device = <&gmac>;

9
target/linux/ath79/dts/qca9558_tplink_rex5x.dtsi
View File

@ -93,7 +93,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
phy0: ethernet-phy@4 { phy4: ethernet-phy@4 {
reg = <4>; reg = <4>;
reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
}; };
@ -167,13 +167,16 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
mtd-mac-address = <&info 0x8>;
phy-handle = <&phy4>;
pll-data = <0xa6000000 0x00000101 0x00001616>; pll-data = <0xa6000000 0x00000101 0x00001616>;
phy-handle = <&phy0>;
mtd-mac-address = <&info 0x8>;
}; };
&wmac { &wmac {
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>; mtd-mac-address = <&info 0x8>;
mtd-mac-address-increment = <(-1)>; mtd-mac-address-increment = <(-1)>;

8
target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
View File

@ -200,8 +200,8 @@
&mdio0 { &mdio0 {
status = "okay"; status = "okay";
phy0: ethernet-phy@0 { phy17: ethernet-phy@11 {
reg = <17>; reg = <0x11>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
}; };
@ -236,7 +236,8 @@
status = "okay"; status = "okay";
pll-data = <0xa6000000 0x00000101 0x00001616>; pll-data = <0xa6000000 0x00000101 0x00001616>;
phy-handle = <&phy0>; phy-handle = <&phy17>;
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;
@ -248,6 +249,7 @@
pll-data = <0x03000101 0x00000101 0x00001616>; pll-data = <0x03000101 0x00000101 0x00001616>;
phy-handle = <&phy1>; phy-handle = <&phy1>;
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;

8
target/linux/ath79/dts/qca9563_tplink_re450-v2.dts
View File

@ -103,7 +103,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
phy0: ethernet-phy@4 { phy4: ethernet-phy@4 {
reg = <4>; reg = <4>;
device_type = "ethernet-phy"; device_type = "ethernet-phy";
reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
@ -125,6 +125,7 @@
&spi { &spi {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;
flash@0 { flash@0 {
@ -178,12 +179,15 @@
&eth0 { &eth0 {
status = "okay"; status = "okay";
phy-handle = <&phy4>;
mtd-mac-address = <&info 0x8>; mtd-mac-address = <&info 0x8>;
phy-handle = <&phy0>;
}; };
&wmac { &wmac {
status = "okay"; status = "okay";
mtd-cal-data = <&art 0x1000>; mtd-cal-data = <&art 0x1000>;
mtd-mac-address = <&info 0x8>; mtd-mac-address = <&info 0x8>;
}; };