Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86f690e8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'stm-intel_th-for-greg-20180329' of... 

Merge tag 'stm-intel_th-for-greg-20180329' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next

Alexander writes:

stm class/intel_th: Updates for 4.17

These are:
  * Mass conversion to GPL-2 SPDX header
  * Moved "hwtracing" to now its own submenu, to uncrowd the parent menu a bit
  * Added MAINTAINERS entry for drivers/hwtracing
  * Somewhat small Trace Hub fixes
  * Added ACPI glue layer for the Trace Hub
  * Added more module parameters to dummy_stm for better test coverage
parents 45ea83f0 72ef0f24

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -6244,6 +6244,11 @@ F: Documentation/hw_random.txt 
F:	drivers/char/hw_random/

F:	include/linux/hw_random.h



HARDWARE TRACING FACILITIES

M:	Alexander Shishkin <alexander.shishkin@linux.intel.com>

S:	Maintained

F:	drivers/hwtracing/



HARDWARE SPINLOCK CORE

M:	Ohad Ben-Cohen <ohad@wizery.com>

M:	Bjorn Andersson <bjorn.andersson@linaro.org>

drivers/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -199,9 +199,7 @@ source "drivers/dax/Kconfig" 


source "drivers/nvmem/Kconfig"



source "drivers/hwtracing/stm/Kconfig"



source "drivers/hwtracing/intel_th/Kconfig"

source "drivers/hwtracing/Kconfig"



source "drivers/fpga/Kconfig"

drivers/hwtracing/Kconfig

0 → 100644
+7 −0
Original line number Diff line number Diff line 
menu "HW tracing support"



source "drivers/hwtracing/stm/Kconfig"



source "drivers/hwtracing/intel_th/Kconfig"



endmenu

drivers/hwtracing/intel_th/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ config INTEL_TH_PCI 


	  Say Y here to enable PCI Intel TH support.



config INTEL_TH_ACPI

	tristate "Intel(R) Trace Hub ACPI controller"

	depends on ACPI

	help

	  Intel(R) Trace Hub may exist as an ACPI device. This option enables

	  support glue layer for ACPI-based Intel TH. This typically implies

	  'host debugger' mode, that is, the trace configuration and capture

	  is handled by an external debug host and corresponding controls will

	  not be available on the target.



	  Say Y here to enable ACPI Intel TH support.



config INTEL_TH_GTH

	tristate "Intel(R) Trace Hub Global Trace Hub"

	help

drivers/hwtracing/intel_th/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ intel_th-$(CONFIG_INTEL_TH_DEBUG) += debug.o 
obj-$(CONFIG_INTEL_TH_PCI)	+= intel_th_pci.o

intel_th_pci-y			:= pci.o



obj-$(CONFIG_INTEL_TH_ACPI)	+= intel_th_acpi.o

intel_th_acpi-y			:= acpi.o



obj-$(CONFIG_INTEL_TH_GTH)	+= intel_th_gth.o

intel_th_gth-y			:= gth.o