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

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

Merge "ARM: dts: msm: add device tree files for automotive sdmshrike"

parents c67052b8 3cf9f794

Documentation/devicetree/bindings/arm/msm/msm.txt

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ compatible = "qcom,qcs403-iot" 
compatible = "qcom,qcs401-iot"

compatible = "qcom,sa8155-adp-star"

compatible = "qcom,sa8155p-adp-star"

compatible = "qcom,sa8195p-adp-star"

compatible = "qcom,sa8195p"

compatible = "qcom,adp-star"

compatible = "qcom,sa8155-v2-adp-air"

compatible = "qcom,sa8155p-v2-adp-air"

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -101,15 +101,18 @@ dtb-$(CONFIG_QTI_GVM) += sa8155-vm.dtb \ 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SDMSHRIKE) += \

		sdmshrike-cdp-overlay.dtbo \

		sdmshrike-mtp-overlay.dtbo

		sdmshrike-mtp-overlay.dtbo \

		sa8195p-adp-star-overlay.dtbo



sdmshrike-cdp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb

sdmshrike-mtp-overlay.dtbo-base := sdmshrike.dtb sdmshrike-v2.dtb

sa8195p-adp-star-overlay.dtbo-base := sa8195p.dtb

else

dtb-$(CONFIG_ARCH_SDMSHRIKE)	+= sdmshrike-rumi.dtb \

	sdmshrike-mtp.dtb \

	sdmshrike-cdp.dtb \

	sdmshrike-v2-mtp.dtb

	sdmshrike-v2-mtp.dtb \

	sa8195p-adp-star.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sa8195p-adp-star.dts

0 → 100644
+22 −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.

 */



/dts-v1/;

#include "sa8195p.dtsi"

#include "sa8195p-adp-star.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8195P ADP-STAR";

	compatible = "qcom,sa8195p-adp-star", "qcom,sa8195p",

		"qcom,adp-star";

	qcom,board-id = <25 0>;

};

arch/arm64/boot/dts/qcom/sa8195p-adp-star.dtsi

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2018-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 "sdmshrike-v2.dtsi"

arch/arm64/boot/dts/qcom/sa8195p.dts

0 → 100644
+22 −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.

 */



/dts-v1/;



#include "sdmshrike-v2.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA8195P AU SoC";

	compatible = "qcom,sdmshrike";

	qcom,pmic-name = "PM8150";

	qcom,board-id = <0 0>;

};