From d15814b9f343b4059793232cb16bfcc46227e4b8 Mon Sep 17 00:00:00 2001 From: Vandhiadevan Karunamoorthy Date: Sat, 4 Jul 2020 15:47:56 +0530 Subject: [PATCH 1/2] ipq5018: remove phy_name from dts This changes remove the phy_name from all mpXX dts and handle by driver itself. Signed-off-by: Vandhiadevan Karunamoorthy Change-Id: Ia2d0379151db0c68a0b28f5062e83f80579d37c1 --- arch/arm/dts/ipq5018-db-mp02.1.dts | 1 - arch/arm/dts/ipq5018-db-mp03.1-c2.dts | 15 --------------- arch/arm/dts/ipq5018-db-mp03.1.dts | 2 -- arch/arm/dts/ipq5018-db-mp03.3.dts | 2 -- arch/arm/dts/ipq5018-mp02.1.dts | 1 - arch/arm/dts/ipq5018-mp03.1.dts | 2 -- arch/arm/dts/ipq5018-mp03.3.dts | 2 -- board/qca/arm/ipq5018/ipq5018.c | 7 ------- drivers/net/ipq5018/ipq5018_gmac.c | 9 ++++----- 9 files changed, 4 insertions(+), 37 deletions(-) diff --git a/arch/arm/dts/ipq5018-db-mp02.1.dts b/arch/arm/dts/ipq5018-db-mp02.1.dts index 409488d37d..8b440efda1 100644 --- a/arch/arm/dts/ipq5018-db-mp02.1.dts +++ b/arch/arm/dts/ipq5018-db-mp02.1.dts @@ -64,7 +64,6 @@ unit = <0>; base = <0x39C00000>; phy_address = <7>; - phy_name = "IPQ MDIO0"; }; }; diff --git a/arch/arm/dts/ipq5018-db-mp03.1-c2.dts b/arch/arm/dts/ipq5018-db-mp03.1-c2.dts index 4fffdb900c..88bfab0a2f 100644 --- a/arch/arm/dts/ipq5018-db-mp03.1-c2.dts +++ b/arch/arm/dts/ipq5018-db-mp03.1-c2.dts @@ -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>; - }; - }; - }; diff --git a/arch/arm/dts/ipq5018-db-mp03.1.dts b/arch/arm/dts/ipq5018-db-mp03.1.dts index 22ce6763bd..b6d67b475f 100644 --- a/arch/arm/dts/ipq5018-db-mp03.1.dts +++ b/arch/arm/dts/ipq5018-db-mp03.1.dts @@ -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>; diff --git a/arch/arm/dts/ipq5018-db-mp03.3.dts b/arch/arm/dts/ipq5018-db-mp03.3.dts index d73e9e5ec1..0a02673dcc 100644 --- a/arch/arm/dts/ipq5018-db-mp03.3.dts +++ b/arch/arm/dts/ipq5018-db-mp03.3.dts @@ -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"; }; }; }; diff --git a/arch/arm/dts/ipq5018-mp02.1.dts b/arch/arm/dts/ipq5018-mp02.1.dts index dc488c97e5..91adb55239 100644 --- a/arch/arm/dts/ipq5018-mp02.1.dts +++ b/arch/arm/dts/ipq5018-mp02.1.dts @@ -64,7 +64,6 @@ unit = <0>; base = <0x39C00000>; phy_address = <7>; - phy_name = "IPQ MDIO0"; }; }; }; diff --git a/arch/arm/dts/ipq5018-mp03.1.dts b/arch/arm/dts/ipq5018-mp03.1.dts index 5072b7bbff..a562b9ba12 100644 --- a/arch/arm/dts/ipq5018-mp03.1.dts +++ b/arch/arm/dts/ipq5018-mp03.1.dts @@ -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>; diff --git a/arch/arm/dts/ipq5018-mp03.3.dts b/arch/arm/dts/ipq5018-mp03.3.dts index 6ac8b09e97..2360e4e6b6 100644 --- a/arch/arm/dts/ipq5018-mp03.3.dts +++ b/arch/arm/dts/ipq5018-mp03.3.dts @@ -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"; }; }; diff --git a/board/qca/arm/ipq5018/ipq5018.c b/board/qca/arm/ipq5018/ipq5018.c index f39105e57d..f61e1750dc 100644 --- a/board/qca/arm/ipq5018/ipq5018.c +++ b/board/qca/arm/ipq5018/ipq5018.c @@ -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); } } diff --git a/drivers/net/ipq5018/ipq5018_gmac.c b/drivers/net/ipq5018/ipq5018_gmac.c index 81b8040ca0..e70185adde 100644 --- a/drivers/net/ipq5018/ipq5018_gmac.c +++ b/drivers/net/ipq5018/ipq5018_gmac.c @@ -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, From 6e32f9b2d81bf210c1c901503c4f591f6ece5771 Mon Sep 17 00:00:00 2001 From: Balaji Prakash J Date: Fri, 26 Jun 2020 13:34:18 +0530 Subject: [PATCH 2/2] tools: pack: lk: add support for Linux-5.4 dtbs dtb names are different in eggplant and fig branch due to kernel version difference. Add support to handle new dtb names of Linux-5.4 Change-Id: I4c2e17222d256796fe46d157472bf49807b2aadf Signed-off-by: Balaji Prakash J --- tools/pack.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/pack.py b/tools/pack.py index 21ddecbad0..6232daff56 100644 --- a/tools/pack.py +++ b/tools/pack.py @@ -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"