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

Commit 0ee915a9 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 52c9eb46 on remote branch 

Change-Id: I913d7a48007eaf7e08fdab9c43f867bf627a4935
parents 44ef4226 52c9eb46

arch/arm/configs/vendor/bengal-perf_defconfig

+3 −1
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
@@ -300,6 +301,7 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD_LEDS=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_MISC=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_QPNP_POWER_ON=y
@@ -329,7 +331,6 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMB5=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_QPNP_QG=y

CONFIG_QPNP_QG=y
@@ -394,6 +395,7 @@ CONFIG_HID_MAGICMOUSE=y 
CONFIG_HID_MICROSOFT=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_MON=y

arch/arm/configs/vendor/bengal_defconfig

+4 −1
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
@@ -318,6 +319,7 @@ CONFIG_KEYBOARD_GPIO=y 
# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_JOYSTICK=y

CONFIG_INPUT_JOYSTICK=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD=y

CONFIG_JOYSTICK_XPAD_LEDS=y

CONFIG_INPUT_TABLET=y

CONFIG_INPUT_TABLET=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y

CONFIG_TOUCHSCREEN_ATMEL_MXT=y
@@ -337,6 +339,7 @@ CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y 
CONFIG_TTY_PRINTK=y

CONFIG_TTY_PRINTK=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

CONFIG_HW_RANDOM_MSM_LEGACY=y

# CONFIG_DEVPORT is not set

CONFIG_DIAG_CHAR=y

CONFIG_DIAG_CHAR=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_ADSPRPC=y

CONFIG_MSM_RDBG=m

CONFIG_MSM_RDBG=m
@@ -357,7 +360,6 @@ CONFIG_GPIO_SYSFS=y 
CONFIG_POWER_RESET=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_POWER_SUPPLY=y

CONFIG_QPNP_SMB5=y

CONFIG_QPNP_SMB5=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_SMB1355_SLAVE_CHARGER=y

CONFIG_QPNP_QG=y

CONFIG_QPNP_QG=y
@@ -426,6 +428,7 @@ CONFIG_HID_MAGICMOUSE=y 
CONFIG_HID_MICROSOFT=y

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_MULTITOUCH=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_PLANTRONICS=y

CONFIG_HID_SONY=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_HIDDEV=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_MON=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