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

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

Merge "ARM: dts: msm: Add device tree support for msm8940"

parents 7cb7a4a7 95b6ac40

Documentation/devicetree/bindings/arm/msm/msm.txt

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ SoCs: 
- MSM8917

  compatible = "qcom,msm8917"



- MSM8940

  compatible = "qcom,msm8940"



- MSM8936

  compatible = "qcom,msm8936"
@@ -279,6 +282,7 @@ compatible = "qcom,msm8917-mtp" 
compatible = "qcom,msm8917-rumi"

compatible = "qcom,msm8917-qrd"

compatible = "qcom,msm8917-qrd-sku5"

compatible = "qcom,msm8940-mtp"

compatible = "qcom,msm8926-cdp"

compatible = "qcom,msm8926-mtp"

compatible = "qcom,msm8926-qrd"

arch/arm/mach-qcom/Kconfig

+29 −0
Original line number Diff line number Diff line
@@ -138,6 +138,35 @@ config ARCH_QM215 
	select HAVE_CLK_PREPARE

	select COMMON_CLK_MSM



config ARCH_MSM8940

	bool "MSM8940"

	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_JTAGV8 if CORESIGHT_ETMV4



config ARCH_SDM439

	bool "Enable support for SDM439"

	select CPU_V7

arch/arm/mach-qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_ARCH_MSM8937) += board-msm8937.o 
obj-$(CONFIG_ARCH_MSM8909) += board-msm8909.o

obj-$(CONFIG_ARCH_MSM8917) += board-msm8917.o

obj-$(CONFIG_ARCH_QM215) += board-qm215.o

obj-$(CONFIG_ARCH_MSM8940) += board-msm8940.o

obj-$(CONFIG_ARCH_SDM429) += board-sdm429.o

obj-$(CONFIG_ARCH_SDM439) += board-sdm439.o

obj-$(CONFIG_ARCH_SDM450) += board-sdm450.o

arch/arm/mach-qcom/board-msm8940.c

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016, 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/kernel.h>

#include <asm/mach/arch.h>

#include "board-dt.h"



static const char *msm8940_dt_match[] __initconst = {

	"qcom,msm8940",

	NULL

};



static void __init msm8940_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(MSM8940_DT,

	"Qualcomm Technologies, Inc. MSM8940-PMI8950 MTP")

	.init_machine = msm8940_init,

	.dt_compat = msm8940_dt_match,

MACHINE_END

arch/arm64/Kconfig.platforms

+9 −0
Original line number Diff line number Diff line
@@ -166,6 +166,15 @@ config ARCH_MSM8937 
	  This enables support for the MSM8937 chipset. If you do not

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



config ARCH_MSM8940

	bool "Enable Support for Qualcomm Technologies Inc. MSM8940"

	depends on ARCH_QCOM

	select CPU_FREQ_QCOM

	select COMMON_CLK_MSM

	help

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

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



config ARCH_MSM8917

	bool "Enable Support for Qualcomm Technologies Inc. MSM8917"

	depends on ARCH_QCOM