mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-03-14 21:10:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.4927

Browse source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAl8LTIAACgkQoUgPZYCpAfGpjwCgmyZPZhjbV7Oyp0yh+wqXvwkf
 UPgAniF++KHOZB/+t69Q6jcGQzT/2Ewh
 =WOHT
 -----END PGP SIGNATURE-----

Merge AU_LINUX_QSDK_DATE_4.4_TARGET_ALL.12.0.4927 on remote branch

Change-Id: I23e14f6615eefc7c7e951b0a8bf670d247326b64
Signed-off-by: Linux Build Service Account <lnxbuild@localhost>
This commit is contained in:
Linux Build Service Account 2020-07-12 22:44:52 -06:00
commit e7aabb3481
10 changed files with 14 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/dts/ipq5018-db-mp02.1.dts
View file

@ -64,7 +64,6 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
};

15
arch/arm/dts/ipq5018-db-mp03.1-c2.dts
View file

@ -70,19 +70,4 @@
nand: nand-controller@79B0000 {
status = "disabled";
};
gmac_cfg {
gmac_count = <1>;
ext_mdio_gpio = <36 37>;
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_name = "IPQ MDIO1";
mac_pwr = <0xaa545>;
s17c_switch_enable = <1>;
switch_port_count = <4>;
switch_phy_address = <0 1 2 3>;
switch_gpio = <39>;
};
};
};

2
arch/arm/dts/ipq5018-db-mp03.1.dts
View file

@ -137,13 +137,11 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_name = "IPQ MDIO1";
mac_pwr = <0xaa545>;
s17c_switch_enable = <1>;
switch_port_count = <4>;

2
arch/arm/dts/ipq5018-db-mp03.3.dts
View file

@ -128,14 +128,12 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_address = <0x1c>;
napa_gpio = <39>;
phy_name = "IPQ MDIO1";
};
};
};

1
arch/arm/dts/ipq5018-mp02.1.dts
View file

@ -64,7 +64,6 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
};
};

2
arch/arm/dts/ipq5018-mp03.1.dts
View file

@ -123,13 +123,11 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_name = "IPQ MDIO1";
mac_pwr = <0xaa545>;
s17c_switch_enable = <1>;
switch_port_count = <4>;

2
arch/arm/dts/ipq5018-mp03.3.dts
View file

@ -134,14 +134,12 @@
unit = <0>;
base = <0x39C00000>;
phy_address = <7>;
phy_name = "IPQ MDIO0";
};
gmac2_cfg {
unit = <1>;
base = <0x39D00000>;
phy_address = <0x1c>;
napa_gpio = <39>;
phy_name = "IPQ MDIO1";
};
};

7
board/qca/arm/ipq5018/ipq5018.c
View file

@ -979,9 +979,7 @@ int board_eth_init(bd_t *bis)
int gmac_cfg_node = 0, offset = 0;
int loop = 0;
int switch_gpio = 0;
int phy_name_len = 0;
unsigned int tmp_phy_array[8] = {0};
char *phy_name_ptr = NULL;
gmac_cfg_node = fdt_path_offset(gd->fdt_blob, "/gmac_cfg");
if (gmac_cfg_node >= 0) {
@ -1043,11 +1041,6 @@ int board_eth_init(bd_t *bis)
(char)tmp_phy_array[inner_loop];
}
}
phy_name_ptr = (char*)fdt_getprop(gd->fdt_blob, offset,
"phy_name", &phy_name_len);
strlcpy((char *)gmac_cfg[loop].phy_name, phy_name_ptr, phy_name_len);
}
}

9
drivers/net/ipq5018/ipq5018_gmac.c
View file

@ -658,14 +658,13 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
ipq_gmac_macs[i]->phy_type = gmac_cfg->phy_type;
ipq_gmac_macs[i]->ipq_swith = gmac_cfg->ipq_swith;
strlcpy((char *)ipq_gmac_macs[i]->phy_name,
gmac_cfg->phy_name,
sizeof(ipq_gmac_macs[i]->phy_name));
snprintf((char *)ipq_gmac_macs[i]->phy_name,
sizeof(ipq_gmac_macs[i]->phy_name), "IPQ MDIO%d", i);
phy_chip_id = -1;
if (gmac_cfg->unit){
ret = ipq_sw_mdio_init(gmac_cfg->phy_name);
ret = ipq_sw_mdio_init(ipq_gmac_macs[i]->phy_name);
if (ret)
goto init_failed;
if (ipq_gmac_macs[i]->ipq_swith){
@ -716,7 +715,7 @@ int ipq_gmac_init(ipq_gmac_board_cfg_t *gmac_cfg)
phy_chip_id = (phy_chip_id1 << 16) | phy_chip_id2;
}
} else {
ret = ipq5018_sw_mdio_init(gmac_cfg->phy_name);
ret = ipq5018_sw_mdio_init(ipq_gmac_macs[i]->phy_name);
if (ret)
goto init_failed;
phy_chip_id1 = ipq5018_mdio_read(ipq_gmac_macs[i]->phy_address,

11
tools/pack.py
View file

@ -1988,8 +1988,17 @@ def gen_kernelboot_img(parser):
BASE_ADDR = "0x41000000"
src = parser.images_dname + "/qcom-" + BOARD_NAME + ".dtb"
#alternate name(alt_src) for linux-5.4 dtbs
alt_src = parser.images_dname + "/" + BOARD_NAME + ".dtb"
if ARCH_NAME == "ipq807x":
alt_src = parser.images_dname + "/ipq8074-hk01.dtb"
if not os.path.exists(src):
error("%s file not found" % src)
if os.path.exists(alt_src):
src = alt_src
else:
error("%s file not found" % src)
copy(src, TMP_DIR)
src = parser.images_dname + "/Image"