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

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

Merge "ARM: dts: msm: Add 32-bit DT Overlay support"

parents e92e0ae2 eed42fe2

arch/arm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ 
# Ensure linker flags are correct

LDFLAGS		:=



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

export DTC_FLAGS := -@

endif



LDFLAGS_vmlinux	:=-p --no-undefined -X --pic-veneer

ifeq ($(CONFIG_CPU_ENDIAN_BE8),y)

LDFLAGS_vmlinux	+= --be8

arch/arm/boot/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ targets := Image zImage xipImage bootpImage uImage 
DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))

DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))

else

DTB_LIST := $(dtb-y)

DTB_OBJS := $(shell find $(obj)/dts/ -name \*.dtb)

endif

DTB_OBJS := $(addprefix $(obj)/dts/,$(DTB_LIST))



ifeq ($(CONFIG_XIP_KERNEL),y)

arch/arm/mach-qcom/Kconfig

+39 −0
Original line number Diff line number Diff line
@@ -73,6 +73,45 @@ config ARCH_QCS403 
	This enables support for the QCS403 chipset. If you do not

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



config ARCH_TRINKET

	bool "Enable Support for TRINKET"

	select CPU_V7

	select CLKDEV_LOOKUP

	select HAVE_CLK

	select HAVE_CLK_PREPARE

	select PM_OPP

	select SOC_BUS

	select MSM_IRQ

	select THERMAL_WRITABLE_TRIPS

	select ARM_GIC_V3

	select ARM_AMBA

	select SPARSE_IRQ

	select MULTI_IRQ_HANDLER

	select HAVE_ARM_ARCH_TIMER

	select MAY_HAVE_SPARSE_IRQ

	select COMMON_CLK

	select QCOM_GDSC

	select PINCTRL_MSM

	select USE_PINCTRL_IRQ

	select MSM_PM if PM

	select QMI_ENCDEC

	select CPU_FREQ

	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 MSM_RPM_SMD

	select PCI

	select MSM_JTAG_MM if CORESIGHT_ETM

	select MSM_RPM_LOG

	select MSM_RPM_STATS_LOG

	help

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

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



config ARCH_MSM8X60

	bool "Enable support for MSM8X60"

	select ARCH_SUPPORTS_BIG_ENDIAN

arch/arm/mach-qcom/Makefile

+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_QCS405) += board-qcs405.o

obj-$(CONFIG_ARCH_QCS403) += board-qcs403.o

obj-$(CONFIG_ARCH_TRINKET) += board-trinket.o

obj-$(CONFIG_ARCH_SDXPRAIRIE) += board-sdxprairie.o

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

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

 * Copyright (c) 2019, 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/map.h>

#include <asm/mach/arch.h>

#include "board-dt.h"



static const char *trinket_dt_match[] __initconst = {

	"qcom,trinket",

	NULL

};



static void __init trinket_init(void)

{

	board_dt_populate(NULL);

}



DT_MACHINE_START(TRINKET,

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

	.init_machine		= trinket_init,

	.dt_compat		= trinket_dt_match,

MACHINE_END