[][kernel][7988][mt753x][split patches to file5.4]
[Description]
Fix MT7988-fpga build failed by split some phy patch to file-5.4
[Release-log]
N/A
Change-Id: Ibb5c0da1d8af8d524baac9071eea1fee0ec7bd44
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/6988291
diff --git a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt7531.c b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt7531.c
index 74b27d6..04e6b4e 100755
--- a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt7531.c
+++ b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt7531.c
@@ -1038,6 +1038,7 @@
u32 pmcr;
u32 speed;
+ pdev = container_of(gsw->dev, struct platform_device, dev);
switch_node = of_find_node_by_name(NULL, "switch0");
if (switch_node == NULL) {
dev_err(&pdev->dev, "switch node invaild\n");
@@ -1050,7 +1051,6 @@
return -EIO;
}
- pdev = container_of(gsw->dev, struct platform_device, dev);
gsw->sysctrl_base = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
"mediatek,sysctrl");
if (IS_ERR(gsw->sysctrl_base)) {
diff --git a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_mdio.c b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_mdio.c
index 03eb5b4..cde681a 100644
--- a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_mdio.c
+++ b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_mdio.c
@@ -495,7 +495,7 @@
struct device_node *np = gsw->dev->of_node;
struct reset_control *rstc;
int mcm;
- int ret = -EINVAL;
+ int ret;
mcm = of_property_read_bool(np, "mediatek,mcm");
if (mcm) {
diff --git a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_nl.c b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_nl.c
index cee89db..fa8e595 100644
--- a/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_nl.c
+++ b/target/linux/mediatek/files-5.4/drivers/net/phy/mtk/mt753x/mt753x_nl.c
@@ -75,8 +75,10 @@
len = snprintf(buf, sizeof(buf),
"id: %d, model: %s, node: %s\n",
gsw->id, gsw->name, gsw->dev->of_node->name);
- strncat(buff, buf, size - total);
- total += len;
+ if (len == strlen(buf)) {
+ strncat(buff, buf, size - total);
+ total += len;
+ }
}
mt753x_put_gsw();