Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / net / ethernet / hisilicon / Kconfig

diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig
index dead17b5d769ca9639b879b9ef48b4e4e3679d44..f250dec488fd2a2b908a0cb67bb2df61c53ac7ee 100644 (file)
--- a/drivers/net/ethernet/hisilicon/Kconfig
+++ b/drivers/net/ethernet/hisilicon/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_HISILICON
        bool "Hisilicon devices"
        default y
-       depends on ARM
+       depends on OF && (ARM || ARM64 || COMPILE_TEST)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y.
 
@@ -24,11 +24,42 @@ config HIX5HD2_GMAC
 
 config HIP04_ETH
        tristate "HISILICON P04 Ethernet support"
-       select PHYLIB
        select MARVELL_PHY
        select MFD_SYSCON
+       select HNS_MDIO
        ---help---
          If you wish to compile a kernel for a hardware with hisilicon p04 SoC and
          want to use the internal ethernet then you should answer Y to this.
 
+config HNS_MDIO
+       tristate
+       select PHYLIB
+       ---help---
+         This selects the HNS MDIO support. It is needed by HNS_DSAF to access
+         the PHY
+
+config HNS
+       tristate "Hisilicon Network Subsystem Support (Framework)"
+       ---help---
+         This selects the framework support for Hisilicon Network Subsystem. It
+         is needed by any driver which provides HNS acceleration engine or make
+         use of the engine
+
+config HNS_DSAF
+       tristate "Hisilicon HNS DSAF device Support"
+       select HNS
+       select HNS_MDIO
+       ---help---
+         This selects the DSAF (Distributed System Area Frabric) network
+         acceleration engine support. The engine is used in Hisilicon hip05,
+         Hi1610 and further ICT SoC
+
+config HNS_ENET
+       tristate "Hisilicon HNS Ethernet Device Support"
+       select PHYLIB
+       select HNS
+       ---help---
+         This selects the general ethernet driver for HNS.  This module make
+         use of any HNS AE driver, such as HNS_DSAF
+
 endif # NET_VENDOR_HISILICON