Commit 690ac0d2 authored by Mika Westerberg's avatar Mika Westerberg Committed by Greg Kroah-Hartman
Browse files

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: default avatarMika 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b0407983

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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/

drivers/net/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -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.

drivers/net/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/thunderbolt/Kconfig

+6 −5
Original line number Diff line number Diff line 
# 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.

drivers/thunderbolt/Makefile

+1 −1
Original line number Diff line number Diff line 
# 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE