diff options
| author | John Crispin <john@phrozen.org> | 2020-07-14 09:50:31 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2020-07-14 18:31:12 +0200 |
| commit | 2557d2eb4c41fd3fba080ee324e12091f8f53e97 (patch) | |
| tree | 0c49b411607f4a42f39c097ce38f145d0e3cd1ef /target | |
| parent | 3635f7efc1deef2a17b69000dcd20ad044e73706 (diff) | |
| download | upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.tar.gz upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.tar.bz2 upstream-2557d2eb4c41fd3fba080ee324e12091f8f53e97.zip | |
ipq40xx: merge all ar40xx patches into one single patch
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch | 29 | ||||
| -rw-r--r-- | target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch | 23 |
2 files changed, 22 insertions, 30 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch index 083de038a2..648723df06 100644 --- a/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch +++ b/target/linux/ipq40xx/patches-5.4/705-net-add-qualcomm-ar40xx-phy.patch @@ -1,5 +1,7 @@ ---- a/drivers/net/phy/Kconfig -+++ b/drivers/net/phy/Kconfig +Index: linux-5.4.51/drivers/net/phy/Kconfig +=================================================================== +--- linux-5.4.51.orig/drivers/net/phy/Kconfig ++++ linux-5.4.51/drivers/net/phy/Kconfig @@ -587,6 +587,13 @@ config MDIO_IPQ40XX This driver supports the MDIO interface found in Qualcomm Atheros ipq40xx Soc chip. @@ -14,8 +16,10 @@ endif # PHYLIB config MICREL_KS8995MA ---- a/drivers/net/phy/Makefile -+++ b/drivers/net/phy/Makefile +Index: linux-5.4.51/drivers/net/phy/Makefile +=================================================================== +--- linux-5.4.51.orig/drivers/net/phy/Makefile ++++ linux-5.4.51/drivers/net/phy/Makefile @@ -70,6 +70,7 @@ ifdef CONFIG_HWMON aquantia-objs += aquantia_hwmon.o endif @@ -24,9 +28,11 @@ obj-$(CONFIG_AX88796B_PHY) += ax88796b.o obj-$(CONFIG_AT803X_PHY) += at803x.o obj-$(CONFIG_BCM63XX_PHY) += bcm63xx.o +Index: linux-5.4.51/drivers/net/phy/ar40xx.c +=================================================================== --- /dev/null -+++ b/drivers/net/phy/ar40xx.c -@@ -0,0 +1,2090 @@ ++++ linux-5.4.51/drivers/net/phy/ar40xx.c +@@ -0,0 +1,2097 @@ +/* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * @@ -2050,6 +2056,12 @@ + /* register switch */ + swdev = &priv->dev; + ++ if (priv->mii_bus == NULL) { ++ dev_err(&pdev->dev, "Probe failed - Missing PHYs!\n"); ++ ret = -ENODEV; ++ goto err_missing_phy; ++ } ++ + swdev->alias = dev_name(&priv->mii_bus->dev); + + swdev->cpu_port = AR40XX_PORT_CPU; @@ -2081,6 +2093,7 @@ + unregister_switch(&priv->dev); +err_unregister_phy: + phy_driver_unregister(&ar40xx_phy_driver); ++err_missing_phy: + platform_set_drvdata(pdev, NULL); + return ret; +} @@ -2117,8 +2130,10 @@ + +MODULE_DESCRIPTION("IPQ40XX ESS driver"); +MODULE_LICENSE("Dual BSD/GPL"); +Index: linux-5.4.51/drivers/net/phy/ar40xx.h +=================================================================== --- /dev/null -+++ b/drivers/net/phy/ar40xx.h ++++ linux-5.4.51/drivers/net/phy/ar40xx.h @@ -0,0 +1,337 @@ +/* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. diff --git a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch b/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch deleted file mode 100644 index 19474bff0d..0000000000 --- a/target/linux/ipq40xx/patches-5.4/706-ar40xx-abort-probe-on-missig-phy.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/drivers/net/phy/ar40xx.c -+++ b/drivers/net/phy/ar40xx.c -@@ -2021,6 +2021,12 @@ static int ar40xx_probe(struct platform_ - /* register switch */ - swdev = &priv->dev; - -+ if (priv->mii_bus == NULL) { -+ dev_err(&pdev->dev, "Probe failed - Missing PHYs!\n"); -+ ret = -ENODEV; -+ goto err_missing_phy; -+ } -+ - swdev->alias = dev_name(&priv->mii_bus->dev); - - swdev->cpu_port = AR40XX_PORT_CPU; -@@ -2052,6 +2058,7 @@ err_unregister_switch: - unregister_switch(&priv->dev); - err_unregister_phy: - phy_driver_unregister(&ar40xx_phy_driver); -+err_missing_phy: - platform_set_drvdata(pdev, NULL); - return ret; - } |