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

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

Merge "defconfig: msm: enable ARCH_MSM8937 support for 32-bit msm8937"

parents f0ce27d0 ba0b800c
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSM8953=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM450=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ CONFIG_PARTITION_ADVANCED=y
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_QCOM=y
CONFIG_ARCH_MSM8953=y
CONFIG_ARCH_MSM8937=y
CONFIG_ARCH_SDM450=y
# CONFIG_VDSO is not set
CONFIG_SMP=y
+12 −0
Original line number Diff line number Diff line
@@ -65,6 +65,18 @@ config ARCH_MSM8953
	select HAVE_CLK_PREPARE
	select COMMON_CLK_MSM

config ARCH_MSM8937
	bool "Enable support for MSM8937"
	select CPU_V7
	select HAVE_ARM_ARCH_TIMER
	select PINCTRL
	select QCOM_SCM if SMP
	select PM_DEVFREQ
	select CLKDEV_LOOKUP
	select HAVE_CLK
	select HAVE_CLK_PREPARE
	select COMMON_CLK_MSM

config ARCH_SDM450
	bool "Enable support for SDM450"
	select CPU_V7
+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ obj-$(CONFIG_USE_OF) += board-dt.o
obj-$(CONFIG_SMP)	+= platsmp.o
obj-$(CONFIG_ARCH_SDXPOORWILLS) += board-poorwills.o
obj-$(CONFIG_ARCH_MSM8953) += board-msm8953.o
obj-$(CONFIG_ARCH_MSM8937) += board-msm8937.o
obj-$(CONFIG_ARCH_SDM450) += board-sdm450.o
+32 −0
Original line number Diff line number Diff line
/* Copyright (c) 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 "board-dt.h"
#include <asm/mach/map.h>
#include <asm/mach/arch.h>

static const char *msm8937_dt_match[] __initconst = {
	"qcom,msm8937",
	NULL
};

static void __init msm8937_init(void)
{
	board_dt_populate(NULL);
}

DT_MACHINE_START(MSM8937_DT,
	"Qualcomm Technologies, Inc. MSM8937 (Flattened Device Tree)")
	.init_machine		= msm8937_init,
	.dt_compat		= msm8937_dt_match,
MACHINE_END