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

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

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

parents 6916d9cb fd39fc40

bindings/arm/msm/msm.txt

+6 −0
Original line number Diff line number Diff line
@@ -239,6 +239,12 @@ compatible = "qcom,sm6150-mtp" 
compatible = "qcom,sm6150-cdp"

compatible = "qcom,sm6150-qrd"

compatible = "qcom,sm6150-idp"

compatible = "qcom,sm6150p"

compatible = "qcom,sa6155-adp-star"

compatible = "qcom,sa6155p-adp-star"

compatible = "qcom,sa6155p"

compatible = "qcom,sa6155-adp-air"

compatible = "qcom,sa6155p-adp-air"

compatible = "qcom,qcs405-rumi"

compatible = "qcom,qcs405-iot"

compatible = "qcom,qcs403-iot"

bindings/clock/qcom,rpmh-clk.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Required properties : 
		"qcom,kona-rpmh-clk",

		"qcom,sdm845-rpmh-clk"

		"qcom,sm8150-rpmh-clk"

		"qcom,sm6150-rpmh-clk"

		"qcom,sdxlemur-rpmh-clk"

		"qcom,yupik-rpmh-clk"

qcom/Makefile

+30 −0
Original line number Diff line number Diff line
@@ -184,6 +184,36 @@ dtb-$(CONFIG_ARCH_SA8155) += sa8155-adp-star.dtb \ 
	sa8155p-v2-adp-air.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_SA6155) += \

		sa6155-adp-star-overlay.dtbo \

		sa6155p-adp-star-overlay.dtbo \

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

		sa6155-adp-air-overlay.dtbo \

		sa6155p-adp-air-overlay.dtbo \

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

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

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



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

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

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

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

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

else

dtb-$(CONFIG_ARCH_SA6155)       += sa6155-adp-star.dtb \

	sa6155p-adp-star.dtb \

	sa6155p-adp-star-lpass.dtb \

	sa6155-adp-air.dtb \

	sa6155p-adp-air.dtb \

	sa6155p-v2-adp-star.dtb \

	sa6155p-v2-adp-air.dtb \

	sa6155p-v2-adp-air-lpass.dtb

endif



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

	dtbo-$(CONFIG_ARCH_SA8195) += \

		sa8195p-adp-star-overlay.dtbo \

qcom/sa6155-adp-air-overlay.dts

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

/plugin/;



#include "sa6155-adp-air.dtsi"



/ {

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

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

	qcom,msm-id = <384 0x0>;

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

};

qcom/sa6155-adp-air.dts

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



#include "sa6155.dtsi"

#include "sa6155-adp-air.dtsi"



/ {

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

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

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

};