Skip to contentSkip to conversation

soc: ixp4xx: List the whole directory in MAINTAINERS

PATCH New Jean Delvare 1 participant 2 messages Jul 3, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 soc: ixp4xx: List the whole directory in MAINTAINERS

Mention the whole directory containing the ixp4xx soc drivers in MAINTAINERS instead of each driver separately. Otherwise changes done to Makefile and Kconfig will fail to find a matching entry. This will also let future drivers match without having to update the entry each time.

Cc Krzysztof Halasa <[email protected]>
---
 MAINTAINERS |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
MAINTAINERS +2 -4
@@ -8654,10 +8654,8 @@ M:	Krzysztof Halasa <[email protected]>
 S:	Maintained
 F:	drivers/net/ethernet/xscale/ixp4xx_eth.c
 F:	drivers/net/wan/ixp4xx_hss.c
-F:	drivers/soc/ixp4xx/ixp4xx-npe.c
-F:	drivers/soc/ixp4xx/ixp4xx-qmgr.c
-F:	include/linux/soc/ixp4xx/npe.h
-F:	include/linux/soc/ixp4xx/qmgr.h
+F:	drivers/soc/ixp4xx/
+F:	include/linux/soc/ixp4xx/
 
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 M:	Deepak Saxena <[email protected]>
Signature · 2 lines
Jean Delvare
SUSE L3 Support
#1 lore raw

PATCH 2/2 soc: ixp4xx: Really select helper drivers automatically

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.

Cc Krzysztof Halasa <[email protected]>
---
 drivers/crypto/Kconfig              |    4 +++-
 drivers/net/ethernet/xscale/Kconfig |    7 ++++---
 drivers/net/wan/Kconfig             |    4 +++-
 3 files changed, 10 insertions(+), 5 deletions(-)
drivers/net/ethernet/xscale/Kconfig +4 -3
@@ -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.
drivers/net/wan/Kconfig +3 -1
@@ -315,8 +315,10 @@ config DSCC4_PCI_RST
 
 config IXP4XX_HSS
 	tristate "Intel IXP4xx HSS (synchronous serial port) support"
-	depends on HDLC && IXP4XX_NPE && IXP4XX_QMGR
+	depends on HDLC
 	depends on ARCH_IXP4XX
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	help
 	  Say Y here if you want to use built-in HSS ports
 	  on IXP4xx processor.
drivers/crypto/Kconfig +3 -1
@@ -308,11 +308,13 @@ config CRYPTO_DEV_TALITOS2
 
 config CRYPTO_DEV_IXP4XX
 	tristate "Driver for IXP4xx crypto hardware acceleration"
-	depends on ARCH_IXP4XX && IXP4XX_QMGR && IXP4XX_NPE
+	depends on ARCH_IXP4XX
 	select CRYPTO_LIB_DES
 	select CRYPTO_AEAD
 	select CRYPTO_AUTHENC
 	select CRYPTO_SKCIPHER
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	help
 	  Driver for the IXP4xx NPE crypto engine.
 
Signature · 2 lines
Jean Delvare
SUSE L3 Support