Skip to content
Open
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
12 changes: 4 additions & 8 deletions arch/arm64/boot/dts/qcom/qcs615-ride.dts
Original file line number Diff line number Diff line change
Expand Up @@ -670,11 +670,9 @@
};

&usb_1 {
status = "okay";
};

&usb_1_dwc3 {
dr_mode = "peripheral";

status = "okay";
};

&usb_hsphy_2 {
Expand All @@ -686,11 +684,9 @@
};

&usb_2 {
status = "okay";
};

&usb_2_dwc3 {
dr_mode = "host";

status = "okay";
};

&ufs_mem_hc {
Expand Down
12 changes: 4 additions & 8 deletions arch/arm64/boot/dts/qcom/talos-evk-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,9 @@
};

&usb_1 {
status = "okay";
};

&usb_1_dwc3 {
dr_mode = "host";

status = "okay";
};

&usb_hsphy_1 {
Expand All @@ -565,11 +563,9 @@
};

&usb_2 {
status = "okay";
};

&usb_2_dwc3 {
dr_mode = "host";

status = "okay";
};

&usb_hsphy_2 {
Expand Down
87 changes: 40 additions & 47 deletions arch/arm64/boot/dts/qcom/talos.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -4935,9 +4935,9 @@
status = "disabled";
};

usb_1: usb@a6f8800 {
compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
reg = <0x0 0x0a6f8800 0x0 0x400>;
usb_1: usb@a600000 {
compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
reg = <0x0 0x0a600000 0x0 0xfc100>;

clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
<&gcc GCC_USB30_PRIM_MASTER_CLK>,
Expand All @@ -4956,52 +4956,49 @@
<&gcc GCC_USB30_PRIM_MASTER_CLK>;
assigned-clock-rates = <19200000>, <200000000>;

interrupts-extended = <&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
interrupts-extended = <&intc GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>,
<&pdc 9 IRQ_TYPE_EDGE_BOTH>,
<&pdc 8 IRQ_TYPE_EDGE_BOTH>,
<&pdc 6 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "pwr_event",
interrupt-names = "dwc_usb3",
"pwr_event",
"hs_phy_irq",
"dp_hs_phy_irq",
"dm_hs_phy_irq",
"ss_phy_irq";

iommus = <&apps_smmu 0x140 0x0>;
power-domains = <&gcc USB30_PRIM_GDSC>;
required-opps = <&rpmhpd_opp_nom>;

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

resets = <&gcc GCC_USB30_PRIM_BCR>;

#address-cells = <2>;
#size-cells = <2>;
ranges;

status = "disabled";

usb_1_dwc3: usb@a600000 {
compatible = "snps,dwc3";
reg = <0x0 0x0a600000 0x0 0xcd00>;

iommus = <&apps_smmu 0x140 0x0>;
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH 0>;
snps,dis-u1-entry-quirk;
snps,dis-u2-entry-quirk;
snps,dis_u2_susphy_quirk;
snps,dis_u3_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,usb3_lpm_capable;

phys = <&usb_hsphy_1>, <&usb_qmpphy>;
phy-names = "usb2-phy", "usb3-phy";
wakeup-source;

snps,dis-u1-entry-quirk;
snps,dis-u2-entry-quirk;
snps,dis_u2_susphy_quirk;
snps,dis_u3_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
snps,usb3_lpm_capable;
};
status = "disabled";
};

usb_2: usb@a8f8800 {
compatible = "qcom,qcs615-dwc3", "qcom,dwc3";
reg = <0x0 0x0a8f8800 0x0 0x400>;
usb_2: usb@a800000 {
compatible = "qcom,qcs615-dwc3", "qcom,snps-dwc3";
reg = <0x0 0x0a800000 0x0 0xfc100>;

clocks = <&gcc GCC_CFG_NOC_USB2_SEC_AXI_CLK>,
<&gcc GCC_USB20_SEC_MASTER_CLK>,
Expand All @@ -5020,18 +5017,24 @@
<&gcc GCC_USB20_SEC_MASTER_CLK>;
assigned-clock-rates = <19200000>, <200000000>;

interrupts-extended = <&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
interrupts-extended = <&intc GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 663 IRQ_TYPE_LEVEL_HIGH 0>,
<&intc GIC_SPI 662 IRQ_TYPE_LEVEL_HIGH 0>,
<&pdc 11 IRQ_TYPE_EDGE_BOTH>,
<&pdc 10 IRQ_TYPE_EDGE_BOTH>;
interrupt-names = "pwr_event",
interrupt-names = "dwc_usb3",
"pwr_event",
"hs_phy_irq",
"dp_hs_phy_irq",
"dm_hs_phy_irq";

iommus = <&apps_smmu 0xe0 0x0>;
power-domains = <&gcc USB20_SEC_GDSC>;
required-opps = <&rpmhpd_opp_nom>;

phys = <&usb_hsphy_2>;
phy-names = "usb2-phy";

resets = <&gcc GCC_USB20_SEC_BCR>;

qcom,select-utmi-as-pipe-clk;
Expand All @@ -5040,26 +5043,16 @@
#size-cells = <2>;
ranges;

status = "disabled";

usb_2_dwc3: usb@a800000 {
compatible = "snps,dwc3";
reg = <0x0 0x0a800000 0x0 0xcd00>;

iommus = <&apps_smmu 0xe0 0x0>;
interrupts = <GIC_SPI 664 IRQ_TYPE_LEVEL_HIGH 0>;
snps,dis_u2_susphy_quirk;
snps,dis_u3_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;
maximum-speed = "high-speed";

phys = <&usb_hsphy_2>;
phy-names = "usb2-phy";
wakeup-source;

snps,dis_u2_susphy_quirk;
snps,dis_u3_susphy_quirk;
snps,dis_enblslpm_quirk;
snps,has-lpm-erratum;
snps,hird-threshold = /bits/ 8 <0x10>;

maximum-speed = "high-speed";
};
status = "disabled";
};

tsens0: thermal-sensor@c263000 {
Expand Down