layerscape: add patches-5.4

[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 701-net-0377-net-dsa-ocelot-add-NET_VENDOR_MICROSEMI-dependency.patch

diff --git a/target/linux/layerscape/patches-5.4/701-net-0377-net-dsa-ocelot-add-NET_VENDOR_MICROSEMI-dependency.patch b/target/linux/layerscape/patches-5.4/701-net-0377-net-dsa-ocelot-add-NET_VENDOR_MICROSEMI-dependency.patch
new file mode 100644 (file)
index 0000000..81db669
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/701-net-0377-net-dsa-ocelot-add-NET_VENDOR_MICROSEMI-dependency.patch
@@ -0,0 +1,41 @@
+From ac2fb1a9879204825467eed7a138a3d77c1ecfe8 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 16 Dec 2019 00:12:14 +0200
+Subject: [PATCH] net: dsa: ocelot: add NET_VENDOR_MICROSEMI dependency
+
+Selecting MSCC_OCELOT_SWITCH is not possible when NET_VENDOR_MICROSEMI
+is disabled:
+
+WARNING: unmet direct dependencies detected for MSCC_OCELOT_SWITCH
+  Depends on [n]: NETDEVICES [=y] && ETHERNET [=n] && NET_VENDOR_MICROSEMI [=n] && NET_SWITCHDEV [=y] && HAS_IOMEM [=y]
+  Selected by [m]:
+  - NET_DSA_MSCC_FELIX [=m] && NETDEVICES [=y] && HAVE_NET_DSA [=y] && NET_DSA [=y] && PCI [=y]
+
+Add a Kconfig dependency on NET_VENDOR_MICROSEMI, which also implies
+CONFIG_NETDEVICES.
+
+Depending on a vendor config violates menuconfig locality for the DSA
+driver, but is the smallest compromise since all other solutions are
+much more complicated (see [0]).
+
+https://www.spinics.net/lists/netdev/msg618808.html
+
+Fixes: 56051948773e ("net: dsa: ocelot: add driver for Felix switch family")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Mao Wenan <maowenan@huawei.com>
+Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/dsa/ocelot/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/dsa/ocelot/Kconfig
++++ b/drivers/net/dsa/ocelot/Kconfig
+@@ -2,6 +2,7 @@
+ config NET_DSA_MSCC_FELIX
+       tristate "Ocelot / Felix Ethernet switch support"
+       depends on NET_DSA && PCI
++      depends on NET_VENDOR_MICROSEMI
+       select MSCC_OCELOT_SWITCH
+       select NET_DSA_TAG_OCELOT
+       help