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

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

Merge "msm: Update ARCH_MSM Kconfig select list to be closer to multiplatform"

parents cb9f2b97 8a8a82ff

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -656,6 +656,9 @@ config ARCH_MSM 
	select NEED_MACH_IO_H

	select NEED_MACH_GPIO_H

	select SOC_BUS

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Qualcomm MSM/QSD based systems.  This runs on the

	  apps processor of the MSM/QSD and depends on a shared memory

arch/arm/mach-msm/Kconfig

+0 −24
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ config ARCH_MSM8974 
	select CPU_V7

	select MSM_SCM

	select MSM_GPIOMUX

	select MULTI_IRQ_HANDLER

	select MSM_MULTIMEDIA_USE_ION

	select MSM_PIL

	select MSM_SPM_V2
@@ -18,8 +17,6 @@ config ARCH_MSM8974 
	select MSM_NATIVE_RESTART

	select MSM_RESTART_V2

	select MSM_PM8X60 if PM

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select MSM_RPM_SMD

	select REGULATOR

	select HAVE_ARM_ARCH_TIMER
@@ -48,12 +45,9 @@ config ARCH_APQ8084 
	select MSM_SCM

	select HAVE_ARM_ARCH_TIMER

	select MSM_GPIOMUX

	select MULTI_IRQ_HANDLER

	select MSM_NATIVE_RESTART

	select MSM_RESTART_V2

	select MSM_PM8X60 if PM

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select REGULATOR

	select MSM_QDSP6V2_CODECS

	select MSM_AUDIO_QDSP6V2 if SND_SOC
@@ -84,14 +78,11 @@ config ARCH_MPQ8092 
	select GPIO_MSM_V3

	select ARM_GIC

	select HAVE_ARM_ARCH_TIMER

	select MULTI_IRQ_HANDLER

	select MSM_NATIVE_RESTART

	select MSM_RESTART_V2

	select CPU_V7

	select MSM_SCM

	select MSM_GPIOMUX

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select MSM_NOPM

	select MEMORY_HOLE_CARVEOUT

	select DONT_MAP_HOLE_AFTER_MEMBANK0
@@ -111,12 +102,9 @@ config ARCH_FSM9900 
	select MSM_SCM

	select HAVE_ARM_ARCH_TIMER

	select MSM_GPIOMUX

	select MULTI_IRQ_HANDLER

	select MSM_PIL

	select MSM_NATIVE_RESTART

	select MSM_RESTART_V2

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select REGULATOR

	select ARM_HAS_SG_CHAIN

	select MSM_RUN_QUEUE_STATS
@@ -137,12 +125,9 @@ config ARCH_MSMKRYPTON 
	select MSM_RESTART_V2

	select MSM_SPM_V2

	select MSM_PM8X60 if PM

	select MULTI_IRQ_HANDLER

	select GPIO_MSM_V3

	select MIGHT_HAVE_PCI

	select ARCH_SUPPORTS_MSI

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select MEMORY_HOLE_CARVEOUT

	select QMI_ENCDEC

	select MSM_JTAG_MM if CORESIGHT_ETM
@@ -155,9 +140,6 @@ config ARCH_MSM8610 
	select ARCH_MSM_CORTEXMP

	select CPU_V7

	select MSM_SCM

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select ARM_TICKET_LOCKS

	select GPIO_MSM_V3

	select MSM_GPIOMUX
@@ -199,9 +181,6 @@ config ARCH_MSM8226 
	select ARCH_MSM_CORTEXMP

	select CPU_V7

	select MSM_SCM

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select ARM_TICKET_LOCKS

	select GPIO_MSM_V3

	select MSM_GPIOMUX
@@ -246,7 +225,6 @@ config ARCH_MSMSAMARIUM 
	select MSM_SCM

	select MSM_PIL

	select MSM_GPIOMUX

	select MULTI_IRQ_HANDLER

	select MSM_SPM_V2

	select MSM_L2_SPM

	select MSM_NATIVE_RESTART
@@ -259,8 +237,6 @@ config ARCH_MSMSAMARIUM 
	select REGULATOR

	select MSM_RPM_REGULATOR_SMD

	select MSM_SPM_REGULATOR

	select MAY_HAVE_SPARSE_IRQ

	select SPARSE_IRQ

	select ARM_HAS_SG_CHAIN

	select MSM_RUN_QUEUE_STATS

	select ARCH_WANT_KMAP_ATOMIC_FLUSH