net-next: dsa: mt7530: add support for MT7531
Subsystems (6)
v4 cover net-next: dsa: mt7530: add support for MT7531
This patch series adds support for MT7531.
MT7531 is the next generation of MT7530 which could be found on Mediatek router platforms such as MT7622 or MT7629.
It is also a 7-ports switch with 5 giga embedded phys, 2 cpu ports, and the same MAC logic of MT7530. Cpu port 6 only supports SGMII interface. Cpu port 5 supports either RGMII or SGMII in different HW SKU, but cannot be muxed to PHY of port 0/4 like mt7530. Due to support for SGMII interface, pll, and pad setting are different from MT7530.
MT7531 SGMII interface can be configured in following mode:
- 'SGMII AN mode' with in-band negotiation capability
which is compatible with PHY_INTERFACE_MODE_SGMII.
- 'SGMII force mode' without in-band negotiation
which is compatible with 10B/8B encoding of PHY_INTERFACE_MODE_1000BASEX with fixed full-duplex and fixed pause.
- 2.5 times faster clocked 'SGMII force mode' without in-band negotiation which is compatible with 10B/8B encoding of PHY_INTERFACE_MODE_2500BASEX with fixed full-duplex and fixed pause.
v3 -> v4
- Adjust the coding style by suggestion of Jakub Kicinski. Remove unnecessary jumping label, merge continuous numeric 'switch cases' into one line, and keep the variables longest to shortest (reverse xmas tree).
v2 -> v3
- Keep the same setup logic of mt7530/mt7621 because these series of patches is for adding mt7531 hardware.
- Do not adjust rgmii delay when vendor phy driver presents in order to prevent double adjustment by suggestion of Andrew Lunn.
- Remove redundant 'Example 4' from dt-bindings by suggestion of Rob Herring.
- Fix typo.
v1 -> v2
- change phylink_validate callback function to support full-duplex gigabit only to match hardware capability.
- add description of SGMII interface.
- configure mt7531 cpu port in fastest speed by default.
- parse SGMII control word for in-band negotiation mode.
- configure RGMII delay based on phy.rst.
- Rename the definition in the header file to avoid potential conflicts.
- Add wrapper function for mdio read/write to support both C22 and C45.
- correct fixed-link speed of 2500base-x in dts.
- add MT7531 port mirror setting.
Landen Chao (6):
net: dsa: mt7530: Refine message in Kconfig
net: dsa: mt7530: Extend device data ready for adding a new hardware
dt-bindings: net: dsa: add new MT7531 binding to support MT7531
net: dsa: mt7530: Add the support of MT7531 switch
arm64: dts: mt7622: add mt7531 dsa to mt7622-rfb1 board
arm64: dts: mt7622: add mt7531 dsa to bananapi-bpi-r64 board
.../devicetree/bindings/net/dsa/mt7530.txt | 13 +- .../dts/mediatek/mt7622-bananapi-bpi-r64.dts | 44 + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 57 +- drivers/net/dsa/Kconfig | 6 +- drivers/net/dsa/mt7530.c | 1192 +++++++++++++++-- drivers/net/dsa/mt7530.h | 259 +++- 6 files changed, 1455 insertions(+), 116 deletions(-)
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v4 1/6 net: dsa: mt7530: Refine message in Kconfig
Refine message in Kconfig with fixing typo and an explicit MT7621 support.
--- drivers/net/dsa/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/Kconfig +3 -3
@@ -33,12 +33,12 @@ config NET_DSA_LANTIQ_GSWIP the xrx200 / VR9 SoC. config NET_DSA_MT7530 - tristate "Mediatek MT7530 Ethernet switch support" + tristate "MediaTek MT7530 and MT7621 Ethernet switch support" depends on NET_DSA select NET_DSA_TAG_MTK help - This enables support for the Mediatek MT7530 Ethernet switch - chip. + This enables support for the MediaTek MT7530 and MT7621 Ethernet + switch chip. config NET_DSA_MV88E6060 tristate "Marvell 88E6060 ethernet switch chip support"
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v4 2/6 net: dsa: mt7530: Extend device data ready for adding a new hardware
In reply to Landen ChaoAdd a structure holding required operations for each device such as device initialization, PHY port read or write, a checker whether PHY interface is supported on a certain port, MAC port setup for either bus pad or a specific PHY interface.
The patch is done for ready adding a new hardware MT7531, and keep the same setup logic of existing hardware.
--- drivers/net/dsa/mt7530.c | 271 ++++++++++++++++++++++++++++----------- drivers/net/dsa/mt7530.h | 37 +++++- 2 files changed, 234 insertions(+), 74 deletions(-)
drivers/net/dsa/mt7530.c +198 -73
@@ -372,8 +372,9 @@ mt7530_fdb_write(struct mt7530_priv *priv, u16 vid,mt7530_write (priv,MT7530_ATA1 + (i *4 ), reg[i]); } +/* Setup TX circuit including relevant PAD and driving */ static int -mt7530_pad_clk_setup (struct dsa_switch *ds,int mode) +mt7530_pad_clk_setup (struct dsa_switch *ds,phy_interface_t interface) {struct mt7530_priv *priv = ds->priv;u32 ncpo1, ssc_delta, trgint, i, xtal;
@@ -387,7 +388,7 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, int mode)return -EINVAL ; } -switch (mode) { +switch (interface) {case PHY_INTERFACE_MODE_RGMII : trgint =0 ;/* PLL frequency: 125MHz */
@@ -409,7 +410,8 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, int mode) }break ;default : -dev_err (priv->dev,"xMII mode %d not supported\n" , mode); +dev_err (priv->dev,"xMII interface %d not supported\n" , + interface);return -EINVAL ; }
@@ -1349,47 +1351,116 @@ mt7530_setup(struct dsa_switch *ds)return 0 ; } -static void mt7530_phylink_mac_config (struct dsa_switch *ds,int port, -unsigned int mode, -const struct phylink_link_state *state) +static bool +mt7530_phy_mode_supported (struct dsa_switch *ds,int port, +const struct phylink_link_state *state) {struct mt7530_priv *priv = ds->priv; -u32 mcr_cur, mcr_new;switch (port) { -case 0 :/* Internal phy */ -case 1 : -case 2 : -case 3 : -case 4 : + case 0 ... 4: /* Internal phy */if (state->interface !=PHY_INTERFACE_MODE_GMII ) -return ; +return false;break ;case 5 :/* 2nd cpu port with phy of port 0 or 4 / external phy */ -if (priv->p5_interface == state->interface) -break ;if (!phy_interface_mode_is_rgmii (state->interface) && state->interface !=PHY_INTERFACE_MODE_MII && state->interface !=PHY_INTERFACE_MODE_GMII ) -return ; +return false; +break ; +case 6 :/* 1st cpu port */ +if (state->interface !=PHY_INTERFACE_MODE_RGMII && + state->interface !=PHY_INTERFACE_MODE_TRGMII ) +return false; +break ; +default : +dev_err (priv->dev,"%s: unsupported port: %i\n" , __func__, + port); +return false; + } + +return true; +} + +static bool +mt753x_phy_mode_supported (struct dsa_switch *ds,int port, +const struct phylink_link_state *state) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->phy_mode_supported (ds, port, state); +} + +static int +mt753x_pad_setup (struct dsa_switch *ds,const struct phylink_link_state *state) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->pad_setup (ds, state->interface); +} + +static int +mt7530_mac_config (struct dsa_switch *ds,int port,unsigned int mode, +phy_interface_t interface) +{ +struct mt7530_priv *priv = ds->priv; + +/* Only need to setup port5. */ +if (port !=5 ) +return 0 ; + +mt7530_setup_port5 (priv->ds, interface); + +return 0 ; +} + +static int +mt753x_mac_config (struct dsa_switch *ds,int port,unsigned int mode, +const struct phylink_link_state *state) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->mac_port_config (ds, port, mode, state->interface); +} + +static void +mt753x_phylink_mac_config (struct dsa_switch *ds,int port,unsigned int mode, +const struct phylink_link_state *state) +{ +struct mt7530_priv *priv = ds->priv; +u32 mcr_cur, mcr_new; + +if (!mt753x_phy_mode_supported (ds, port, state)) + goto unsupported; + +switch (port) { + case 0 ... 4: /* Internal phy */ +if (state->interface !=PHY_INTERFACE_MODE_GMII ) + goto unsupported; +break ; +case 5 :/* 2nd cpu port with phy of port 0 or 4 / external phy */ +if (priv->p5_interface == state->interface) +break ; + +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; -mt7530_setup_port5 (ds, state->interface);break ;case 6 :/* 1st cpu port */ if (priv->p6_interface == state->interface)break ; -if (state->interface !=PHY_INTERFACE_MODE_RGMII && - state->interface !=PHY_INTERFACE_MODE_TRGMII ) -return ; +mt753x_pad_setup (ds, state); -/* Setup TX circuit incluing relevant PAD and driving */ -mt7530_pad_clk_setup (ds, state->interface); +if (mt753x_mac_config (ds, port, mode, state) <0 ) + goto unsupported; priv->p6_interface = state->interface;break ;default : -dev_err (ds->dev,"%s: unsupported port: %i\n" , __func__, port); +unsupported: +dev_err (ds->dev,"%s: unsupported %s port: %i\n" , + __func__,phy_modes (state->interface), port);return ; }
@@ -1453,61 +1524,44 @@ static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,mt7530_set (priv,MT7530_PMCR_P (port), mcr); } -static void mt7530_phylink_validate (struct dsa_switch *ds,int port, -unsigned long *supported, -struct phylink_link_state *state) +static void +mt7530_mac_port_validate (struct dsa_switch *ds,int port, +unsigned long *supported) +{ +if (port ==5 ) + phylink_set(supported, 1000baseX_Full); +} + +static void +mt753x_phylink_validate (struct dsa_switch *ds,int port, +unsigned long *supported, +struct phylink_link_state *state) {__ETHTOOL_DECLARE_LINK_MODE_MASK (mask) = {0 , }; +struct mt7530_priv *priv = ds->priv; -switch (port) { -case 0 :/* Internal phy */ -case 1 : -case 2 : -case 3 : -case 4 : -if (state->interface !=PHY_INTERFACE_MODE_NA && - state->interface !=PHY_INTERFACE_MODE_GMII ) - goto unsupported; -break ; -case 5 :/* 2nd cpu port with phy of port 0 or 4 / external phy */ -if (state->interface !=PHY_INTERFACE_MODE_NA && - !phy_interface_mode_is_rgmii (state->interface) && - state->interface !=PHY_INTERFACE_MODE_MII && - state->interface !=PHY_INTERFACE_MODE_GMII ) - goto unsupported; -break ; -case 6 :/* 1st cpu port */ -if (state->interface !=PHY_INTERFACE_MODE_NA && - state->interface !=PHY_INTERFACE_MODE_RGMII && - state->interface !=PHY_INTERFACE_MODE_TRGMII ) - goto unsupported; -break ; -default : -dev_err (ds->dev,"%s: unsupported port: %i\n" , __func__, port); -unsupported: +if (state->interface !=PHY_INTERFACE_MODE_NA && + !mt753x_phy_mode_supported (ds, port, state)) {linkmode_zero (supported);return ; }phylink_set_port_modes (mask); -phylink_set (mask, Autoneg); -if (state->interface ==PHY_INTERFACE_MODE_TRGMII ) { - phylink_set(mask, 1000baseT_Full); - }else { +if (state->interface !=PHY_INTERFACE_MODE_TRGMII ) { phylink_set(mask, 10baseT_Half); phylink_set(mask, 10baseT_Full); phylink_set(mask, 100baseT_Half); phylink_set(mask, 100baseT_Full); - -if (state->interface !=PHY_INTERFACE_MODE_MII ) { -/* This switch only supports 1G full-duplex. */ - phylink_set(mask, 1000baseT_Full); -if (port ==5 ) - phylink_set(mask, 1000baseX_Full); - } +phylink_set (mask, Autoneg); } +/* This switch only supports 1G full-duplex. */ +if (state->interface !=PHY_INTERFACE_MODE_MII ) + phylink_set(mask, 1000baseT_Full); + + priv->info->mac_port_validate (ds, port, mask); +phylink_set (mask, Pause);phylink_set (mask, Asym_Pause);
@@ -1555,12 +1609,45 @@ mt7530_phylink_mac_link_state(struct dsa_switch *ds, int port,return 1 ; } +static int +mt753x_phylink_mac_link_state (struct dsa_switch *ds,int port, +struct phylink_link_state *state) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->mac_port_get_state (ds, port, state); +} + +static int +mt753x_setup (struct dsa_switch *ds) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->sw_setup (ds); +} + +static int +mt753x_phy_read (struct dsa_switch *ds,int port,int regnum) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->phy_read (ds, port, regnum); +} + +static int +mt753x_phy_write (struct dsa_switch *ds,int port,int regnum,u16 val) +{ +struct mt7530_priv *priv = ds->priv; + +return priv->info->phy_write (ds, port, regnum, val); +} +static const struct dsa_switch_ops mt7530_switch_ops = { .get_tag_protocol = mtk_get_tag_protocol, - .setup = mt7530_setup, + .setup = mt753x_setup, .get_strings = mt7530_get_strings, - .phy_read = mt7530_phy_read, - .phy_write = mt7530_phy_write, + .phy_read = mt753x_phy_read, + .phy_write = mt753x_phy_write, .get_ethtool_stats = mt7530_get_ethtool_stats, .get_sset_count = mt7530_get_sset_count, .port_enable = mt7530_port_enable,
@@ -1577,16 +1664,41 @@ static const struct dsa_switch_ops mt7530_switch_ops = { .port_vlan_del = mt7530_port_vlan_del, .port_mirror_add = mt7530_port_mirror_add, .port_mirror_del = mt7530_port_mirror_del, - .phylink_validate = mt7530_phylink_validate, - .phylink_mac_link_state = mt7530_phylink_mac_link_state, - .phylink_mac_config = mt7530_phylink_mac_config, + .phylink_validate = mt753x_phylink_validate, + .phylink_mac_link_state = mt753x_phylink_mac_link_state, + .phylink_mac_config = mt753x_phylink_mac_config, .phylink_mac_link_down = mt7530_phylink_mac_link_down, .phylink_mac_link_up = mt7530_phylink_mac_link_up, }; +static const struct mt753x_info mt753x_table[] = { + [ID_MT7621 ] = { + .id =ID_MT7621 , + .sw_setup = mt7530_setup, + .phy_read = mt7530_phy_read, + .phy_write = mt7530_phy_write, + .pad_setup = mt7530_pad_clk_setup, + .phy_mode_supported = mt7530_phy_mode_supported, + .mac_port_validate = mt7530_mac_port_validate, + .mac_port_get_state = mt7530_phylink_mac_link_state, + .mac_port_config = mt7530_mac_config, + }, + [ID_MT7530 ] = { + .id =ID_MT7530 , + .sw_setup = mt7530_setup, + .phy_read = mt7530_phy_read, + .phy_write = mt7530_phy_write, + .pad_setup = mt7530_pad_clk_setup, + .phy_mode_supported = mt7530_phy_mode_supported, + .mac_port_validate = mt7530_mac_port_validate, + .mac_port_get_state = mt7530_phylink_mac_link_state, + .mac_port_config = mt7530_mac_config, + }, +}; +static const struct of_device_id mt7530_of_match[] = { - { .compatible ="mediatek,mt7621" , .data = (void *)ID_MT7621 , }, - { .compatible ="mediatek,mt7530" , .data = (void *)ID_MT7530 , }, + { .compatible ="mediatek,mt7621" , .data = &mt753x_table[ID_MT7621 ], }, + { .compatible ="mediatek,mt7530" , .data = &mt753x_table[ID_MT7530 ], }, {/* sentinel */ }, };MODULE_DEVICE_TABLE (of, mt7530_of_match);
@@ -1627,8 +1739,21 @@ mt7530_probe(struct mdio_device *mdiodev)/* Get the hardware identifier from the devicetree node. * We will need it for some of the clock and regulator setup. */ - priv->id = (unsigned int )(unsigned long ) -of_device_get_match_data (&mdiodev->dev); + priv->info =of_device_get_match_data (&mdiodev->dev); +if (!priv->info) +return -EINVAL ; + +/* Sanity check if these required device operations are filled +* properly. +*/ +if (!priv->info->sw_setup || !priv->info->pad_setup || + !priv->info->phy_read || !priv->info->phy_write || + !priv->info->phy_mode_supported || + !priv->info->mac_port_validate || + !priv->info->mac_port_get_state || !priv->info->mac_port_config) +return -EINVAL ; + + priv->id = priv->info->id;if (priv->id ==ID_MT7530 ) { priv->core_pwr =devm_regulator_get (&mdiodev->dev,"core" );
drivers/net/dsa/mt7530.h +36 -1
@@ -11,7 +11,7 @@#define MT7530_NUM_FDB_RECORDS 2048#define MT7530_ALL_MEMBERS 0xff -enum { +enum mt753x_id {ID_MT7530 =0 ,ID_MT7621 =1 , };
@@ -443,6 +443,40 @@ static const char *p5_intf_modes(unsigned int p5_interface) } } +/* struct mt753x_info - This is the main data structure for holding the specific +* part for each supported device +* @sw_setup: Holding the handler to a device initialization +* @phy_read: Holding the way reading PHY port +* @phy_write: Holding the way writing PHY port +* @pad_setup: Holding the way setting up the bus pad for a certain +* MAC port +* @phy_mode_supported: Check if the PHY type is being supported on a certain +* port +* @mac_port_validate: Holding the way to set addition validate type for a +* certan MAC port +* @mac_port_get_state: Holding the way getting the MAC/PCS state for a certain +* MAC port +* @mac_port_config: Holding the way setting up the PHY attribute to a +* certain MAC port +*/ +struct mt753x_info { +enum mt753x_id id; + +int (*sw_setup)(struct dsa_switch *ds); +int (*phy_read)(struct dsa_switch *ds,int port,int regnum); +int (*phy_write)(struct dsa_switch *ds,int port,int regnum,u16 val); +int (*pad_setup)(struct dsa_switch *ds,phy_interface_t interface); +bool (*phy_mode_supported)(struct dsa_switch *ds,int port, +const struct phylink_link_state *state); +void (*mac_port_validate)(struct dsa_switch *ds,int port, +unsigned long *supported); +int (*mac_port_get_state)(struct dsa_switch *ds,int port, +struct phylink_link_state *state); +int (*mac_port_config)(struct dsa_switch *ds,int port, +unsigned int mode, +phy_interface_t interface); +}; +/* struct mt7530_priv - This is the main data structure for holding the state * of the driver * @dev: The device pointer
@@ -468,6 +502,7 @@ struct mt7530_priv {struct regulator *core_pwr;struct regulator *io_pwr;struct gpio_desc *reset; +const struct mt753x_info *info;unsigned int id;bool mcm;phy_interface_t p6_interface;
Signature · 1 line
2.17.1
PATCH v4 3/6 dt-bindings: net: dsa: add new MT7531 binding to support MT7531
In reply to Landen ChaoAdd devicetree binding to support the compatible mt7531 switch as used in the MediaTek MT7531 switch.
--- .../devicetree/bindings/net/dsa/mt7530.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/dsa/mt7530.txt +9 -4
@@ -5,6 +5,7 @@ Required properties: - compatible: may be compatible = "mediatek,mt7530" or compatible = "mediatek,mt7621" + or compatible = "mediatek,mt7531" - #address-cells: Must be 1. - #size-cells: Must be 0. - mediatek,mcm: Boolean; if defined, indicates that either MT7530 is the part
@@ -32,10 +33,14 @@ Required properties for the child nodes within ports container: - reg: Port address described must be 6 for CPU port and from 0 to 5 for user ports. -- phy-mode: String, must be either "trgmii" or "rgmii" for port labeled - "cpu". - -Port 5 of the switch is muxed between: +- phy-mode: String, the following values are acceptable for port labeled + "cpu": + If compatible mediatek,mt7530 or mediatek,mt7621 is set, + must be either "trgmii" or "rgmii" + If compatible mediatek,mt7531 is set, + must be either "sgmii", "1000base-x" or "2500base-x" + +Port 5 of mt7530 and mt7621 switch is muxed between: 1. GMAC5: GMAC5 can interface with another external MAC or PHY. 2. PHY of port 0 or port 4: PHY interfaces with an external MAC like 2nd GMAC of the SOC. Used in many setups where port 0/4 becomes the WAN port.
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v4 4/6 net: dsa: mt7530: Add the support of MT7531 switch
In reply to Landen ChaoAdd new support for MT7531:
MT7531 is the next generation of MT7530. It is also a 7-ports switch with 5 giga embedded phys, 2 cpu ports, and the same MAC logic of MT7530. Cpu port 6 only supports SGMII interface. Cpu port 5 supports either RGMII or SGMII in different HW sku, but cannot be muxed to PHY of port 0/4 like mt7530. Due to SGMII interface support, pll, and pad setting are different from MT7530. This patch adds different initial setting, and SGMII phylink handlers of MT7531.
MT7531 SGMII interface can be configured in following mode:
- 'SGMII AN mode' with in-band negotiation capability
which is compatible with PHY_INTERFACE_MODE_SGMII.
- 'SGMII force mode' without in-band negotiation
which is compatible with 10B/8B encoding of PHY_INTERFACE_MODE_1000BASEX with fixed full-duplex and fixed pause.
- 2.5 times faster clocked 'SGMII force mode' without in-band negotiation which is compatible with 10B/8B encoding of PHY_INTERFACE_MODE_2500BASEX with fixed full-duplex and fixed pause.
--- drivers/net/dsa/Kconfig | 6 +- drivers/net/dsa/mt7530.c | 911 +++++++++++++++++++++++++++++++++++++-- drivers/net/dsa/mt7530.h | 222 ++++++++++ 3 files changed, 1112 insertions(+), 27 deletions(-)
drivers/net/dsa/Kconfig +3 -3
@@ -33,12 +33,12 @@ config NET_DSA_LANTIQ_GSWIP the xrx200 / VR9 SoC. config NET_DSA_MT7530 - tristate "MediaTek MT7530 and MT7621 Ethernet switch support" + tristate "MediaTek MT753x and MT7621 Ethernet switch support" depends on NET_DSA select NET_DSA_TAG_MTK help - This enables support for the MediaTek MT7530 and MT7621 Ethernet - switch chip. + This enables support for the MediaTek MT7530, MT7531, and MT7621 + Ethernet switch chips. config NET_DSA_MV88E6060 tristate "Marvell 88E6060 ethernet switch chip support"
drivers/net/dsa/mt7530.c +887 -24
1,086 lines not on this page · raw message
drivers/net/dsa/mt7530.h +222 -0
328 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v4 5/6 arm64: dts: mt7622: add mt7531 dsa to mt7622-rfb1 board
In reply to Landen ChaoAdd mt7531 dsa to mt7622-rfb1 board for 5 giga Ethernet ports support. mt7622 only supports 1 sgmii interface, so either gmac0 or gmac1 can be configured as sgmii interface. In this patch, change to connect mt7622 gmac0 and mt7531 port6 through sgmii interface.
--- arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 57 +++++++++++++++++--- 1 file changed, 51 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts +51 -6
@@ -105,20 +105,65 @@ pinctrl-0 = <ð_pins>; status = "okay"; - gmac1: mac@1 { + gmac0: mac@0 { compatible = "mediatek,eth-mac"; - reg = <1>; - phy-handle = <&phy5>; + reg = <0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; }; mdio-bus { #address-cells = <1>; #size-cells = <0>; - phy5: ethernet-phy@5 { - reg = <5>; - phy-mode = "sgmii"; + switch@0 { + compatible = "mediatek,mt7531"; + reg = <0>; + reset-gpios = <&pio 54 0>; + + 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 = "2500base-x"; + }; + }; }; + }; };
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v4 6/6 arm64: dts: mt7622: add mt7531 dsa to bananapi-bpi-r64 board
In reply to Landen ChaoAdd mt7531 dsa to bananapi-bpi-r64 board for 5 giga Ethernet ports support.
--- .../dts/mediatek/mt7622-bananapi-bpi-r64.dts | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+)
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +44 -0
@@ -143,6 +143,50 @@ mdio: mdio-bus { #address-cells = <1>; #size-cells = <0>; + + switch@0 { + compatible = "mediatek,mt7531"; + reg = <0>; + reset-gpios = <&pio 54 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "wan"; + }; + + port@1 { + reg = <1>; + label = "lan0"; + }; + + port@2 { + reg = <2>; + label = "lan1"; + }; + + port@3 { + reg = <3>; + label = "lan2"; + }; + + port@4 { + reg = <4>; + label = "lan3"; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "2500base-x"; + }; + }; + }; + }; };
Signature · 5 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek