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

Commit 0ce9768f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Disable the board file initialization of other target"

parents 586c6f84 707fa0ba

arch/arm64/configs/apq8053_IoE-perf_defconfig

+0 −8
Original line number Diff line number Diff line
@@ -35,11 +35,7 @@ CONFIG_MODULE_SIG_FORCE=y 
CONFIG_MODULE_SIG_SHA512=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8916=y

CONFIG_ARCH_MSM8940=y

CONFIG_ARCH_MSM8953=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSMCOBALT=y

CONFIG_PCI_MSM=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y
@@ -310,10 +306,6 @@ CONFIG_SOUNDWIRE=y 
CONFIG_SPI=y

CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSMCOBALT=y

CONFIG_PINCTRL_MSM8940=y

CONFIG_PINCTRL_MSM8953=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

drivers/clk/msm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -41,11 +41,15 @@ obj-$(CONFIG_ARCH_SDXHEDGEHOG) += clock-a7.o 
obj-$(CONFIG_ARCH_MDM9607)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8909)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8953)	+= clock-a7.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-cpu-8939.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-gcc-8952.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-gcc-8953.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-rcgwr.o

obj-$(CONFIG_ARCH_MSM8916)	+= clock-cpu-8953.o

obj-$(CONFIG_ARCH_MSM8953)	+= clock-gcc-8953.o

obj-$(CONFIG_ARCH_MSM8953)	+= clock-rcgwr.o

obj-$(CONFIG_ARCH_MSM8953)	+= clock-cpu-8953.o



obj-y				+= gdsc.o

obj-y				+= mdss/

drivers/devfreq/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ config DEVFREQ_GOV_MSM_GPUBW_MON 


config ARMBW_HWMON

	tristate "ARM PMU Bandwidth monitor hardware"

	depends on ARCH_MSM8916 || ARCH_MSM8226 || ARCH_MSM8610

	depends on ARCH_MSM8916 || ARCH_MSM8953 || ARCH_MSM8226 || ARCH_MSM8610

	help

	  The PMU present on these ARM cores allow for the use of counters to

	  monitor the traffic coming from each core to the bus. It also has the

drivers/gud/MobiCoreDriver/platform.h

+7 −5
Original line number Diff line number Diff line
@@ -24,12 +24,13 @@ 


/*--------------- Implementation -------------- */

#if defined(CONFIG_ARCH_APQ8084) || defined(CONFIG_ARCH_MSM8916) || \

	defined(CONFIG_ARCH_MSM8994) || defined(CONFIG_ARCH_MSM8909) || \

	defined(CONFIG_ARCH_MSM8996)

	defined(CONFIG_ARCH_MSM8953) || defined(CONFIG_ARCH_MSM8994) || \

	defined(CONFIG_ARCH_MSM8909) || defined(CONFIG_ARCH_MSM8996)



#include <soc/qcom/scm.h>



#if defined(CONFIG_ARM64) || defined(CONFIG_ARCH_MSM8916)

#if defined(CONFIG_ARM64) || defined(CONFIG_ARCH_MSM8916) || \

	defined(CONFIG_ARCH_MSM8953)



	#include <soc/qcom/qseecomi.h>

	#include <linux/slab.h>
@@ -61,7 +62,8 @@ 
static inline int smc_fastcall(void *fc_generic, size_t size)

{

#if defined(CONFIG_ARCH_APQ8084) || defined(CONFIG_ARCH_MSM8916) || \

	defined(CONFIG_ARCH_MSM8994) || defined(CONFIG_ARCH_MSM8996)

	defined(CONFIG_ARCH_MSM8953) || defined(CONFIG_ARCH_MSM8994) || \

	defined(CONFIG_ARCH_MSM8996)

	if (is_scm_armv8()) {

		struct scm_desc desc = {0};

		int ret;
@@ -124,7 +126,7 @@ static inline int smc_fastcall(void *fc_generic, size_t size) 
 * Perform clock enable/disable for clock  "core_clk_src"

 */

#if defined(CONFIG_ARCH_MSM8916) || defined(CONFIG_ARCH_MSM8909) || \

	defined(CONFIG_ARCH_MSM8996)

	defined(CONFIG_ARCH_MSM8953) || defined(CONFIG_ARCH_MSM8996)

#define MC_DEVICE_PROPNAME "qcom,mcd"

#if defined(MC_CRYPTO_CLOCK_MANAGEMENT)

#define MC_CLOCK_CORESRC_PROPNAME "qcom,ce-opp-freq"

drivers/iommu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ config MSM_IOMMU 
# MSM IOMMUv1 support

config MSM_IOMMU_V1

	bool "MSM IOMMUv1 Support"

	depends on ARCH_MSM8974 || ARCH_MSM8226 || ARCH_APQ8084 || ARCH_MSM8916 || ARCH_MSM8994 || ARCH_MSM8992 || ARCH_MSM8909

	depends on ARCH_MSM8974 || ARCH_MSM8226 || ARCH_APQ8084 || ARCH_MSM8916 ||  ARCH_MSM8953 || ARCH_MSM8994 || ARCH_MSM8992 || ARCH_MSM8909

	select IOMMU_API

	select MSM_IOMMU

	help