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

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

Merge "ARM: msm: Add board config support for 32 bit qcs405" into msm-4.14

parents 510c9bd5 dd6f9677

arch/arm/boot/dts/Makefile

+14 −0
Original line number Diff line number Diff line
@@ -1069,6 +1069,15 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb 
dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-ast2500-evb.dtb

DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))

ifneq ($(DTB_NAMES),)

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

else

DTB_LIST := $(dtb-y)

endif



targets += dtbs dtbs_install

targets += $(DTB_LIST)

endif



dtstree		:= $(srctree)/$(src)
@@ -1084,5 +1093,10 @@ endif 
targets += dtbs dtbs_install

targets += $(DTB_LIST)



ifeq ($(CONFIG_ARM64),y)

always		:= $(DTB_LIST)

else

dtbs: $(addprefix $(obj)/, $(DTB_LIST))

	$(Q)rm -f $(obj)/../*.dtb

endif

clean-files	:= *.dtb

arch/arm/mach-qcom/Kconfig

+36 −0
Original line number Diff line number Diff line 
if ARCH_QCOM

menu "QCOM SoC Type"



config ARCH_QCS405

        bool "Enable Support for QCS405"

	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

	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 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 MSM_RPM_SMD

	select MSM_JTAGV8 if CORESIGHT_ETMV4

	help

	This enables support for the QCS405 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

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

obj-$(CONFIG_SMP)	+= platsmp.o

obj-$(CONFIG_ARCH_QCS405) += board-qcs405.o

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

0 → 100644
+28 −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 <linux/of.h>

#include <linux/of_fdt.h>



#include "board-dt.h"



void __init board_dt_populate(struct of_dev_auxdata *adata)

{

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);



	/* Explicitly parent the /soc devices to the root node to preserve

	 * the kernel ABI (sysfs structure, etc) until userspace is updated

	 */

	of_platform_populate(of_find_node_by_path("/soc"),

			     of_default_bus_match_table, adata, NULL);

}

arch/arm/mach-qcom/board-dt.h

0 → 100644
+15 −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/of_platform.h>



void __init board_dt_populate(struct of_dev_auxdata *adata);