diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/Kconfig.debug | 2 | ||||
| -rw-r--r-- | arch/arm64/Kconfig.debug | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 2 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/Kconfig (renamed from drivers/coresight/Kconfig) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/Makefile (renamed from drivers/coresight/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etb10.c (renamed from drivers/coresight/coresight-etb10.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etm-cp14.c (renamed from drivers/coresight/coresight-etm-cp14.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etm.h (renamed from drivers/coresight/coresight-etm.h) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-etm3x.c (renamed from drivers/coresight/coresight-etm3x.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-funnel.c (renamed from drivers/coresight/coresight-funnel.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-priv.h (renamed from drivers/coresight/coresight-priv.h) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-replicator.c (renamed from drivers/coresight/coresight-replicator.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-tmc.c (renamed from drivers/coresight/coresight-tmc.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-tpiu.c (renamed from drivers/coresight/coresight-tpiu.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/coresight.c (renamed from drivers/coresight/coresight.c) | 0 | ||||
| -rw-r--r-- | drivers/hwtracing/coresight/of_coresight.c (renamed from drivers/coresight/of_coresight.c) | 0 |
17 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d7490020c0f3..e9e12d75546a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -953,7 +953,7 @@ ARM/CORESIGHT FRAMEWORK AND DRIVERS M: Mathieu Poirier <mathieu.poirier@linaro.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -F: drivers/coresight/* +F: drivers/hwtracing/coresight/* F: Documentation/trace/coresight.txt F: Documentation/devicetree/bindings/arm/coresight.txt F: Documentation/ABI/testing/sysfs-bus-coresight-devices-* diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 8d14ad4e1db0..8b0183a9a300 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1610,6 +1610,6 @@ config DEBUG_SET_MODULE_RONX against certain classes of kernel exploits. If in doubt, say "N". -source "drivers/coresight/Kconfig" +source "drivers/hwtracing/coresight/Kconfig" endmenu diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug index 5b2ffd8e6cdb..d6285ef9b5f9 100644 --- a/arch/arm64/Kconfig.debug +++ b/arch/arm64/Kconfig.debug @@ -89,6 +89,6 @@ config DEBUG_ALIGN_RODATA If in doubt, say N -source "drivers/coresight/Kconfig" +source "drivers/hwtracing/coresight/Kconfig" endmenu diff --git a/drivers/Makefile b/drivers/Makefile index 527a6da8d539..46d2554be404 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -163,5 +163,5 @@ obj-$(CONFIG_POWERCAP) += powercap/ obj-$(CONFIG_MCB) += mcb/ obj-$(CONFIG_RAS) += ras/ obj-$(CONFIG_THUNDERBOLT) += thunderbolt/ -obj-$(CONFIG_CORESIGHT) += coresight/ +obj-$(CONFIG_CORESIGHT) += hwtracing/coresight/ obj-$(CONFIG_ANDROID) += android/ diff --git a/drivers/coresight/Kconfig b/drivers/hwtracing/coresight/Kconfig index fc1f1ae7a49d..fc1f1ae7a49d 100644 --- a/drivers/coresight/Kconfig +++ b/drivers/hwtracing/coresight/Kconfig diff --git a/drivers/coresight/Makefile b/drivers/hwtracing/coresight/Makefile index 4b4bec890ef5..4b4bec890ef5 100644 --- a/drivers/coresight/Makefile +++ b/drivers/hwtracing/coresight/Makefile diff --git a/drivers/coresight/coresight-etb10.c b/drivers/hwtracing/coresight/coresight-etb10.c index 40049869aecd..40049869aecd 100644 --- a/drivers/coresight/coresight-etb10.c +++ b/drivers/hwtracing/coresight/coresight-etb10.c diff --git a/drivers/coresight/coresight-etm-cp14.c b/drivers/hwtracing/coresight/coresight-etm-cp14.c index 12a220682117..12a220682117 100644 --- a/drivers/coresight/coresight-etm-cp14.c +++ b/drivers/hwtracing/coresight/coresight-etm-cp14.c diff --git a/drivers/coresight/coresight-etm.h b/drivers/hwtracing/coresight/coresight-etm.h index 501c5fac8a45..501c5fac8a45 100644 --- a/drivers/coresight/coresight-etm.h +++ b/drivers/hwtracing/coresight/coresight-etm.h diff --git a/drivers/coresight/coresight-etm3x.c b/drivers/hwtracing/coresight/coresight-etm3x.c index c965f5724abd..c965f5724abd 100644 --- a/drivers/coresight/coresight-etm3x.c +++ b/drivers/hwtracing/coresight/coresight-etm3x.c diff --git a/drivers/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 3db36f70b666..3db36f70b666 100644 --- a/drivers/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c diff --git a/drivers/coresight/coresight-priv.h b/drivers/hwtracing/coresight/coresight-priv.h index 62fcd98cc7cf..62fcd98cc7cf 100644 --- a/drivers/coresight/coresight-priv.h +++ b/drivers/hwtracing/coresight/coresight-priv.h diff --git a/drivers/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 75b9abd804e6..75b9abd804e6 100644 --- a/drivers/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c diff --git a/drivers/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index 7147f3dd363c..7147f3dd363c 100644 --- a/drivers/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c diff --git a/drivers/coresight/coresight-tpiu.c b/drivers/hwtracing/coresight/coresight-tpiu.c index 3b33af2416bb..3b33af2416bb 100644 --- a/drivers/coresight/coresight-tpiu.c +++ b/drivers/hwtracing/coresight/coresight-tpiu.c diff --git a/drivers/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 894531d315b8..894531d315b8 100644 --- a/drivers/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c diff --git a/drivers/coresight/of_coresight.c b/drivers/hwtracing/coresight/of_coresight.c index f3cc8e97a0f8..f3cc8e97a0f8 100644 --- a/drivers/coresight/of_coresight.c +++ b/drivers/hwtracing/coresight/of_coresight.c |