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

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

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

parents 8eb8925a 9e6cd123

arch/arm64/boot/dts/qcom/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sa8155p-adp-star-overlay.dtbo \

		sa8155p-adp-star-lpass-overlay.dtbo \

		sa8155-v2-adp-air-overlay.dtbo \

                sa8155p-v2-adp-air-overlay.dtbo

                sa8155p-v2-adp-air-overlay.dtbo \

		sa8155p-v2-adp-air-lpass-overlay.dts



sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb
@@ -15,6 +16,7 @@ sa8155p-adp-star-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb 
sa8155p-adp-star-lpass-overlay.dtbo := sa8155p.dtb sa8155p-v2.dtb

sa8155-v2-adp-air-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb

sa8155p-v2-adp-air-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb

sa8155p-v2-adp-air-lpass-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb

else

dtb-$(CONFIG_ARCH_SM8150)	+= sm8150-cdp.dtb \

	sa8155-adp-star.dtb \
@@ -23,7 +25,8 @@ dtb-$(CONFIG_ARCH_SM8150) += sm8150-cdp.dtb \ 
	sa8155-v2-adp-star.dtb \

	sa8155p-v2-adp-star.dtb \

	sa8155-v2-adp-air.dtb \

	sa8155p-v2-adp-air.dtb

	sa8155p-v2-adp-air.dtb \

	sa8155p-v2-adp-air-lpass.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

arch/arm64/boot/dts/qcom/sa8155p-v2-adp-air-lpass-overlay.dts

0 → 100644
+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 "sa8155-adp-common.dtsi"

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



/ {

	model = "ADP Air + LPASS Audio PLL sourced from eMAC PPO";

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

		"qcom,adp-air";

	qcom,board-id = <0x04010019 0>;

};

arch/arm64/boot/dts/qcom/sa8155p-v2-adp-air-lpass.dts

0 → 100644
+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/;



#include "sa8155p-v2.dtsi"

#include "sa8155-adp-common.dtsi"

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



/ {

	model = "Qualcomm Technologies, Inc. SA8155P V2 ADP Air + LPASS Audio

			 PLL sourced from eMAC PPO ";

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

	qcom,board-id = <0x04010019 0>;

};