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

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

Merge "ARM: dts: msm: Add support for SA8195P V2 ADP AIR"

parents 41477da3 59088a9a
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ compatible = "qcom,qcs407-iot"
compatible = "qcom,sa8155-adp-star"
compatible = "qcom,sa8155p-adp-star"
compatible = "qcom,sa8195p-adp-star"
compatible = "qcom,sa8195p-v2-adp-air"
compatible = "qcom,sa8195p"
compatible = "qcom,adp-star"
compatible = "qcom,sa8155-v2-adp-air"
+4 −1
Original line number Diff line number Diff line
@@ -26,13 +26,16 @@ endif
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
	dtbo-$(CONFIG_ARCH_SDMSHRIKE) += \
		sdmshrike-cdp-overlay.dtbo \
		sa8195p-adp-star-overlay.dtbo
		sa8195p-adp-star-overlay.dtbo \
		sa8195p-v2-adp-air-overlay.dtbo

sdmshrike-cdp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb
sa8195p-adp-star-overlay.dtbo-base := sa8195p.dtb
sa8195p-v2-adp-air-overlay.dtbo-base := sa8195p.dtb
else
dtb-$(CONFIG_ARCH_SDMSHRIKE)	+= sdmshrike-cdp.dtb \
	sa8195p-adp-star.dtb
	sa8195p-v2-adp-air.dtb
endif

ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
+25 −0
Original line number Diff line number Diff line
/* Copyright (c) 2018-2020, 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 "sa8195.dtsi"
#include "sa8195p-adp-star-display.dtsi"

/ {
	model = "ADP-AIR";
	compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p",
		"qcom,adp-air";
	qcom,board-id = <0x02010019 0>;
};
+23 −0
Original line number Diff line number Diff line
/* Copyright (c) 2018-2020, 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/;

#include "sa8195p.dtsi"
#include "sa8195p-adp-star-display.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SA8195P V2 ADP AIR";
	compatible = "qcom,sa8195p-v2-adp-air", "qcom,sa8195p", "qcom,adp-air";
	qcom,board-id = <0x02010019 0>;
};