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

Commit 02b56508 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: bengal: Add arch support for Scuba 32bit"

parents 870a8764 fa8c8bab

arch/arm/configs/vendor/bengal-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y 
CONFIG_PROFILING=y

CONFIG_PROFILING=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_BENGAL=y

CONFIG_ARCH_BENGAL=y

CONFIG_ARCH_SCUBA=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_MC=y

arch/arm/configs/vendor/bengal_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y 
CONFIG_PROFILING=y

CONFIG_PROFILING=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_QCOM=y

CONFIG_ARCH_BENGAL=y

CONFIG_ARCH_BENGAL=y

CONFIG_ARCH_SCUBA=y

# CONFIG_VDSO is not set

# CONFIG_VDSO is not set

CONFIG_SMP=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_MC=y

arch/arm/mach-qcom/Kconfig

+23 −0
Original line number Original line Diff line number Diff line
@@ -65,5 +65,28 @@ config ARCH_BENGAL 
	  This enables support for the BENGAL chipset. If you do not

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

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

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





config ARCH_SCUBA

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

	select COMMON_CLK_QCOM

	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 THERMAL_WRITABLE_TRIPS

	select ARM_GIC_V3

	select HAVE_ARM_ARCH_TIMER

	select PINCTRL_MSM

	select MSM_PM if PM

	select CPU_FREQ

	select PM_DEVFREQ

	select PCI

	help

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

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



endmenu

endmenu

endif
 
endif

arch/arm/mach-qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_USE_OF) += board-dt.o

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

obj-$(CONFIG_SMP)	+= platsmp.o

obj-$(CONFIG_SMP)	+= platsmp.o

obj-$(CONFIG_ARCH_BENGAL) += board-bengal.o

obj-$(CONFIG_ARCH_BENGAL) += board-bengal.o

obj-$(CONFIG_ARCH_SCUBA) += board-scuba.o

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

0 → 100644
+25 −0
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 */



#include <linux/kernel.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>

#include "board-dt.h"



static const char *scuba_dt_match[] __initconst = {

	"qcom,scuba",

	NULL

};



static void __init scuba_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(BENGAL,

	"Qualcomm Technologies, Inc. SCUBA (Flattened Device Tree)")

	.init_machine		= scuba_init,

	.dt_compat		= scuba_dt_match,

MACHINE_END