diff --git a/arch/arm/dts/ipq6018-cp01-c1.dts b/arch/arm/dts/ipq6018-cp01-c1.dts index d88d22d73b..df36e0a00c 100644 --- a/arch/arm/dts/ipq6018-cp01-c1.dts +++ b/arch/arm/dts/ipq6018-cp01-c1.dts @@ -52,7 +52,7 @@ }; ess-switch { switch_mac_mode = ; - switch_mac_mode1 = ; + switch_mac_mode1 = ; napa_gpio = <77>; napa_gpio_cnt = <1>; malibu_gpio = <75>; diff --git a/arch/arm/dts/ipq6018-cp02-c1.dts b/arch/arm/dts/ipq6018-cp02-c1.dts index 4822dea115..90fd71e1e2 100644 --- a/arch/arm/dts/ipq6018-cp02-c1.dts +++ b/arch/arm/dts/ipq6018-cp02-c1.dts @@ -25,8 +25,8 @@ i2c1 = "/i2c@78ba000"; }; ess-switch { - switch_mac_mode = ; - switch_mac_mode1 = ; + switch_mac_mode = ; + switch_mac_mode1 = ; napa_gpio = <77>; napa_gpio_cnt = <1>; mdc_mdio_gpio = <64 65>; diff --git a/arch/arm/dts/ipq6018-db-cp01.dts b/arch/arm/dts/ipq6018-db-cp01.dts index 5480528cad..1300602a8d 100644 --- a/arch/arm/dts/ipq6018-db-cp01.dts +++ b/arch/arm/dts/ipq6018-db-cp01.dts @@ -179,7 +179,7 @@ ess-switch { switch_mac_mode = ; - switch_mac_mode1 = ; + switch_mac_mode1 = ; napa_gpio = <77>; napa_gpio_cnt = <1>; malibu_gpio = <75>; diff --git a/arch/arm/dts/ipq6018-db-cp02.dts b/arch/arm/dts/ipq6018-db-cp02.dts index bf5b68dd9f..8f21a11722 100644 --- a/arch/arm/dts/ipq6018-db-cp02.dts +++ b/arch/arm/dts/ipq6018-db-cp02.dts @@ -26,8 +26,8 @@ i2c1 = "/i2c@78ba000"; }; ess-switch { - switch_mac_mode = ; - switch_mac_mode1 = ; + switch_mac_mode = ; + switch_mac_mode1 = ; napa_gpio = <77>; napa_gpio_cnt = <1>; mdc_mdio_gpio = <64 65>; diff --git a/arch/arm/dts/ipq807x-ac01.dts b/arch/arm/dts/ipq807x-ac01.dts index e0bfdd2ec0..fe4a931300 100644 --- a/arch/arm/dts/ipq807x-ac01.dts +++ b/arch/arm/dts/ipq807x-ac01.dts @@ -25,8 +25,8 @@ }; ess-switch { switch_mac_mode = <0x0>; - switch_mac_mode1 = <0x6>; - switch_mac_mode2 = <0x6>; + switch_mac_mode1 = <0x1>; + switch_mac_mode2 = <0x1>; napa_gpio = <25 44>; napa_gpio_cnt = <2>; port_phyinfo { diff --git a/arch/arm/dts/ipq807x-ac03.dts b/arch/arm/dts/ipq807x-ac03.dts index 3963522681..731a4c2900 100644 --- a/arch/arm/dts/ipq807x-ac03.dts +++ b/arch/arm/dts/ipq807x-ac03.dts @@ -25,8 +25,8 @@ }; ess-switch { switch_mac_mode = <0x0>; - switch_mac_mode1 = <0x6>; - switch_mac_mode2 = <0x6>; + switch_mac_mode1 = <0x1>; + switch_mac_mode2 = <0x1>; napa_gpio = <25 44>; napa_gpio_cnt = <2>; port_phyinfo { diff --git a/arch/arm/dts/ipq807x-ac04.dts b/arch/arm/dts/ipq807x-ac04.dts index 9d2af07cc9..06ce0d8f99 100644 --- a/arch/arm/dts/ipq807x-ac04.dts +++ b/arch/arm/dts/ipq807x-ac04.dts @@ -25,8 +25,8 @@ }; ess-switch { switch_mac_mode = <0x0>; - switch_mac_mode1 = <0x6>; - switch_mac_mode2 = <0x6>; + switch_mac_mode1 = <0x1>; + switch_mac_mode2 = <0x1>; napa_gpio = <25 44>; napa_gpio_cnt = <2>; port_phyinfo { diff --git a/arch/arm/dts/ipq807x-db-hk02.dts b/arch/arm/dts/ipq807x-db-hk02.dts index b7912e07cc..41c8cc27b5 100644 --- a/arch/arm/dts/ipq807x-db-hk02.dts +++ b/arch/arm/dts/ipq807x-db-hk02.dts @@ -27,7 +27,7 @@ ess-switch { switch_mac_mode = <0x0>; switch_mac_mode1 = <0x2>; - switch_mac_mode2 = <0x6>; + switch_mac_mode2 = <0x1>; napa_gpio = <26>; napa_gpio_cnt = <1>; aquantia_port = <4>; diff --git a/arch/arm/dts/ipq807x-hk07.dts b/arch/arm/dts/ipq807x-hk07.dts index 4f132a1d82..b4d1f89d1d 100644 --- a/arch/arm/dts/ipq807x-hk07.dts +++ b/arch/arm/dts/ipq807x-hk07.dts @@ -25,7 +25,7 @@ ess-switch { switch_mac_mode = <0x0>; switch_mac_mode1 = <0xFF>; - switch_mac_mode2 = <0x6>; + switch_mac_mode2 = <0x1>; napa_gpio = <44>; napa_gpio_cnt = <1>; port_phyinfo { diff --git a/arch/arm/dts/ipq807x-hk08.dts b/arch/arm/dts/ipq807x-hk08.dts index 1671cd9bef..31486d6033 100644 --- a/arch/arm/dts/ipq807x-hk08.dts +++ b/arch/arm/dts/ipq807x-hk08.dts @@ -25,7 +25,7 @@ }; ess-switch { switch_mac_mode = <0x1>; - switch_mac_mode1 = <0x6>; + switch_mac_mode1 = <0x1>; switch_mac_mode2 = <0x2>; 8033_port = <0>; aquantia_port = <5>; diff --git a/arch/arm/dts/ipq807x-hk09.dts b/arch/arm/dts/ipq807x-hk09.dts index be225448b1..96f628d2bb 100644 --- a/arch/arm/dts/ipq807x-hk09.dts +++ b/arch/arm/dts/ipq807x-hk09.dts @@ -25,8 +25,8 @@ }; ess-switch { switch_mac_mode = <0x0>; - switch_mac_mode1 = <0x6>; - switch_mac_mode2 = <0x6>; + switch_mac_mode1 = <0x1>; + switch_mac_mode2 = <0x1>; napa_gpio = <25 44>; napa_gpio_cnt = <2>; port_phyinfo { diff --git a/arch/arm/dts/ipq807x-hk10-c2.dts b/arch/arm/dts/ipq807x-hk10-c2.dts index b74b23ad05..792f617313 100644 --- a/arch/arm/dts/ipq807x-hk10-c2.dts +++ b/arch/arm/dts/ipq807x-hk10-c2.dts @@ -28,7 +28,7 @@ ess-switch { switch_mac_mode = <0x0>; switch_mac_mode1 = <0x2>; - switch_mac_mode2 = <0x6>; + switch_mac_mode2 = <0x1>; aquantia_port = <4>; aquantia_gpio = <44>; uniphy_ext_ref_clk; diff --git a/drivers/net/ipq807x/ipq807x_ppe.c b/drivers/net/ipq807x/ipq807x_ppe.c index 1d2bc57a0c..751b4db986 100644 --- a/drivers/net/ipq807x/ipq807x_ppe.c +++ b/drivers/net/ipq807x/ipq807x_ppe.c @@ -1118,7 +1118,7 @@ static void ppe_port_mux_set(int port_id, int port_type, int mode) port_mux_ctrl.bf.port4_pcs_sel = PORT4_PCS_SEL_GMII_FROM_PCS0; if (port_id == PORT5) { if (port_type == PORT_GMAC_TYPE) { - if (mode == PORT_WRAPPER_SGMII_PLUS) + if (mode == PORT_WRAPPER_SGMII_PLUS || mode == PORT_WRAPPER_SGMII0_RGMII4) port_mux_ctrl.bf.port5_pcs_sel = PORT5_PCS_SEL_GMII_FROM_PCS1; else port_mux_ctrl.bf.port5_pcs_sel = PORT5_PCS_SEL_GMII_FROM_PCS0;