[PATCH 2/3] soc: ixp4xx: Really select helper drivers automatically

[Jean Delvare]

Kconfig claims that the ixp4xx-qmgr and ixp4xx-npe helper drivers
are selected automatically as needed. However this is not what the
Kconfig entries are doing. Convert depends to select to match the
help texts.

Signed-off-by: Jean Delvare <jdelvare@xxxxxxx>
Cc: Krzysztof Halasa <khalasa@xxxxxxx>
---
Sorry about the weird patch numbering, I found this issue right before
sending the other patch so I had to insert a new patch in the middle of
the series.

This should get tested on ixp4xx, I could only test on x86.

 drivers/net/ethernet/xscale/Kconfig |    7 ++++---
 drivers/net/wan/Kconfig             |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- linux-5.2.orig/drivers/net/ethernet/xscale/Kconfig	2019-07-12 15:44:22.617698231 +0200
+++ linux-5.2/drivers/net/ethernet/xscale/Kconfig	2019-07-12 15:48:00.538938930 +0200
@@ -6,8 +6,7 @@
 config NET_VENDOR_XSCALE
 	bool "Intel XScale IXP devices"
 	default y
-	depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX && \
-		   IXP4XX_NPE && IXP4XX_QMGR)
+	depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX)
 	---help---
 	  If you have a network (Ethernet) card belonging to this class, say Y.
 
@@ -20,9 +19,11 @@ if NET_VENDOR_XSCALE
 
 config IXP4XX_ETH
 	tristate "Intel IXP4xx Ethernet support"
-	depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+	depends on ARM && ARCH_IXP4XX
 	select PHYLIB
 	select NET_PTP_CLASSIFY
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	---help---
 	  Say Y here if you want to use built-in Ethernet ports
 	  on IXP4xx processor.
--- linux-5.2.orig/drivers/net/wan/Kconfig	2019-07-12 15:44:22.628698395 +0200
+++ linux-5.2/drivers/net/wan/Kconfig	2019-07-12 15:47:25.211414758 +0200
@@ -329,7 +329,9 @@ config DSCC4_PCI_RST
 
 config IXP4XX_HSS
 	tristate "Intel IXP4xx HSS (synchronous serial port) support"
-	depends on HDLC && ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+	depends on HDLC && ARM && ARCH_IXP4XX
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	help
 	  Say Y here if you want to use built-in HSS ports
 	  on IXP4xx processor.

-- 
Jean Delvare
SUSE L3 Support