diff options
| author | Linaro CI <ci_notify@linaro.org> | 2021-06-07 07:50:28 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2021-06-07 07:50:28 +0000 |
| commit | 7923943d67a81890834aafa156329bca9083942d (patch) | |
| tree | 3d6d34ee866a71584a698538c90db4f158de3af7 | |
| parent | 6932eb9fd11e1ba232437a3b4767274ad1a65f64 (diff) | |
| parent | 0bdb5bb7006973cf5a99c8b8bda5a78a7c0caa41 (diff) | |
Merge remote-tracking branch 'sm8350-dts/tracking-qcomlt-sm8350-dts' into integration-linux-qcomltintegration-linux-qcomlt-20210607-092837-v5.13-rc5-246-g7923943d67a81
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/qcom/sm8350.dtsi | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts index 6ca638b4e321..ef10bd257eee 100644 --- a/arch/arm64/boot/dts/qcom/sm8350-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8350-mtp.dts @@ -328,7 +328,7 @@ }; &usb_1_dwc3 { - dr_mode = "peripheral"; + dr_mode = "host"; }; &usb_1_hsphy { diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi index ed0b51bc03ea..d015a9ca95a5 100644 --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi @@ -6,6 +6,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/clock/qcom,gcc-sm8350.h> #include <dt-bindings/clock/qcom,rpmh.h> +#include <dt-bindings/interconnect/qcom,sm8350.h> #include <dt-bindings/mailbox/qcom-ipcc.h> #include <dt-bindings/power/qcom-aoss-qmp.h> #include <dt-bindings/power/qcom-rpmpd.h> @@ -656,7 +657,7 @@ <&rpmhpd 12>; power-domain-names = "load_state", "cx", "mss"; - interconnects = <&mc_virt 0 &mc_virt 1>; + interconnects = <&mc_virt MASTER_LLCC &mc_virt SLAVE_EBI1>; memory-region = <&pil_modem_mem>; @@ -689,7 +690,7 @@ interrupt-controller; }; - tsens0: thermal-sensor@c222000 { + tsens0: thermal-sensor@c263000 { compatible = "qcom,sm8350-tsens", "qcom,tsens-v2"; reg = <0 0x0c263000 0 0x1ff>, /* TM */ <0 0x0c222000 0 0x8>; /* SROT */ @@ -700,7 +701,7 @@ #thermal-sensor-cells = <1>; }; - tsens1: thermal-sensor@c223000 { + tsens1: thermal-sensor@c265000 { compatible = "qcom,sm8350-tsens", "qcom,tsens-v2"; reg = <0 0x0c265000 0 0x1ff>, /* TM */ <0 0x0c223000 0 0x8>; /* SROT */ @@ -1063,7 +1064,7 @@ <&rpmhpd 10>; power-domain-names = "load_state", "cx", "mxc"; - interconnects = <&compute_noc 1 &mc_virt 1>; + interconnects = <&compute_noc MASTER_CDSP_PROC &mc_virt SLAVE_EBI1>; memory-region = <&pil_cdsp_mem>; @@ -1176,7 +1177,7 @@ }; }; - dc_noc: interconnect@90e0000 { + dc_noc: interconnect@90c0000 { compatible = "qcom,sm8350-dc-noc"; reg = <0 0x090c0000 0 0x4200>; #interconnect-cells = <1>; |