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

Commit 09294e8e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "PM / devfreq: Add MODULE_LICENSE for arm-memlat-mon"

parents 02892655 5d54b04f

drivers/devfreq/arm-memlat-mon.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2014-2018, 2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "arm-memlat-mon: " fmt
@@ -739,3 +739,4 @@ static struct platform_driver arm_memlat_mon_driver = { 
};



module_platform_driver(arm_memlat_mon_driver);

MODULE_LICENSE("GPL v2");

drivers/hwtracing/coresight/Kconfig

+1 −44
Original line number Diff line number Diff line
@@ -149,50 +149,7 @@ config CORESIGHT_TPDA 


config CORESIGHT_TPDM

	bool "CoreSight Trace, Profiling & Diagnostics Monitor driver"

	help

	  This driver provides support for configuring monitor. Monitors are

	  primarily responsible for data set collection and support the

	  ability to collect any permutation of data set types. Monitors are

	  also responsible for interaction with system cross triggering.



config CORESIGHT_TPDM_DEFAULT_ENABLE

	bool "Turn on TPDM tracing by default"

	depends on CORESIGHT_TPDM

	help

	  Turns on CoreSight TPDM tracing for different data set types by

	  default. Otherwise, tracing is disabled by default but can be

	  enabled via sysfs.



	  If unsure, say 'N' here to avoid potential power and performance

	  penalty.



config CORESIGHT_CSR

	bool "CoreSight Slave Register driver"

	help

	  This driver provides support for CoreSight Slave Register block

	  that hosts miscellaneous configuration registers.

	  Those configuration registers can be used to control, various

	  coresight configurations.



config CORESIGHT_HWEVENT

	bool "CoreSight Hardware Event driver"

	depends on CORESIGHT_STM

	select CORESIGHT_CSR

	help

	  This driver provides support for monitoring and tracing CoreSight

	  Hardware Event across STM interface. It configures Coresight

	  Hardware Event mux control registers to select hardware events

	  based on user input.

config CORESIGHT_TPDA

	bool "CoreSight Trace, Profiling & Diagnostics Aggregator driver"

	help

	  This driver provides support for configuring aggregator. This is

	  primarily useful for pulling the data sets from one or more

	  attached monitors and pushing the resultant data out. Multiple

	  monitors are connected on different input ports of TPDA.



config CORESIGHT_TPDM

	bool "CoreSight Trace, Profiling & Diagnostics Monitor driver"

	depends on QCOM_SCM=y

	help

	  This driver provides support for configuring monitor. Monitors are

	  primarily responsible for data set collection and support the

drivers/iommu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -588,6 +588,7 @@ config QCOM_IOMMU 
	# Note: iommu drivers cannot (yet?) be built as modules

	bool "Qualcomm IOMMU Support"

	depends on ARCH_QCOM || (COMPILE_TEST && !GENERIC_ATOMIC64)

	depends on QCOM_SCM=y

	select IOMMU_API

	select IOMMU_IO_PGTABLE_LPAE

	select ARM_DMA_USE_IOMMU

include/linux/btpower.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
#ifndef __LINUX_BLUETOOTH_POWER_H

#define __LINUX_BLUETOOTH_POWER_H



#include <linux/types.h>



/*

 * voltage regulator information required for configuring the

 * bluetooth chipset

include/linux/input/qpnp-power-on.h

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <dt-bindings/input/qcom,qpnp-power-on.h>

#include <linux/errno.h>

#include <linux/types.h>



/**

 * enum pon_trigger_source: List of PON trigger sources