github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-28 17:13:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

MT7530 (e.g. BPI R2):

Browse Source 
- several DT clean-ups
 - add port5 as CPU port
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAmSJ13IXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH66eRAAsoU2H7OxXUewNAdQzuRUEsu+
 Z7Ylb1yeJpleKZb2sDNW1IpkwQw9t97snH6yGA+8WGPWIejVZx098uTFKduIDkp4
 lqNgZLuLTaWqd2JrUMp9p5S0uKoFqmlQ4n9xgjykKmSHvO/d7umNSJsLmsnQvvXC
 Edzxt2NL3ZGpIMg27M2nIeMtFEkGMuZMJjwOu/3da2Uu0mfc6uU6NyoY4ndvgFjf
 hbyQeCiVzO8HXIZrfKlyQ+zZmzNtJrYVs4Y5L1ngBx6Fxaj1q1DwpdarB+Hpmik7
 49QzzGLiJmdoa2b/yl7lsp4Q8lUKX7frVanks2kHhfJDb5FEy8RZ1VeQmUWwqNTk
 up4/2ADuVrlnHxHvQ7XZeUpKisjqEyFMVSQPqTrhiKJlopGuimZzz6r277DQkwyq
 gLEhsBl7OEFr4hmGabSwx+0RUDj7dJcKeM1Kv4AXIA2lDyUAHoL9EiRjskj0ZXAf
 COvUsbLG0aakkEMBClRuO+o1iZ6emp9Kvo7Px68fEwP7x7BZYjL5H7U8T8IilPHH
 WYj8qADNPEFVg12rAJj0QQipSpUxDO34hKEv5fTUwRgD2wQDA8Hd115Q1l3hFf97
 CGYMjllrFkiv+efcrkN/m0j9saKVC++DDukK9tZnI6tGRCBVdhgvRu/YONpTXOcr
 YslILS/jM9CsAc04i/M=
 =ZUuN
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmSSEnMACgkQYKtH/8kJ
 UifmnRAAoODUzDI+ErJHUwUU2KInZ59245IAC6vOFaqrXmDt5M7+qBs992+rKLdQ
 4Xg1DFGnxyrJHD0UzUeCCyt5WJZvUDC56I/9PvuIE6Rzf8aB3tBSX5CMXxiHvHns
 iiOUHx5zJxKwYSTXZ/NHOrNgrEnMqNkvXIPBTi8pn9uNDeDUKG53jSd75q0oFFTs
 dLDwYx5dH7ZBnOGxnzyuoMfsVOLNEAgXQVHTO9cYUYVl6b7JD1iWUIkGz3gf21Yb
 WhPD8Ct0v5iTuEdOB0eOcv1M5nJLGMpFsj8hlGrmopABxKSk8kn3p+L6/8zkiUsp
 NOJb/kXo9JN0190osxu7TmOK5itU8yXqzHie3slAvb1/Jk7wHQvhH4AWfwB7xKuz
 Q8XRzOOGBIbqGZe6tbSHRXsfA8srxz3OBc1nO9Dsdgt2HEc0ZswO7scAmCM0n4PR
 Yh1FdmFsRBmz+BFmfKNuZlP/ezGIpr3PnU5WSunR+pIahwRs8P+e3rUFLjk6Cic5
 0dy5hX3SoafhvuEgBRrjOH02O43RuQ5IUO3Pfi60INHX1cOycZbHYjXnYLVjacTb
 DdJUVSVCzTtk0KoY1mHgj6TARNSWeiP3DSX9XxH1+Sx3UCwsUmUHxjw/8ibWrd3A
 E06VrSfQySbvZmTm38Uhhyv4d9Z7ueSQ+jZuHofE47v/SpDKKIQ=
 =BnTC
 -----END PGP SIGNATURE-----

Merge tag 'v6.4-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into soc/dt

MT7530 (e.g. BPI R2):
- several DT clean-ups
- add port5 as CPU port

* tag 'v6.4-next-dts32' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: dts: mt7623: add port@5 as CPU port
  arm: dts: mt7623: enable flow control on port@6
  arm: dts: mt7623: change mt7530 switch address
  arm: dts: mt7623: add mt7530 switch to mt7623a.dtsi
  arm: dts: mt7623: add gmacs to mt7623.dtsi

Link: https://lore.kernel.org/r/98e21acb-d792-6a8c-2de6-12d5af8a8111@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-06-20 22:56:19 +02:00
commit f07c96511d
6 changed files with 209 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/mt7623.dtsi
View File

@ -980,6 +980,18 @@ eth: ethernet@1b100000 {
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
status = "disabled";
};
gmac1: mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
status = "disabled";
};
};
crypto: crypto@1b240000 {

84
arch/arm/boot/dts/mt7623a-rfb-emmc.dts
View File

@ -112,75 +112,31 @@ &crypto {
status = "okay";
};
&eth {
status = "okay";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
&switch0 {
ports {
port@0 {
status = "okay";
label = "lan0";
};
};
mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
status = "okay";
label = "lan1";
};
switch@0 {
compatible = "mediatek,mt7530";
reg = <0>;
mediatek,mcm;
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
reset-names = "mcm";
core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>;
port@2 {
status = "okay";
label = "lan2";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@3 {
status = "okay";
label = "lan3";
};
port@0 {
reg = <0>;
label = "lan0";
};
port@1 {
reg = <1>;
label = "lan1";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan3";
};
port@4 {
reg = <4>;
label = "wan";
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
port@4 {
status = "okay";
label = "wan";
};
};
};

84
arch/arm/boot/dts/mt7623a-rfb-nand.dts
View File

@ -116,75 +116,31 @@ &crypto {
status = "okay";
};
&eth {
status = "okay";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
&switch0 {
ports {
port@0 {
status = "okay";
label = "lan0";
};
};
mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
port@1 {
status = "okay";
label = "lan1";
};
switch@0 {
compatible = "mediatek,mt7530";
reg = <0>;
mediatek,mcm;
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
reset-names = "mcm";
core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>;
port@2 {
status = "okay";
label = "lan2";
};
ports {
#address-cells = <1>;
#size-cells = <0>;
port@3 {
status = "okay";
label = "lan3";
};
port@0 {
reg = <0>;
label = "lan0";
};
port@1 {
reg = <1>;
label = "lan1";
};
port@2 {
reg = <2>;
label = "lan2";
};
port@3 {
reg = <3>;
label = "lan3";
};
port@4 {
reg = <4>;
label = "wan";
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
};
};
};
port@4 {
status = "okay";
label = "wan";
};
};
};

99
arch/arm/boot/dts/mt7623a.dtsi
View File

@ -17,8 +17,107 @@ &crypto {
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
};
&gmac0 {
status = "okay";
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gmac1 {
status = "okay";
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&eth {
status = "okay";
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>;
mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
switch0: switch@1f {
compatible = "mediatek,mt7530";
reg = <0x1f>;
mediatek,mcm;
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
reset-names = "mcm";
core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>;
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
status = "disabled";
reg = <0>;
label = "swp0";
};
port@1 {
status = "disabled";
reg = <1>;
label = "swp1";
};
port@2 {
status = "disabled";
reg = <2>;
label = "swp2";
};
port@3 {
status = "disabled";
reg = <3>;
label = "swp3";
};
port@4 {
status = "disabled";
reg = <4>;
label = "swp4";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
};
};
};
};
&nandc {

53
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View File

@ -171,28 +171,38 @@ dpi0_out: endpoint {
};
};
&gmac0 {
status = "okay";
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gmac1 {
status = "okay";
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&eth {
status = "okay";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
mdio: mdio-bus {
mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
switch@0 {
switch@1f {
compatible = "mediatek,mt7530";
reg = <0>;
reg = <0x1f>;
reset-gpios = <&pio 33 0>;
core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>;
@ -226,6 +236,19 @@ port@4 {
label = "lan3";
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
port@6 {
reg = <6>;
label = "cpu";

41
arch/arm/boot/dts/mt7623n-rfb-emmc.dts
View File

@ -156,28 +156,26 @@ dpi0_out: endpoint {
};
};
&gmac0 {
status = "okay";
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
&gmac1 {
status = "okay";
phy-mode = "rgmii";
phy-handle = <&phy5>;
};
&eth {
status = "okay";
gmac0: mac@0 {
compatible = "mediatek,eth-mac";
reg = <0>;
phy-mode = "trgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
mac@1 {
compatible = "mediatek,eth-mac";
reg = <1>;
phy-mode = "rgmii";
phy-handle = <&phy5>;
};
mdio-bus {
#address-cells = <1>;
#size-cells = <0>;
@ -187,9 +185,9 @@ phy5: ethernet-phy@5 {
phy-mode = "rgmii-rxid";
};
switch@0 {
switch@1f {
compatible = "mediatek,mt7530";
reg = <0>;
reg = <0x1f>;
reset-gpios = <&pio 33 0>;
core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>;
@ -232,6 +230,7 @@ port@6 {
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
};