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

drivers/devfreq/arm-memlat-mon.c

@@ -1,6 +1,6 @@
 // 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

@@ -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

@@ -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

@@ -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

@@ -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

include/linux/io-pgtable-fast.h

@@ -15,6 +15,7 @@
 typedef u64 av8l_fast_iopte;
 
 struct io_pgtable_ops;
+struct scatterlist;
 
 #ifdef CONFIG_IOMMU_IO_PGTABLE_FAST
 

include/linux/ipa_usb.h

@@ -6,6 +6,12 @@
 #ifndef _IPA_USB_H_
 #define _IPA_USB_H_
 
+#include <linux/if_ether.h>
+#include <linux/ipa.h>
+#include <linux/msm_gsi.h>
+#include <linux/msm_ipa.h>
+#include <linux/types.h>
+
 enum ipa_usb_teth_prot {
 	IPA_USB_RNDIS = 0,
 	IPA_USB_ECM = 1,

include/linux/msm_gpi.h

@@ -6,6 +6,8 @@
 #ifndef __MSM_GPI_H_
 #define __MSM_GPI_H_
 
+#include <linux/types.h>
+
 struct __packed msm_gpi_tre {
 	u32 dword[4];
 };
@@ -196,6 +198,8 @@ struct msm_gpi_cb {
 	struct msm_gpi_error_log error_log;
 };
 
+struct dma_chan;
+
 struct gpi_client_info {
 	/*
 	 * memory for msm_gpi_cb is released after callback, clients shall

include/linux/pinctrl/qcom-pinctrl.h

@@ -6,6 +6,8 @@
 #ifndef __LINUX_PINCTRL_MSM_H__
 #define __LINUX_PINCTRL_MSM_H__
 
+#include <linux/types.h>
+
 /* APIS to access qup_i3c registers */
 int msm_qup_write(u32 mode, u32 val);
 int msm_qup_read(u32 mode);

include/linux/qpnp/qpnp-pbs.h

@@ -6,6 +6,10 @@
 #ifndef _QPNP_PBS_H
 #define _QPNP_PBS_H
 
+#include <linux/types.h>
+
+struct device_node;
+
 #if IS_ENABLED(CONFIG_QPNP_PBS)
 int qpnp_pbs_trigger_event(struct device_node *dev_node, u8 bitmap);
 #else

include/linux/qpnp/qpnp-revid.h

@@ -6,6 +6,8 @@
 #ifndef __QPNP_REVID
 #define __QPNP_REVID
 
+#include <linux/types.h>
+
 /* Common TYPE for all PMICs */
 #define PMIC_TYPE		0x51
 
@@ -330,6 +332,8 @@ struct pmic_revid_data {
 	int		tp_rev;
 };
 
+struct device_node;
+
 #if IS_ENABLED(CONFIG_QPNP_REVID)
 struct pmic_revid_data *get_revid_data(struct device_node *dev_node);
 #else

include/linux/sched/core_ctl.h

@@ -6,6 +6,8 @@
 #ifndef __CORE_CTL_H
 #define __CORE_CTL_H
 
+#include <linux/types.h>
+
 #define MAX_CPUS_PER_CLUSTER 6
 #define MAX_CLUSTERS 3
 
@@ -16,6 +18,8 @@ struct core_ctl_notif_data {
 	unsigned int cur_cap_pct[MAX_CLUSTERS];
 };
 
+struct notifier_block;
+
 #ifdef CONFIG_SCHED_WALT
 extern int __weak core_ctl_set_boost(bool boost);
 extern void __weak core_ctl_notifier_register(struct notifier_block *n);

include/linux/soc/qcom/pmic_glink.h

@@ -6,7 +6,10 @@
 #ifndef _PMIC_GLINK_H
 #define _PMIC_GLINK_H
 
+#include <linux/types.h>
+
 struct pmic_glink_client;
+struct device;
 
 /**
  * struct pmic_glink_client_data - pmic_glink client data

include/linux/spi/spi-msm-geni.h

@@ -6,6 +6,8 @@
 #ifndef __SPI_GENI_QCOM_HEADER___
 #define __SPI_GENI_QCOM_HEADER___
 
+#include <linux/types.h>
+
 struct spi_geni_qcom_ctrl_data {
 	u32 spi_cs_clk_delay;
 	u32 spi_inter_words_delay;

include/linux/usb/ccid_desc.h

@@ -6,6 +6,8 @@
 #ifndef __LINUX_USB_CCID_DESC_H
 #define __LINUX_USB_CCID_DESC_H
 
+#include <linux/types.h>
+
 /*CCID specification version 1.10*/
 #define CCID1_10                               0x0110
 

include/linux/usb/usb_qdss.h

@@ -6,6 +6,8 @@
 #ifndef __LINUX_USB_QDSS_H
 #define __LINUX_USB_QDSS_H
 
+#include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 #define USB_QDSS_CH_MDM	"qdss_mdm"

include/net/cnss_nl.h

@@ -4,6 +4,8 @@
 #ifndef _NET_CNSS_GENETLINK_H_
 #define _NET_CNSS_GENETLINK_H_
 
+#include <linux/types.h>
+
 #define CLD80211_MAX_COMMANDS 40
 #define CLD80211_MAX_NL_DATA  4096
 

include/net/cnss_prealloc.h

@@ -4,6 +4,8 @@
 #ifndef _NET_CNSS_PREALLOC_H_
 #define _NET_CNSS_PREALLOC_H_
 
+#include <linux/types.h>
+
 #define WCNSS_PRE_ALLOC_GET_THRESHOLD (4*1024)
 
 extern void *wcnss_prealloc_get(size_t size);

include/net/cnss_utils.h

@@ -4,6 +4,10 @@
 #ifndef _CNSS_UTILS_H_
 #define _CNSS_UTILS_H_
 
+#include <linux/types.h>
+
+struct device;
+
 enum cnss_utils_cc_src {
 	CNSS_UTILS_SOURCE_CORE,
 	CNSS_UTILS_SOURCE_11D,

include/net/rmnet_config.h

@@ -7,6 +7,8 @@
 #ifndef _RMNET_CONFIG_H_
 #define _RMNET_CONFIG_H_
 
+#include <linux/types.h>
+
 struct rmnet_map_header_s {
 #ifndef RMNET_USE_BIG_ENDIAN_STRUCTS
 	uint8_t  pad_len:6;

include/net/virt_wifi.h

@@ -10,6 +10,10 @@
 #ifndef __VIRT_WIFI_H
 #define __VIRT_WIFI_H
 
+struct net_device;
+struct wiphy;
+struct cfg80211_scan_request;
+
 struct virt_wifi_network_simulation {
 	void (*notify_device_open)(struct net_device *dev);
 	void (*notify_device_stop)(struct net_device *dev);

include/soc/qcom/lpm-stats.h

@@ -7,6 +7,9 @@
 #ifndef __ARCH_ARM_MACH_MSM_LPM_STATS_H
 #define __ARCH_ARM_MACH_MSM_LPM_STATS_H
 
+#include <linux/cpumask.h>
+#include <linux/types.h>
+
 struct lpm_stats;
 
 #define MAX_STR_LEN 256

include/soc/qcom/lpm_levels.h

@@ -7,6 +7,10 @@
 #ifndef __SOC_QCOM_LPM_LEVEL_H__
 #define __SOC_QCOM_LPM_LEVEL_H__
 
+#include <linux/types.h>
+
+struct cpumask;
+
 struct system_pm_ops {
 	int (*enter)(struct cpumask *mask);
 	void (*exit)(bool success);

include/soc/qcom/memory_dump.h

@@ -6,6 +6,7 @@
 #ifndef __MSM_MEMORY_DUMP_H
 #define __MSM_MEMORY_DUMP_H
 
+#include <linux/errno.h>
 #include <linux/types.h>
 
 enum dump_client_type {

include/soc/qcom/minidump.h

@@ -6,6 +6,8 @@
 #ifndef __MINIDUMP_H
 #define __MINIDUMP_H
 
+#include <linux/types.h>
+
 #define MAX_NAME_LENGTH		12
 /* md_region -  Minidump table entry
  * @name:	Entry name, Minidump will dump binary with this name.

include/soc/qcom/qseecom_scm.h

@@ -6,6 +6,8 @@
 #ifndef __MACH_SCM_H
 #define __MACH_SCM_H
 
+#include <linux/types.h>
+
 #define SCM_SVC_BOOT			0x1
 #define SCM_SVC_PIL			0x2
 #define SCM_SVC_UTIL			0x3

include/soc/qcom/service-locator.h

@@ -10,6 +10,8 @@
 #ifndef _SERVICE_LOCATOR_H
 #define _SERVICE_LOCATOR_H
 
+#include <linux/types.h>
+
 #define QMI_SERVREG_LOC_NAME_LENGTH_V01 64
 #define QMI_SERVREG_LOC_LIST_LENGTH_V01 32
 
@@ -50,6 +52,8 @@ enum service_locator_state {
 	LOCATOR_UP = 0x1F,
 };
 
+struct notifier_block;
+
 #if IS_ENABLED(CONFIG_MSM_SERVICE_LOCATOR)
 /*
  * Use this api to request information regarding the process domains on

include/soc/qcom/service-notifier.h

@@ -10,6 +10,8 @@
 #ifndef _SERVICE_NOTIFIER_H
 #define _SERVICE_NOTIFIER_H
 
+#include <linux/limits.h>
+
 enum qmi_servreg_notif_service_state_enum_type_v01 {
 	QMI_SERVREG_NOTIF_SERVICE_STATE_ENUM_TYPE_MIN_VAL_V01 = INT_MIN,
 	QMI_SERVREG_NOTIF_SERVICE_STATE_ENUM_TYPE_MAX_VAL_V01 = INT_MAX,
@@ -27,6 +29,9 @@ enum pd_subsys_state {
 	ROOT_PD_SHUTDOWN,
 	USER_PD_STATE_CHANGE,
 };
+
+struct notifier_block;
+
 #if IS_ENABLED(CONFIG_MSM_SERVICE_NOTIFIER)
 
 /* service_notif_register_notifier() - Register a notifier for a service

include/trace/events/ion.h

@@ -9,6 +9,7 @@
 #if !defined(_TRACE_ION_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_ION_H
 
+#include <linux/dma-direction.h>
 #include <linux/types.h>
 #include <linux/tracepoint.h>