Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,14 @@
};
};

&pm4125_hs_in {
remote-endpoint = <&usb_1_dwc3_hs>;
};

&pm4125_ss_in {
remote-endpoint = <&usb_qmpphy_out>;
};

&remoteproc_cdsp {
firmware-name = "qcom/shikra/cdsp.mbn";

Expand Down Expand Up @@ -211,6 +219,35 @@
};
};

&usb_1 {
Comment thread
Kriskura176767 marked this conversation as resolved.
dr_mode = "otg";

status = "okay";
};

&usb_1_dwc3_hs {
remote-endpoint = <&pm4125_hs_in>;
};

&usb_1_hsphy {
vdd-supply = <&pm4125_l12>;
vdda-pll-supply = <&pm4125_l13>;
vdda-phy-dpdm-supply = <&pm4125_l21>;

status = "okay";
};

&usb_qmpphy_out {
remote-endpoint = <&pm4125_ss_in>;
};

&usb_qmpphy {
vdda-phy-supply = <&pm4125_l8>;
vdda-pll-supply = <&pm4125_l13>;

status = "okay";
};

&wifi {
vdd-0.8-cx-mx-supply = <&pm4125_l7>;
vdd-1.8-xo-supply = <&pm4125_l13>;
Expand Down
40 changes: 40 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,50 @@
status = "okay";
};

&pm4125_typec {
status = "okay";

connector {
compatible = "usb-c-connector";

power-role = "dual";
data-role = "dual";
self-powered;

typec-power-opmode = "default";
pd-disable;

ports {
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;
pm4125_hs_in: endpoint {
};
};

port@1 {
reg = <1>;
pm4125_ss_in: endpoint {
};
};
};
};
};

&pm4125_tz {
status = "okay";
};

&pm4125_vbus {
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-min-microamp = <500000>;
regulator-max-microamp = <500000>;
status = "okay";
};

&pm8005_regulators {
status = "disabled";
};
Expand Down
37 changes: 37 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@
};
};

&pm4125_hs_in {
remote-endpoint = <&usb_1_dwc3_hs>;
};

&pm4125_ss_in {
remote-endpoint = <&usb_qmpphy_out>;
};

&remoteproc_cdsp {
firmware-name = "qcom/shikra/cdsp.mbn";

Expand Down Expand Up @@ -212,6 +220,35 @@
};
};

&usb_1 {
dr_mode = "otg";

status = "okay";
};

&usb_1_dwc3_hs {
remote-endpoint = <&pm4125_hs_in>;
};

&usb_1_hsphy {
vdd-supply = <&pm4125_l12>;
vdda-pll-supply = <&pm4125_l13>;
vdda-phy-dpdm-supply = <&pm4125_l21>;

status = "okay";
};

&usb_qmpphy_out {
remote-endpoint = <&pm4125_ss_in>;
};

&usb_qmpphy {
vdda-phy-supply = <&pm4125_l8>;
vdda-pll-supply = <&pm4125_l13>;

status = "okay";
};

&wifi {
vdd-0.8-cx-mx-supply = <&pm4125_l7>;
vdd-1.8-xo-supply = <&pm4125_l13>;
Expand Down
21 changes: 21 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,27 @@
};
};

&usb_1 {
dr_mode = "otg";

status = "okay";
};

&usb_1_hsphy {
vdd-supply = <&pm8150_l4>;
vdda-pll-supply = <&pm8150_l12>;
vdda-phy-dpdm-supply = <&pm8150_l13>;

status = "okay";
};

&usb_qmpphy {
vdda-phy-supply = <&pm8150_l6>;
vdda-pll-supply = <&pm8150_l12>;

status = "okay";
};

&wifi {
vdd-0.8-cx-mx-supply = <&pm8150_s4>;
vdd-1.8-xo-supply = <&pm8150_l12>;
Expand Down
139 changes: 139 additions & 0 deletions arch/arm64/boot/dts/qcom/shikra.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1052,6 +1052,70 @@
#power-domain-cells = <1>;
};

