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

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

Merge "ARM: dts: msm: Disable PCIe1 nodes for katmai fp1 variant"

parents 4272face f0aaeb70

qcom/Makefile

+13 −5
Original line number Diff line number Diff line
@@ -237,13 +237,17 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ 
	yupik-iot-idp-pm7250b-overlay.dtbo \

	yupik-iot-qrd-overlay.dtbo \

	yupik-iot-hsp-overlay.dtbo \

	katmai-hsp-overlay.dtbo \

	yupik-iot-hsp-pm7250b-overlay.dtbo \

	katmai-hsp-pm7250b-overlay.dtbo \

	yupik-iot-idps-amoled-overlay.dtbo \

	yupikp-iot-idp-overlay.dtbo \

	yupikp-iot-idp-pm7250b-overlay.dtbo \

	yupikp-iot-qrd-overlay.dtbo \

	yupikp-iot-hsp-overlay.dtbo \

	katmaip-hsp-overlay.dtbo \

	yupikp-iot-hsp-pm7250b-overlay.dtbo \

	katmaip-hsp-pm7250b-overlay.dtbo \

	yupikp-iot-idps-amoled-overlay.dtbo
@@ -262,14 +266,18 @@ yupikp-idp-hsp-overlay.dtbo-base := yupikp-hsp.dtb 
yupik-iot-idp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-idp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-qrd-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-idps-amoled-overlay.dtbo-base := yupik-iot.dtb katmai.dtb

yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb

katmai-hsp-overlay.dtbo-base :=  katmai.dtb

yupik-iot-hsp-pm7250b-overlay.dtbo-base := yupik-iot.dtb

katmai-hsp-pm7250b-overlay.dtbo-base :=  katmai.dtb

yupik-iot-idps-amoled-overlay.dtbo-base := katmai.dtb

yupikp-iot-idp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

yupikp-iot-idp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

yupikp-iot-qrd-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

yupikp-iot-hsp-overlay.dtbo-base := yupikp-iot.dtb

katmaip-hsp-overlay.dtbo-base := katmaip.dtb

yupikp-iot-hsp-pm7250b-overlay.dtbo-base := yupikp-iot.dtb

katmaip-hsp-pm7250b-overlay.dtbo-base := katmaip.dtb

yupikp-iot-idps-amoled-overlay.dtbo-base := yupikp-iot.dtb katmaip.dtb

else

dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \

qcom/katmai-hsp-overlay.dts

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

/plugin/;



#include <dt-bindings/interconnect/qcom,yupik.h>

#include "katmai-hsp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Yupik IoT HSP";

	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";

	qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>;

	qcom,board-id = <34 1>;

};

qcom/katmai-hsp-pm7250b-overlay.dts

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

/plugin/;



#include "katmai-hsp-pm7250b.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Yupik IOT HSP + PM7250B";

	compatible = "qcom,yupik-iot-idp", "qcom,yupik-iot", "qcom,idp";

	qcom,msm-id = <497 0x10000>, <575 0x10000>, <576 0x10000>;

	qcom,board-id = <34 1>;

};

qcom/katmai-hsp-pm7250b.dtsi

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#include "yupik-iot-hsp-pm7250b.dtsi"



&pcie1 {

	status = "disabled";

};



&pcie1_msi {

	status = "disabled";

};

qcom/katmai-hsp.dtsi

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#include "yupik-iot-hsp.dtsi"



&pcie1 {

	status = "disabled";

};



&pcie1_msi {

	status = "disabled";

};