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

Commit 9af3592f authored by Jeevan Shriram's avatar Jeevan Shriram Committed by Shadab Naseem
Browse files

arch: arm: generalise ARCH_QCOM platform 



generalise ARCH_QCOM platform to support new 32-bit
qcom platforms.

Change-Id: I412a83a2f756b02d6b521983501de780835dc118
Signed-off-by: default avatarSrinivas Ramana <sramana@codeaurora.org>
[jshriram: Fix merge conflicts]
Signed-off-by: default avatarJeevan Shriram <jshriram@codeaurora.org>
[akdwived: Added "select GENERIC_IRQ_MIGRATION" with hotplug]
Signed-off-by: default avatarAvaneesh Kumar Dwivedi <akdwived@codeaurora.org>
[snaseem@codeaurora.org: Resolve merge conflict]
Signed-off-by: default avatarShadab Naseem <snaseem@codeaurora.org>
[tengfeif@codeaurora.org: Remove duplicate config included in bengal]
Signed-off-by: default avatarTengfei Fan <tengfeif@codeaurora.org>
parent 6c0efa0a

arch/arm/Kconfig

+26 −1
Original line number Diff line number Diff line
@@ -540,6 +540,31 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_QCOM

       bool "Qualcomm MSM (non-multiplatform)"

       select ARCH_REQUIRE_GPIOLIB

       select CPU_V7

       select AUTO_ZRELADDR

       select HAVE_SMP

       select CLKDEV_LOOKUP

       select GENERIC_CLOCKEVENTS

       select GENERIC_ALLOCATOR

       select ARM_PATCH_PHYS_VIRT

       select ARM_HAS_SG_CHAIN

       select ARCH_HAS_OPP

       select SOC_BUS

       select MULTI_IRQ_HANDLER

       select PM_OPP

       select SPARSE_IRQ

       select USE_OF

       select PINCTRL

       help

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

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

         interface to the modem processor which runs the baseband

         stack and controls some vital subsystems

         (clock and power control, etc).



config ARCH_RPC

	bool "RiscPC"

	depends on MMU
@@ -1469,7 +1494,7 @@ config ARCH_NR_GPIO 
	int

	default 2048 if ARCH_SOCFPGA

	default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \

		ARCH_ZYNQ

		ARCH_ZYNQ || ARCH_QCOM

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \

		SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

	default 416 if ARCH_SUNXI

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1858,7 +1858,7 @@ config DEBUG_UNCOMPRESS 
config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \

					PLAT_SAMSUNG || ARM_SINGLE_ARMV7M

				ARCH_QCOM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/mach-qcom/Kconfig

+34 −21
Original line number Diff line number Diff line 
menuconfig ARCH_QCOM

	bool "Qualcomm Support"

	depends on ARCH_MULTI_V7

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select PINCTRL

	select MFD_CORE

	select SND_SOC_COMPRESS

	select SND_HWDEP

	select QCOM_SCM if SMP

	help

	  Support for Qualcomm's devicetree based systems.



if ARCH_QCOM

menu "QCOM SoC Type"



config ARCH_MSM8X60

	bool "Enable support for MSM8X60"

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_QCOM

	select CLKSRC_OF

	select COMMON_CLK



config ARCH_MSM8960

	bool "Enable support for MSM8960"

	select CLKSRC_QCOM

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_OF

	select COMMON_CLK





config ARCH_MSM8974

	bool "Enable support for MSM8974"

	select HAVE_ARM_ARCH_TIMER

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_OF

	select COMMON_CLK



config ARCH_MDM9615

	bool "Enable support for MDM9615"

	select CLKSRC_QCOM

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_OF

	select COMMON_CLK



config ARCH_BENGAL

	bool "Enable Support for Qualcomm Technologies, Inc. BENGAL"

	select COMMON_CLK_QCOM

	select CPU_V7

	select ARCH_SUPPORT_BIG_ENDIAN

	select ARM_GIC

	select ARM_AMBA

	select QCOM_SCM if SMP

	select CLKSRC_OF

	select COMMON_CLK

	select HAVE_CLK

	select HAVE_CLK_PREPARE

	select PM_OPP

	select SOC_BUS

	select THERMAL_WRITABLE_TRIPS

	select ARM_GIC_V3

	select ARM_AMBA

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select HAVE_ARM_ARCH_TIMER

	select COMMON_CLK

	select PINCTRL_MSM

	select MSM_PM if PM

	select CPU_FREQ

	select PM_DEVFREQ

	select PCI

	help

	  This enables support for the BENGAL chipset. If you do not

	  wish to build a kernel that runs on this chipset, say 'N' here.



endmenu

endif