Merge "arm: dts: ipq5332: update ethernet config"

This commit is contained in:
Linux Build Service Account 2022-10-28 06:38:40 -07:00 committed by Gerrit - the friendly Code Review server
commit 36c1628ca2
5 changed files with 60 additions and 25 deletions

View file

@ -147,26 +147,25 @@
};
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
aquantia_gpio = <22>;
aquantia_gpio_cnt = <1>;
aquantia_port = <1>;
aquantia_port_cnt = <1>;
qca808x_gpio = <16>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
napa_gpio = <22>;
qca8084_switch_enable = <1>;
port_phyinfo {
port@0 {
phy_address = <0>;
phy_type = <AQ_PHY_TYPE>;
phy_address = <28>;
phy_type = <QCA8081_PHY_TYPE>;
uniphy_id = <0>;
uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
};
port@1 {
phy_address = <1>;
phy_type = <QCA8084_PHY_TYPE>;
uniphy_id = <1>;
uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
};
};

View file

@ -159,26 +159,24 @@
};
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
aquantia_gpio = <22>;
aquantia_gpio_cnt = <1>;
aquantia_port = <1>;
aquantia_port_cnt = <1>;
qca808x_gpio = <16>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
qca8084_switch_enable = <1>;
port_phyinfo {
port@0 {
phy_address = <0>;
phy_type = <AQ_PHY_TYPE>;
phy_type = <SFP_PHY_TYPE>;
uniphy_id = <0>;
uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
};
port@1 {
phy_address = <1>;
uniphy_id = <1>;
phy_type = <QCA8084_PHY_TYPE>;
uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
};
};

View file

@ -144,26 +144,26 @@
};
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_USXGMII>;
switch_mac_mode0 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
aquantia_gpio = <22>;
aquantia_gpio_cnt = <1>;
aquantia_port = <1>;
aquantia_port_cnt = <1>;
qca808x_gpio = <16>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
napa_gpio = <22>;
qca8084_switch_enable = <1>;
port_phyinfo {
port@0 {
phy_address = <0>;
phy_type = <AQ_PHY_TYPE>;
phy_address = <28>;
phy_type = <QCA8081_PHY_TYPE>;
uniphy_id = <0>;
uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
};
port@1 {
phy_address = <1>;
phy_type = <QCA8084_PHY_TYPE>;
uniphy_id = <1>;
uniphy_mode = <PORT_WRAPPER_SGMII_PLUS>;
};
};

View file

@ -18,4 +18,23 @@
/ {
machid = <0x8060006>;
config_name = "config@mi01.6";
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
qca808x_gpio = <16>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
qca8084_switch_enable = <1>;
/delete-property/napa_gpio;
port_phyinfo {
port@0 {
/delete-property/phy_address;
phy_type = <SFP_PHY_TYPE>;
uniphy_id = <0>;
uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
};
};
};
};

View file

@ -18,4 +18,23 @@
/ {
machid = <0x8060007>;
config_name = "config@mi01.7";
ess-switch {
switch_mac_mode0 = <PORT_WRAPPER_10GBASE_R>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
qca808x_gpio = <16>;
qca808x_gpio_cnt = <1>;
mdc_mdio_gpio = <27 28>;
qca8084_switch_enable = <1>;
/delete-property/napa_gpio;
port_phyinfo {
port@0 {
/delete-property/phy_address;
phy_type = <SFP_PHY_TYPE>;
uniphy_id = <0>;
uniphy_mode = <PORT_WRAPPER_10GBASE_R>;
};
};
};
};