Skip to content

L
linux
Commit f07c9651 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'v6.4-next-dts32' of... 

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 055fdcac 115ee470
Hide whitespace changes
Inline Side-by-side
Showing with 207 additions and 162 deletions
arch/arm/boot/dts/mt7623.dtsi
View file @ f07c9651
...@@ -980,6 +980,18 @@ eth: ethernet@1b100000 { ...@@ -980,6 +980,18 @@ eth: ethernet@1b100000 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
status = "disabled"; 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 { crypto: crypto@1b240000 {
......
arch/arm/boot/dts/mt7623a-rfb-emmc.dts
View file @ f07c9651
...@@ -112,75 +112,31 @@ &crypto { ...@@ -112,75 +112,31 @@ &crypto {
status = "okay"; status = "okay";
}; };
&eth { &switch0 {
status = "okay"; ports {
port@0 {
status = "okay";
label = "lan0";
};
port@1 {
status = "okay";
label = "lan1";
};
gmac0: mac@0 { port@2 {
compatible = "mediatek,eth-mac"; status = "okay";
reg = <0>; label = "lan2";
phy-mode = "trgmii"; };
fixed-link { port@3 {
speed = <1000>; status = "okay";
full-duplex; label = "lan3";
pause;
}; };
};
mdio-bus { port@4 {
#address-cells = <1>; status = "okay";
#size-cells = <0>; label = "wan";
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>;
ports {
#address-cells = <1>;
#size-cells = <0>;
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;
};
};
};
}; };
}; };
}; };
......
arch/arm/boot/dts/mt7623a-rfb-nand.dts
View file @ f07c9651
...@@ -116,75 +116,31 @@ &crypto { ...@@ -116,75 +116,31 @@ &crypto {
status = "okay"; status = "okay";
}; };
&eth { &switch0 {
status = "okay"; ports {
port@0 {
status = "okay";
label = "lan0";
};
gmac0: mac@0 { port@1 {
compatible = "mediatek,eth-mac"; status = "okay";
reg = <0>; label = "lan1";
phy-mode = "trgmii"; };
fixed-link { port@2 {
speed = <1000>; status = "okay";
full-duplex; label = "lan2";
pause;
}; };
};
mdio-bus { port@3 {
#address-cells = <1>; status = "okay";
#size-cells = <0>; label = "lan3";
};
switch@0 {
compatible = "mediatek,mt7530"; port@4 {
reg = <0>; status = "okay";
mediatek,mcm; label = "wan";
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 {
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;
};
};
};
}; };
}; };
}; };
......
arch/arm/boot/dts/mt7623a.dtsi
View file @ f07c9651
...@@ -17,8 +17,107 @@ &crypto { ...@@ -17,8 +17,107 @@ &crypto {
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>; 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 { &eth {
status = "okay";
power-domains = <&scpsys MT7623A_POWER_DOMAIN_ETH>; 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 { &nandc {
......
arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
View file @ f07c9651
...@@ -171,28 +171,38 @@ dpi0_out: endpoint { ...@@ -171,28 +171,38 @@ dpi0_out: endpoint {
}; };
}; };
&eth { &gmac0 {
status = "okay"; status = "okay";
phy-mode = "trgmii";
gmac0: mac@0 { fixed-link {
compatible = "mediatek,eth-mac"; speed = <1000>;
reg = <0>; full-duplex;
phy-mode = "trgmii"; pause;
};
};
fixed-link { &gmac1 {
speed = <1000>; status = "okay";
full-duplex; phy-mode = "rgmii";
pause;
}; fixed-link {
speed = <1000>;
full-duplex;
pause;
}; };
};
&eth {
status = "okay";
mdio: mdio-bus { mdio-bus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch@0 { switch@1f {
compatible = "mediatek,mt7530"; compatible = "mediatek,mt7530";
reg = <0>; reg = <0x1f>;
reset-gpios = <&pio 33 0>; reset-gpios = <&pio 33 0>;
core-supply = <&mt6323_vpa_reg>; core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>; io-supply = <&mt6323_vemc3v3_reg>;
...@@ -226,6 +236,19 @@ port@4 { ...@@ -226,6 +236,19 @@ port@4 {
label = "lan3"; label = "lan3";
}; };
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
};
port@6 { port@6 {
reg = <6>; reg = <6>;
label = "cpu"; label = "cpu";
......
arch/arm/boot/dts/mt7623n-rfb-emmc.dts
View file @ f07c9651
...@@ -156,27 +156,25 @@ dpi0_out: endpoint { ...@@ -156,27 +156,25 @@ dpi0_out: endpoint {
}; };
}; };
&eth { &gmac0 {
status = "okay"; status = "okay";
phy-mode = "trgmii";
gmac0: mac@0 { fixed-link {
compatible = "mediatek,eth-mac"; speed = <1000>;
reg = <0>; full-duplex;
phy-mode = "trgmii"; pause;
fixed-link {
speed = <1000>;
full-duplex;
pause;
};
}; };
};
mac@1 { &gmac1 {
compatible = "mediatek,eth-mac"; status = "okay";
reg = <1>; phy-mode = "rgmii";
phy-mode = "rgmii"; phy-handle = <&phy5>;
phy-handle = <&phy5>; };
};
&eth {
status = "okay";
mdio-bus { mdio-bus {
#address-cells = <1>; #address-cells = <1>;
...@@ -187,9 +185,9 @@ phy5: ethernet-phy@5 { ...@@ -187,9 +185,9 @@ phy5: ethernet-phy@5 {
phy-mode = "rgmii-rxid"; phy-mode = "rgmii-rxid";
}; };
switch@0 { switch@1f {
compatible = "mediatek,mt7530"; compatible = "mediatek,mt7530";
reg = <0>; reg = <0x1f>;
reset-gpios = <&pio 33 0>; reset-gpios = <&pio 33 0>;
core-supply = <&mt6323_vpa_reg>; core-supply = <&mt6323_vpa_reg>;
io-supply = <&mt6323_vemc3v3_reg>; io-supply = <&mt6323_vemc3v3_reg>;
...@@ -232,6 +230,7 @@ port@6 { ...@@ -232,6 +230,7 @@ port@6 {
fixed-link { fixed-link {
speed = <1000>; speed = <1000>;
full-duplex; full-duplex;
pause;
}; };
}; };
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7