mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AU_LINUX_QSDK_NHSS.QSDK.11.5_TARGET_ALL.11.5.0.7762.7906

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAmIOamYACgkQoUgPZYCpAfGOugCfSaSrsCmI7gAddfYDjtmzjeG2
 oJgAoPTu76gMfUOKrOA+lVgj2bPnAc+P
 =hzg1
 -----END PGP SIGNATURE-----

Merge AU_LINUX_QSDK_NHSS.QSDK.11.5_TARGET_ALL.11.5.0.7762.7906 on remote branch

Change-Id: I73399c58ff2ce4cf5a0ff845927b0e2b790a8231
Signed-off-by: Linux Build Service Account <lnxbuild@localhost>
This commit is contained in:
Linux Build Service Account 2022-02-23 02:29:17 -07:00
commit 16d71d1476
13 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/dts/ipq6018-cp01-c1.dts
View file

@ -52,7 +52,7 @@
};
ess-switch {
switch_mac_mode = <PORT_WRAPPER_PSGMII>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII>;
napa_gpio = <77>;
napa_gpio_cnt = <1>;
malibu_gpio = <75>;

4
arch/arm/dts/ipq6018-cp02-c1.dts
View file

@ -25,8 +25,8 @@
i2c1 = "/i2c@78ba000";
};
ess-switch {
switch_mac_mode = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode = <PORT_WRAPPER_SGMII>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII>;
napa_gpio = <77>;
napa_gpio_cnt = <1>;
mdc_mdio_gpio = <64 65>;

2
arch/arm/dts/ipq6018-db-cp01.dts
View file

@ -179,7 +179,7 @@
ess-switch {
switch_mac_mode = <PORT_WRAPPER_PSGMII>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII>;
napa_gpio = <77>;
napa_gpio_cnt = <1>;
malibu_gpio = <75>;

4
arch/arm/dts/ipq6018-db-cp02.dts
View file

@ -26,8 +26,8 @@
i2c1 = "/i2c@78ba000";
};
ess-switch {
switch_mac_mode = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII_PLUS>;
switch_mac_mode = <PORT_WRAPPER_SGMII>;
switch_mac_mode1 = <PORT_WRAPPER_SGMII>;
napa_gpio = <77>;
napa_gpio_cnt = <1>;
mdc_mdio_gpio = <64 65>;

4
arch/arm/dts/ipq807x-ac01.dts
View file

@ -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 {

4
arch/arm/dts/ipq807x-ac03.dts
View file

@ -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 {

4
arch/arm/dts/ipq807x-ac04.dts
View file

@ -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 {

2
arch/arm/dts/ipq807x-db-hk02.dts
View file

@ -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>;

2
arch/arm/dts/ipq807x-hk07.dts
View file

@ -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 {

2
arch/arm/dts/ipq807x-hk08.dts
View file

@ -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>;

4
arch/arm/dts/ipq807x-hk09.dts
View file

@ -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 {

2
arch/arm/dts/ipq807x-hk10-c2.dts
View file

@ -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;

2
drivers/net/ipq807x/ipq807x_ppe.c
View file

@ -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;