Merge "ARM: msm: Add support for MSMTITANIUM SoC"

	select MSM_RPM_LOG

	select MSM_RPM_STATS_LOG

config ARCH_MSM8916

	bool "MSM8916"

	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_MSMTHORIUM

	bool "MSMTHORIUM"

	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_MSMTITANIUM

	bool "MSMTITANIUM"

	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

endmenu

endif

obj-$(CONFIG_USE_OF) += board-dt.o

obj-$(CONFIG_SMP) += headsmp.o platsmp.o

obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o

obj-$(CONFIG_ARCH_MDM9640) += board-9640.o

obj-$(CONFIG_ARCH_MDMFERMIUM) += board-fermium.o

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

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

obj-$(CONFIG_ARCH_MSMTHORIUM) += board-thorium.o

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

/*

 * Copyright (c) 2015, 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 *msm8952_dt_match[] __initconst = {

	"qcom,msm8952",

	"qcom,apq8052",

	NULL

};

static void __init msm8952_init(void)

{

	board_dt_populate(NULL);

}

DT_MACHINE_START(MSM8952_DT,

	"Qualcomm Technologies, Inc. MSM 8952 (Flattened Device Tree)")

	.init_machine = msm8952_init,

	.dt_compat = msm8952_dt_match,

MACHINE_END

/*

 * Copyright (c) 2015, 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 *msmthorium_dt_match[] __initconst = {

	"qcom,msmthorium",

	"qcom,apqthorium",

	NULL

};

static void __init msmthorium_init(void)

{

	board_dt_populate(NULL);

}

DT_MACHINE_START(MSMTHORIUM_DT,

	"Qualcomm Technologies, Inc. MSM THORIUM (Flattened Device Tree)")

	.init_machine = msmthorium_init,

	.dt_compat = msmthorium_dt_match,

MACHINE_END

/*

 * Copyright (c) 2015, 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 *msmtitanium_dt_match[] __initconst = {

	"qcom,msmtitanium",

	"qcom,apqtitanium",

	NULL

};

static void __init msmtitanium_init(void)

{

	board_dt_populate(NULL);

}

DT_MACHINE_START(MSMTITANIUM_DT,

	"Qualcomm Technologies, Inc. MSM TITANIUM (Flattened Device Tree)")

	.init_machine = msmtitanium_init,

	.dt_compat = msmtitanium_dt_match,

MACHINE_END