usb_1_hsphy: phy@1613000 {
compatible = "qcom,shikra-qusb2-phy";
reg = <0x0 0x01613000 0x0 0x180>;

clocks = <&gcc GCC_AHB2PHY_USB_CLK>,
<&rpmcc RPM_SMD_XO_CLK_SRC>;
clock-names = "cfg_ahb", "ref";

resets = <&gcc GCC_QUSB2PHY_PRIM_BCR>;
nvmem-cells = <&qusb2_hstx_trim_1>;
#phy-cells = <0>;

status = "disabled";
};

usb_qmpphy: phy@1615000 {
compatible = "qcom,shikra-qmp-usb3-phy";
reg = <0x0 0x01615000 0x0 0x1000>;

clocks = <&gcc GCC_AHB2PHY_USB_CLK>,
<&gcc GCC_USB3_PRIM_CLKREF_EN>,
<&gcc GCC_USB3_PRIM_PHY_COM_AUX_CLK>,
<&gcc GCC_USB3_PRIM_PHY_PIPE_CLK>;
clock-names = "cfg_ahb",
"ref",
"com_aux",
"pipe";

resets = <&gcc GCC_USB3_PHY_PRIM_SP0_BCR>,
<&gcc GCC_USB3PHY_PHY_PRIM_SP0_BCR>;
reset-names = "phy",
"phy_phy";

#clock-cells = <0>;
clock-output-names = "usb3_phy_pipe_clk_src";

#phy-cells = <0>;
orientation-switch;

qcom,tcsr-reg = <&tcsr_regs 0xb244>;

status = "disabled";

ports {
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;

usb_qmpphy_out: endpoint {
};
};

port@1 {
reg = <1>;

usb_qmpphy_usb_ss_in: endpoint {
remote-endpoint = <&usb_1_dwc3_ss>;
};
};
};
};

system_noc: interconnect@1880000 {
compatible = "qcom,shikra-sys-noc";
reg = <0x0 0x01880000 0x0 0x6a080>;
Expand Down Expand Up @@ -2199,6 +2263,81 @@
};
};

usb_1: usb@4e00000 {
Comment thread
Komal-Bajaj marked this conversation as resolved.
compatible = "qcom,shikra-dwc3", "qcom,snps-dwc3";
reg = <0x0 0x04e00000 0x0 0xfc100>;

clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
<&gcc GCC_USB30_PRIM_MASTER_CLK>,
<&gcc GCC_SYS_NOC_USB3_PRIM_AXI_CLK>,
<&gcc GCC_USB30_PRIM_SLEEP_CLK>,
<&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
<&gcc GCC_USB3_PRIM_CLKREF_EN>;
clock-names = "cfg_noc",
"core",
"iface",
"sleep",
"mock_utmi",
"xo";

assigned-clocks = <&gcc GCC_USB30_PRIM_MOCK_UTMI_CLK>,
<&gcc GCC_USB30_PRIM_MASTER_CLK>;
assigned-clock-rates = <19200000>, <133333333>;

interrupts-extended = <&intc GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH 0>;
interrupt-names = "dwc_usb3",
"pwr_event",
"qusb2_phy",
"hs_phy_irq",
"ss_phy_irq";

iommus = <&apps_smmu 0x120 0x0>;

phys = <&usb_1_hsphy>, <&usb_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";

power-domains = <&gcc GCC_USB30_PRIM_GDSC>;

resets = <&gcc GCC_USB30_PRIM_BCR>;

snps,dis_u2_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,usb3_lpm_capable;
snps,parkmode-disable-ss-quirk;

usb-role-switch;

wakeup-source;

status = "disabled";

ports {
#address-cells = <1>;
#size-cells = <0>;

port@0 {
reg = <0>;

usb_1_dwc3_hs: endpoint {
};
};

port@1 {
reg = <1>;

usb_1_dwc3_ss: endpoint {
remote-endpoint = <&usb_qmpphy_usb_ss_in>;
};
};
};
};

bam_dmux_dma: dma-controller@6044000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x0 0x06044000 0x0 0x19000>;
Expand Down