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

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

Merge "ARM: dts: msm: add lxc overlay supoort on v1 board"

parents 79f61f9b 613cbf4a

qcom/Makefile

+12 −0
Original line number Diff line number Diff line
@@ -284,6 +284,8 @@ dtb-$(CONFIG_ARCH_SCUBA) += qrb2210-rb1.dtb 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y)

	dtbo-$(CONFIG_ARCH_SA8155) += \

		sa8155-adp-star-lxc-overlay.dtbo \

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

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

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

else
@@ -298,6 +300,8 @@ sa8155-adp-star-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb 
sa8155p-adp-star-overlay.dtbo-base := 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

sa8155-adp-star-lxc-overlay.dtbo-base := sa8155.dtb sa8155-v2.dtb

sa8155p-adp-star-lxc-overlay.dtbo-base := sa8155p.dtb sa8155p-v2.dtb

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

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

else
@@ -312,6 +316,9 @@ endif 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y)

	dtbo-$(CONFIG_ARCH_SA6155) += \

		sa6155p-adp-star-lxc-overlay.dtbo \

		sa6155p-v2-adp-star-lxc-overlay.dtbo \

		sa6155p-adp-air-lxc-overlay.dtbo \

		sa6155p-v2-adp-air-lxc-overlay.dtbo

else

	dtbo-$(CONFIG_ARCH_SA6155) += \
@@ -333,6 +340,9 @@ sa6155-adp-air-overlay.dtbo-base := sa6155.dtb 
sa6155p-adp-air-overlay.dtbo-base := sa6155p.dtb

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

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

sa6155p-adp-star-lxc-overlay.dtbo-base := sa6155p.dtb

sa6155p-v2-adp-star-lxc-overlay.dtbo-base := sa6155p.dtb

sa6155p-adp-air-lxc-overlay.dtbo-base := sa6155p.dtb

sa6155p-v2-adp-air-lxc-overlay.dtbo-base := sa6155p.dtb

else

dtb-$(CONFIG_ARCH_SA6155)       += sa6155-adp-star.dtb \
@@ -348,6 +358,7 @@ endif 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

ifeq ($(CONFIG_AUTO_LXC_OVERLAY), y)

	dtbo-$(CONFIG_ARCH_SA8195) += \

		sa8195p-adp-star-lxc-overlay.dtbo \

		sa8195p-v2-adp-air-lxc-overlay.dtbo

else

	dtbo-$(CONFIG_ARCH_SA8195) += \
@@ -357,6 +368,7 @@ endif 


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

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

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

sa8195p-v2-adp-air-lxc-overlay.dtbo-base := sa8195p.dtb

else

dtb-$(CONFIG_ARCH_SA8195)	+= sa8195p-adp-star.dtb \

qcom/sa6155p-adp-air-lxc-overlay.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "sa6155-adp-air.dtsi"

#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SA6155P ADP-AIR";

	compatible = "qcom,sa6155p-adp-air", "qcom,sa6155p", "qcom,adp-air";

	qcom,msm-id = <377 0x0>, <380 0>;

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

};

qcom/sa6155p-adp-star-lxc-overlay.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "sa6155-adp-star.dtsi"

#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi"



/ {

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

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,msm-id = <377 0x0>, <380 0>;

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

};

qcom/sa6155p-v2-adp-star-lxc-overlay.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "sa6155-adp-star.dtsi"

#include "display/sa6155p-v2-adp-air-display-lxc-shd.dtsi"



/ {

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

	compatible = "qcom,sa6155p-adp-star", "qcom,sa6155p", "qcom,adp-star";

	qcom,msm-id = <377 0x0>, <380 0>;

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

};

qcom/sa8155-adp-star-lxc-overlay.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "sa8155-adp-star.dtsi"

#include "display/sa8155-v2-adp-air-display-lxc-shd.dtsi"



/ {

	model = "ADP-STAR";

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

		"qcom,adp-star";

	qcom,board-id = <25 0>;

};