diff options
| -rw-r--r-- | arch/arm/Kconfig | 27 | ||||
| -rw-r--r-- | arch/arm/Kconfig.debug | 2 | ||||
| -rw-r--r-- | arch/arm/mach-qcom/Kconfig | 30 |
3 files changed, 47 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d3159ff4de5b..6b09a67c9a0d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -632,6 +632,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 @@ -1505,7 +1530,7 @@ config ARM_PSCI config ARCH_NR_GPIO int default 1024 if ARCH_BRCMSTB || ARCH_SHMOBILE || 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 diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0901c6bd458f..71afa854e1c4 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1612,7 +1612,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 diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 2256cd1e25d1..918a3fa7e938 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -1,25 +1,35 @@ -menuconfig ARCH_QCOM - bool "Qualcomm Support" if ARCH_MULTI_V7 - select ARCH_SUPPORTS_BIG_ENDIAN - select ARM_GIC - select ARM_AMBA - select PINCTRL - 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 +endmenu endif |