Merge tag 'soc-dt-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / qcom / sm6115.dtsi

diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index f9849b8..aca0a87 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -14,6 +14,7 @@
 #include <dt-bindings/interconnect/qcom,sm6115.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/power/qcom-rpmpd.h>
+#include <dt-bindings/thermal/thermal.h>
 
 / {
        interrupt-parent = <&intc>;
@@ -614,6 +615,11 @@
                        #hwlock-cells = <1>;
                };
 
+               tcsr_regs: syscon@3c0000 {
+                       compatible = "qcom,sm6115-tcsr", "syscon";
+                       reg = <0x0 0x003c0000 0x0 0x40000>;
+               };
+
                tlmm: pinctrl@500000 {
                        compatible = "qcom,sm6115-tlmm";
                        reg = <0x0 0x00500000 0x0 0x400000>,
@@ -878,8 +884,31 @@
                        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_dwc3_ss>;
+                                       };
+                               };
+                       };
                };
 
                system_noc: interconnect@1880000 {
@@ -1194,8 +1223,12 @@
                        compatible = "qcom,sm6115-qmp-ufs-phy";
                        reg = <0x0 0x04807000 0x0 0x1000>;
 
-                       clocks = <&gcc GCC_UFS_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-                       clock-names = "ref", "ref_aux";
+                       clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
+                                <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
+                                <&gcc GCC_UFS_CLKREF_CLK>;
+                       clock-names = "ref",
+                                     "ref_aux",
+                                     "qref";
 
                        resets = <&ufs_mem_hc 0>;
                        reset-names = "ufsphy";
@@ -1589,9 +1622,14 @@
                                          <&gcc GCC_USB30_PRIM_MASTER_CLK>;
                        assigned-clock-rates = <19200000>, <66666667>;
 
-                       interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                       interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,
                                     <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>;
-                       interrupt-names = "hs_phy_irq", "ss_phy_irq";
+                       interrupt-names = "pwr_event",
+                                         "qusb2_phy",
+                                         "hs_phy_irq",
+                                         "ss_phy_irq";
 
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
                        power-domains = <&gcc GCC_USB30_PRIM_GDSC>;
@@ -1603,7 +1641,6 @@
                        interconnect-names = "usb-ddr",
                                             "apps-usb";
 
-                       qcom,select-utmi-as-pipe-clk;
                        status = "disabled";
 
                        usb_dwc3: usb@4e00000 {
@@ -1618,6 +1655,28 @@
                                snps,has-lpm-erratum;
                                snps,hird-threshold = /bits/ 8 <0x10>;
                                snps,usb3_lpm_capable;
+
+                               usb-role-switch;
+
+                               ports {
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       port@0 {
+                                               reg = <0>;
+
+                                               usb_dwc3_hs: endpoint {
+                                               };
+                                       };
+
+                                       port@1 {
+                                               reg = <1>;
+
+                                               usb_dwc3_ss: endpoint {
+                                                       remote-endpoint = <&usb_qmpphy_usb_ss_in>;
+                                               };
+                                       };
+                               };
                        };
                };
 
@@ -1649,6 +1708,7 @@
 
                        nvmem-cells = <&gpu_speed_bin>;
                        nvmem-cell-names = "speed_bin";
+                       #cooling-cells = <2>;
 
                        status = "disabled";
 
@@ -3088,7 +3148,7 @@
                                        type = "passive";
                                };
 
-                               cpu4_crit: cpu_crit {
+                               cpu4_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3114,7 +3174,7 @@
                                        type = "passive";
                                };
 
-                               cpu5_crit: cpu_crit {
+                               cpu5_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3140,7 +3200,7 @@
                                        type = "passive";
                                };
 
-                               cpu6_crit: cpu_crit {
+                               cpu6_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3166,7 +3226,7 @@
                                        type = "passive";
                                };
 
-                               cpu7_crit: cpu_crit {
+                               cpu7_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3192,7 +3252,7 @@
                                        type = "passive";
                                };
 
-                               cpu45_crit: cpu_crit {
+                               cpu45_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3218,7 +3278,7 @@
                                        type = "passive";
                                };
 
-                               cpu67_crit: cpu_crit {
+                               cpu67_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3244,7 +3304,7 @@
                                        type = "passive";
                                };
 
-                               cpu0123_crit: cpu_crit {
+                               cpu0123_crit: cpu-crit {
                                        temperature = <110000>;
                                        hysteresis = <1000>;
                                        type = "critical";
@@ -3297,8 +3357,15 @@
                        polling-delay = <0>;
                        thermal-sensors = <&tsens0 15>;
 
+                       cooling-maps {
+                               map0 {
+                                       trip = <&gpu_alert0>;
+                                       cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+                               };
+                       };
+
                        trips {
-                               trip-point0 {
+                               gpu_alert0: trip-point0 {
                                        temperature = <115000>;
                                        hysteresis = <5000>;
                                        type = "passive";
@@ -3307,7 +3374,7 @@
                                trip-point1 {
                                        temperature = <125000>;
                                        hysteresis = <1000>;
-                                       type = "passive";
+                                       type = "critical";
                                };
                        };
                };