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

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

Merge "ARM: dts: msm: Add CNSS DT Node for HSP support"

parents 2a6f0a62 726ff832

qcom/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -204,14 +204,14 @@ dtbo-$(CONFIG_ARCH_YUPIK) += \ 
	yupik-idp-overlay.dtbo \

	yupik-atp-overlay.dtbo \

	yupik-qrd-overlay.dtbo \

	yupik-idps-digital-mics-overlay.dtbo \

	yupik-idps-amoled-overlay.dtbo \

	yupik-idp-pm7250b-overlay.dtbo \

	yupik-idp-hsp-overlay.dtbo \

	yupikp-idp-overlay.dtbo \

	yupikp-atp-overlay.dtbo \

	yupikp-qrd-overlay.dtbo \

	yupikp-idps-digital-mics-overlay.dtbo \

	yupikp-idps-amoled-overlay.dtbo \

	yupikp-idp-hsp-overlay.dtbo \

	yupik-iot-idp-overlay.dtbo \

	yupik-iot-qrd-overlay.dtbo \

	yupik-iot-hsp-overlay.dtbo \
@@ -226,14 +226,14 @@ yupik-rumi-overlay.dtbo-base := yupik.dtb 
yupik-idp-overlay.dtbo-base := yupik.dtb

yupik-atp-overlay.dtbo-base := yupik.dtb

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

yupik-idps-digital-mics-overlay.dtbo-base := yupik.dtb

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

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

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

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

yupikp-atp-overlay.dtbo-base := yupikp.dtb

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

yupikp-idps-digital-mics-overlay.dtbo-base := yupikp.dtb

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

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

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

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

yupik-iot-hsp-overlay.dtbo-base := yupik-iot.dtb
@@ -247,14 +247,14 @@ dtb-$(CONFIG_ARCH_YUPIK) += yupik-rumi.dtb \ 
	yupik-idp.dtb \

	yupik-atp.dtb \

	yupik-qrd.dtb \

	yupik-idps-digital-mics.dtb \

	yupik-idps-amoled.dtb \

	yupik-idp-pm7250b.dtb \

	yupik-idp-hsp.dtb \

	yupikp-idp.dtb \

	yupikp-atp.dtb \

	yupikp-qrd.dtb \

	yupikp-idps-digital-mics.dtb \

	yupikp-idps-amoled.dtb \

	yupikp-idp-hsp.dtb \

	yupik-iot-idp.dtb \

	yupik-iot-qrd.dtb \

	yupik-iot-hsp.dtb \

qcom/yupik-hsp.dts

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



#include "yupik-hsp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Yupik IDP HSP + SoC";

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

	qcom,board-id = <0 1>;

};

qcom/yupik-hsp.dtsi

0 → 100644
+26 −0
Original line number Diff line number Diff line 
#include "yupik.dtsi"

/ {

};



&gcc {

	clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>,

		<&usb3_phy_wrapper_gcc_usb30_pipe_clk>,

		<&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>;

	clock-names = "bi_tcxo", "sleep_clk",

		"usb3_phy_wrapper_gcc_usb30_pipe_clk",

		"pcie_0_pipe_clk", "pcie_1_pipe_clk";



	/delete-property/ protected-clocks;

};



&gcc_pcie_0_gdsc {

	status = "ok";

};



&gcc_pcie_1_gdsc {

	status = "ok";

};



&gcc_usb30_sec_gdsc {

	status = "ok";

};

qcom/yupik-idps-digital-mics-overlay.dts→qcom/yupik-idp-hsp-overlay.dts

+3 −2
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include "yupik-idps-digital-mics.dtsi"

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

#include "yupik-idp-hsp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";

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

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

	qcom,msm-id = <475 0x10000>, <515 0x10000>;

	qcom,board-id = <34 1>;

qcom/yupik-idps-digital-mics.dts→qcom/yupik-idp-hsp.dts

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



#include "yupik.dtsi"

#include "yupik-idps-digital-mics.dtsi"

#include "yupik-hsp.dtsi"

#include "yupik-idp-hsp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";

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

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

	qcom,board-id = <34 1>;

};