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

This commit is contained in:
qctecmdr 2021-09-06 06:07:41 -07:00 • committed by Gerrit - the friendly Code Review server
commit e3692d9364
15 changed files with 147 additions and 35 deletions

View file

@ -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 \

9
qcom/yupik-hsp.dts Normal file
View file

@ -0,0 +1,9 @@
/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>;
};

26
qcom/yupik-hsp.dtsi Normal file
View file

@ -0,0 +1,26 @@
#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"
};

View file

@ -1,10 +1,11 @@
/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>;

10
qcom/yupik-idp-hsp.dts Normal file
View file

@ -0,0 +1,10 @@
/dts-v1/;
#include "yupik-hsp.dtsi"
#include "yupik-idp-hsp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Yupik IDP + HSP";
compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
qcom,board-id = <34 1>;
};

66
qcom/yupik-idp-hsp.dtsi Normal file
View file

@ -0,0 +1,66 @@
#include "yupik-idp.dtsi"
#include "qcx6490-cnss.dtsi"
&wlan {
qcom,same-dt-multi-dev;
};
&pcie0 {
status = "ok"
};
&pcie0_msi {
status = "ok"
};
&pcie1 {
status = "ok"
qcom,boot-option = <0x0>;
qcom,ep-gpio = <&tlmm 19 0>;
pinctrl-0 = <&pcie1_perst_default
&pcie1_clkreq_default
&pcie1_wake_default
&pcie1_ep_default>;
pinctrl-1 = <&pcie1_perst_default
&pcie1_clkreq_sleep
&pcie1_wake_default
&pcie1_ep_default>;
};
&pcie1_msi {
status = "ok"
};
&pm7325_gpios {
usb2_vbus_boost {
usb2_vbus_boost_default: usb2_vbus_boost_default {
pins = "gpio8";
function = "normal";
output-low;
power-source = <0>; /* 1.8V input supply */
};
};
};
&soc {
usb2_vbus_boost_reg: usb2_vbus_boost_reg {
compatible = "regulator-fixed";
regulator-name = "usb2_vbus_boost_vreg";
startup-delay-us = <4000>;
enable-active-high;
gpios = <&pm7325_gpios 8 0>;
pinctrl-names = "default";
pinctrl-0 = <&usb2_vbus_boost_default>;
};
};
&usb1 {
vbus_dwc3-supply = <&usb2_vbus_boost_reg>;
qcom,default-mode-none;
status = "ok"
};
&usb2_phy1 {
status = "ok"
};

View file

@ -1,10 +0,0 @@
/dts-v1/;
#include "yupik.dtsi"
#include "yupik-idps-digital-mics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. Yupik IDPS + DIGITAL MICS";
compatible = "qcom,yupik-idp", "qcom,yupik", "qcom,idp";
qcom,board-id = <34 1>;
};

View file

@ -1,4 +0,0 @@
#include "yupik-idp.dtsi"
&soc {
};

9
qcom/yupikp-hsp.dts Normal file
View file

@ -0,0 +1,9 @@
/dts-v1/;
#include "yupikp-hsp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. YupikP IDP HSP + SoC";
compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
qcom,board-id = <0 1>;
};

3
qcom/yupikp-hsp.dtsi Normal file
View file

@ -0,0 +1,3 @@
#include "yupikp.dtsi"
/ {
};

View file

@ -1,10 +1,11 @@
/dts-v1/;
/plugin/;
#include "yupikp-idps-digital-mics.dtsi"
#include <dt-bindings/interconnect/qcom,yupik.h>
#include "yupikp-idp-hsp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
model = "Qualcomm Technologies, Inc. YupikP IDP + HSP";
compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
qcom,msm-id = <499 0x10000>;
qcom,board-id = <34 1>;

10
qcom/yupikp-idp-hsp.dts Normal file
View file

@ -0,0 +1,10 @@
/dts-v1/;
#include "yupikp-hsp.dtsi"
#include "yupikp-idp-hsp.dtsi"
/ {
model = "Qualcomm Technologies, Inc. YupikP IDP + HSP";
compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
qcom,board-id = <34 1>;
};

2
qcom/yupikp-idp-hsp.dtsi Normal file
View file

@ -0,0 +1,2 @@
#include "yupik-idp-hsp.dtsi"

View file

@ -1,10 +0,0 @@
/dts-v1/;
#include "yupikp.dtsi"
#include "yupikp-idps-digital-mics.dtsi"
/ {
model = "Qualcomm Technologies, Inc. YupikP IDPS + DIGITAL MICS";
compatible = "qcom,yupikp-idp", "qcom,yupikp", "qcom,idp";
qcom,board-id = <34 1>;
};

View file

@ -1 +0,0 @@
#include "yupik-idps-digital-mics.dtsi"