thunderbolt: Update Kconfig entries to USB4

Since the driver now supports USB4 which is the standard going forward,
update the Kconfig entry to mention this and rename the entry from
CONFIG_THUNDERBOLT to CONFIG_USB4 instead to help people to find the
correct option if they want to enable USB4.

Also do the same for Thunderbolt network driver.

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Link: https://lore.kernel.org/r/20191217123345.31850-6-mika.westerberg@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/Makefile b/drivers/Makefile
index aaef17cc651287afb4b51fca89829b2efa743365..31cf17dee252fa54558c097d4fee7bbc931fcc1b 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -171,7 +171,7 @@ obj-$(CONFIG_POWERCAP)              += powercap/
 obj-$(CONFIG_MCB)              += mcb/
 obj-$(CONFIG_PERF_EVENTS)      += perf/
 obj-$(CONFIG_RAS)              += ras/
-obj-$(CONFIG_THUNDERBOLT)      += thunderbolt/
+obj-$(CONFIG_USB4)             += thunderbolt/
 obj-$(CONFIG_CORESIGHT)                += hwtracing/coresight/
 obj-y                          += hwtracing/intel_th/
 obj-$(CONFIG_STM)              += hwtracing/stm/

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d02f12a5254e80cebe054035aab999094813eb57..d1c84d47779d8b8c639e58b226917963b7d5d5b5 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -489,12 +489,12 @@ config FUJITSU_ES
          This driver provides support for Extended Socket network device
          on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series.
 
-config THUNDERBOLT_NET
-       tristate "Networking over Thunderbolt cable"
-       depends on THUNDERBOLT && INET
+config USB4_NET
+       tristate "Networking over USB4 and Thunderbolt cables"
+       depends on USB4 && INET
        help
-         Select this if you want to create network between two
-         computers over a Thunderbolt cable. The driver supports Apple
+         Select this if you want to create network between two computers
+         over a USB4 and Thunderbolt cables. The driver supports Apple
          ThunderboltIP protocol and allows communication with any host
          supporting the same protocol including Windows and macOS.
 

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0d3ba056cda3ca0cb1ec1da6e6a2addef548985b..29e83e9f545e29077a221ca5155cfa71fb95bf2b 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -76,6 +76,6 @@ obj-$(CONFIG_NTB_NETDEV) += ntb_netdev.o
 obj-$(CONFIG_FUJITSU_ES) += fjes/
 
 thunderbolt-net-y += thunderbolt.o
-obj-$(CONFIG_THUNDERBOLT_NET) += thunderbolt-net.o
+obj-$(CONFIG_USB4_NET) += thunderbolt-net.o
 obj-$(CONFIG_NETDEVSIM) += netdevsim/
 obj-$(CONFIG_NET_FAILOVER) += net_failover.o

diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
index fd9adca898ff96f657e7785c7db8c8a2047e4deb..1eb757e8df3b2d1f00ce696773e9fe1951a05159 100644 (file)
--- a/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
-menuconfig THUNDERBOLT
-       tristate "Thunderbolt support"
+menuconfig USB4
+       tristate "Unified support for USB4 and Thunderbolt"
        depends on PCI
        depends on X86 || COMPILE_TEST
        select APPLE_PROPERTIES if EFI_STUB && X86
@@ -9,9 +9,10 @@ menuconfig THUNDERBOLT
        select CRYPTO_HASH
        select NVMEM
        help
-         Thunderbolt Controller driver. This driver is required if you
-         want to hotplug Thunderbolt devices on Apple hardware or on PCs
-         with Intel Falcon Ridge or newer.
+         USB4 and Thunderbolt driver. USB4 is the public speficiation
+         based on Thunderbolt 3 protocol. This driver is required if
+         you want to hotplug Thunderbolt and USB4 compliant devices on
+         Apple hardware or on PCs with Intel Falcon Ridge or newer.
 
          To compile this driver a module, choose M here. The module will be
          called thunderbolt.

diff --git a/drivers/thunderbolt/Makefile b/drivers/thunderbolt/Makefile
index c0b2fd73dfbd79f2870b216817e3cfc09b53b14b..102e9529ee669a9d54eb290a6719edbd26abf854 100644 (file)
--- a/drivers/thunderbolt/Makefile
+++ b/drivers/thunderbolt/Makefile
@@ -1,4 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-${CONFIG_THUNDERBOLT} := thunderbolt.o
+obj-${CONFIG_USB4} := thunderbolt.o
 thunderbolt-objs := nhi.o nhi_ops.o ctl.o tb.o switch.o cap.o path.o tunnel.o eeprom.o
 thunderbolt-objs += domain.o dma_port.o icm.o property.o xdomain.o lc.o usb4.o