e52f3e9b13
Remove upstreamed patches: generic/pending/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch generic/pending/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch generic/pending/182-net-qmi_wwan-add-BroadMobi-BM806U-2020-2033.patch lantiq/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch Update patches that no longer apply: generic/pending/811-pci_disable_usb_common_quirks.patch ath79/0009-MIPS-ath79-add-lots-of-missing-registers.patch Fixes CVE-2018-6412. Compile-tested: octeon, x86/64. Runtime-tested: octeon, x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
80 lines
2.1 KiB
Diff
80 lines
2.1 KiB
Diff
From 1e33784f665cb95c2af5481d3e776d2d3099921b Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 10 Aug 2017 15:57:17 +0200
|
|
Subject: [PATCH 45/57] net: dsa: mediatek: turn into platform driver
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 23 +++++++++++++++--------
|
|
1 file changed, 15 insertions(+), 8 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -1049,10 +1049,10 @@ static const struct dsa_switch_ops mt753
|
|
};
|
|
|
|
static int
|
|
-mt7530_probe(struct mdio_device *mdiodev)
|
|
+mt7530_probe(struct platform_device *mdiodev)
|
|
{
|
|
struct mt7530_priv *priv;
|
|
- struct device_node *dn;
|
|
+ struct device_node *dn, *mdio;
|
|
|
|
dn = mdiodev->dev.of_node;
|
|
|
|
@@ -1100,7 +1100,12 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
}
|
|
}
|
|
|
|
- priv->bus = mdiodev->bus;
|
|
+ mdio = of_parse_phandle(dn, "dsa,mii-bus", 0);
|
|
+ if (!mdio)
|
|
+ return -EINVAL;
|
|
+ priv->bus = of_mdio_find_bus(mdio);
|
|
+ if (!priv->bus)
|
|
+ return -EPROBE_DEFER;
|
|
priv->dev = &mdiodev->dev;
|
|
priv->ds->priv = priv;
|
|
priv->ds->ops = &mt7530_switch_ops;
|
|
@@ -1110,8 +1115,8 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
return dsa_register_switch(priv->ds);
|
|
}
|
|
|
|
-static void
|
|
-mt7530_remove(struct mdio_device *mdiodev)
|
|
+static int
|
|
+mt7530_remove(struct platform_device *mdiodev)
|
|
{
|
|
struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
|
|
int ret = 0;
|
|
@@ -1128,6 +1133,8 @@ mt7530_remove(struct mdio_device *mdiode
|
|
|
|
dsa_unregister_switch(priv->ds);
|
|
mutex_destroy(&priv->reg_mutex);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static const struct of_device_id mt7530_of_match[] = {
|
|
@@ -1136,16 +1143,16 @@ static const struct of_device_id mt7530_
|
|
};
|
|
MODULE_DEVICE_TABLE(of, mt7530_of_match);
|
|
|
|
-static struct mdio_driver mt7530_mdio_driver = {
|
|
+static struct platform_driver mtk_mt7530_driver = {
|
|
.probe = mt7530_probe,
|
|
.remove = mt7530_remove,
|
|
- .mdiodrv.driver = {
|
|
+ .driver = {
|
|
.name = "mt7530",
|
|
.of_match_table = mt7530_of_match,
|
|
},
|
|
};
|
|
+module_platform_driver(mtk_mt7530_driver);
|
|
|
|
-mdio_module_driver(mt7530_mdio_driver);
|
|
|
|
MODULE_AUTHOR("Sean Wang <sean.wang@mediatek.com>");
|
|
MODULE_DESCRIPTION("Driver for Mediatek MT7530 Switch");
|