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

Commit 8d296426 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add initial device tree for trinket"

parents dc185dcb 0b67a580
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ SoCs:
- SDMMAGPIE
  compatible = "qcom,sdmmagpie"

- TRINKET
  compatible = "qcom,trinket"

Generic board variants:

- CDP device:
@@ -181,3 +184,4 @@ compatible = "qcom,sdmmagpie-qrd"
compatible = "qcom,sdmmagpiep-idp"
compatible = "qcom,sdmmagpiep"
compatible = "qcom,sdmmagpiep-qrd"
compatible = "qcom,trinket-rumi"
+8 −0
Original line number Diff line number Diff line
@@ -185,6 +185,14 @@ config ARCH_SDMMAGPIE
	  This enables support for the SDMMAGPIE 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 Qualcomm Technologies, Inc. TRINKET"
	depends on ARCH_QCOM
	select COMMON_CLK_QCOM
	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_REALTEK
	bool "Realtek Platforms"
	help
+9 −0
Original line number Diff line number Diff line
@@ -142,6 +142,15 @@ dtb-$(CONFIG_ARCH_SDMMAGPIE) += sdmmagpie-rumi.dtb \
	sdmmagpiep-qrd.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
	dtbo-$(CONFIG_ARCH_TRINKET) += \
		trinket-rumi-overlay.dtbo

trinket-rumi-overlay.dtbo-base := trinket.dtb
else
dtb-$(CONFIG_ARCH_TRINKET)	+= trinket-rumi.dtb
endif

dtb-$(CONFIG_ARCH_SDXPRAIRIE) += sdxprairie-rumi.dtb \
	sdxprairie-cdp.dtb \
	sdxprairie-mtp.dtb
+25 −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.
 */

/dts-v1/;
/plugin/;

#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "trinket-rumi.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. TRINKET RUMI";
	compatible = "qcom,trinket-rumi", "qcom,trinket", "qcom,rumi";
	qcom,msm-id = <394 0x0>;
	qcom,board-id = <15 0>;
};
+24 −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.
 */

/dts-v1/;
/memreserve/ 0x90000000 0x00000100;

#include "trinket.dtsi"
#include "trinket-rumi.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. TRINKET RUMI";
	compatible = "qcom,trinket-rumi", "qcom,trinket", "qcom,rumi";
	qcom,board-id = <15 0>;
};
Loading