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

Commit 37e2e703 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: Enable msmgold support in msm8937_defconfig"

parents b5a0ef41 77e2a9ff

arch/arm/boot/dts/qcom/msmgold.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. MSMGOLD";

	compatible = "qcom,msmgold";

	qcom,msm-id = <303 0x0>;

	qcom,msm-id = <303 0x0>, <308 0x0>, <309 0x0>;

	interrupt-parent = <&intc>;



	soc: soc { };

arch/arm/configs/msm8937-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8916=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSMGOLD=y

CONFIG_ARCH_MSMTITANIUM=y

CONFIG_ARM_KERNMEM_PERMS=y

CONFIG_SMP=y
@@ -310,6 +311,7 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=m

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSMGOLD=y

CONFIG_PINCTRL_MSMTITANIUM=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

arch/arm/configs/msm8937_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8916=y

CONFIG_ARCH_MSM8937=y

CONFIG_ARCH_MSMGOLD=y

CONFIG_ARCH_MSMTITANIUM=y

CONFIG_ARM_KERNMEM_PERMS=y

CONFIG_SMP=y
@@ -307,6 +308,7 @@ CONFIG_SPI_QUP=y 
CONFIG_SPI_SPIDEV=m

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSMGOLD=y

CONFIG_PINCTRL_MSMTITANIUM=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

arch/arm/mach-msm/Kconfig

+30 −0
Original line number Diff line number Diff line
@@ -128,6 +128,36 @@ config ARCH_MSM8937 
	select ARM_HAS_SG_CHAIN

	select MSM_JTAGV8 if CORESIGHT_ETMV4



config ARCH_MSMGOLD

	bool "MSMGOLD"

	select MSM_CORTEX_A53

	select ARCH_MSM_CORTEXMP

	select CPU_V7

	select HAVE_SMP

	select ARM_GIC

	select MSM_IRQ

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select HAVE_ARM_ARCH_TIMER

	select MAY_HAVE_SPARSE_IRQ

	select PINCTRL

	select PINCTRL_MSM_TLMM

	select USE_PINCTRL_IRQ

	select MSM_PM if PM

	select QMI_ENCDEC

	select CPU_FREQ

	select CPU_FREQ_MSM

	select PM_DEVFREQ

	select MSM_DEVFREQ_DEVBW

	select DEVFREQ_SIMPLE_DEV

	select DEVFREQ_GOV_MSM_BW_HWMON

	select MSM_BIMC_BWMON

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC

	select ARM_HAS_SG_CHAIN

	select MSM_RPM_SMD

	select MSM_JTAGV8 if CORESIGHT_ETMV4



config ARCH_MSMTITANIUM

	bool "MSMTITANIUM"

	select MSM_CORTEX_A53

arch/arm/mach-msm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ obj-$(CONFIG_ARCH_MDM9640) += board-9640.o 
obj-$(CONFIG_ARCH_MDM9607) += board-9607.o

obj-$(CONFIG_ARCH_MDMCALIFORNIUM) += board-californium.o

obj-$(CONFIG_ARCH_MSM8916) += board-8952.o

obj-$(CONFIG_ARCH_MSMGOLD) += board-gold.o

obj-$(CONFIG_ARCH_MSM8937) += board-8937.o

obj-$(CONFIG_ARCH_MSMTITANIUM) += board-titanium.o