Merge tag 'v5.14-rc3' into arm64-for-5.15
authorBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Mon, 16 Aug 2021 23:02:26 +0000 (18:02 -0500)
The USB maintainer felt the strong need to push '1f958f3dff42
("Revert "arm64: dts: qcom: Harmonize DWC USB3 DT nodes name"")'
through the usb tree, so merge v5.14-rc3 to resolve the resulting merge
conflicts.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
1  2 
arch/arm64/boot/dts/qcom/ipq8074.dtsi
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/msm8998.dtsi
arch/arm64/boot/dts/qcom/sc7180.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/qcom/sm8150.dtsi

                method = "smc";
        };
  
 +      firmware {
 +              scm {
 +                      compatible = "qcom,scm-ipq8074", "qcom,scm";
 +              };
 +      };
 +
        soc: soc {
                #address-cells = <0x1>;
                #size-cells = <0x1>;
                        status = "disabled";
                };
  
 +              prng: rng@e3000 {
 +                      compatible = "qcom,prng-ee";
 +                      reg = <0x000e3000 0x1000>;
 +                      clocks = <&gcc GCC_PRNG_AHB_CLK>;
 +                      clock-names = "core";
 +                      status = "disabled";
 +              };
 +
 +              cryptobam: dma@704000 {
 +                      compatible = "qcom,bam-v1.7.0";
 +                      reg = <0x00704000 0x20000>;
 +                      interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
 +                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>;
 +                      clock-names = "bam_clk";
 +                      #dma-cells = <1>;
 +                      qcom,ee = <1>;
 +                      qcom,controlled-remotely = <1>;
 +                      status = "disabled";
 +              };
 +
 +              crypto: crypto@73a000 {
 +                      compatible = "qcom,crypto-v5.1";
 +                      reg = <0x0073a000 0x6000>;
 +                      clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
 +                               <&gcc GCC_CRYPTO_AXI_CLK>,
 +                               <&gcc GCC_CRYPTO_CLK>;
 +                      clock-names = "iface", "bus", "core";
 +                      dmas = <&cryptobam 2>, <&cryptobam 3>;
 +                      dma-names = "rx", "tx";
 +                      status = "disabled";
 +              };
 +
                tlmm: pinctrl@1000000 {
                        compatible = "qcom,ipq8074-pinctrl";
                        reg = <0x01000000 0x300000>;
                        resets = <&gcc GCC_USB0_BCR>;
                        status = "disabled";
  
-                       dwc_0: usb@8a00000 {
+                       dwc_0: dwc3@8a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x8a00000 0xcd00>;
                                interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
                        resets = <&gcc GCC_USB1_BCR>;
                        status = "disabled";
  
-                       dwc_1: usb@8c00000 {
+                       dwc_1: dwc3@8c00000 {
                                compatible = "snps,dwc3";
                                reg = <0x8c00000 0xcd00>;
                                interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
  
                pcie1: pci@10000000 {
                        compatible = "qcom,pcie-ipq8074";
 -                      reg =  <0x10000000 0xf1d
 -                              0x10000f20 0xa8
 -                              0x00088000 0x2000
 -                              0x10100000 0x1000>;
 +                      reg =  <0x10000000 0xf1d>,
 +                             <0x10000f20 0xa8>,
 +                             <0x00088000 0x2000>,
 +                             <0x10100000 0x1000>;
                        reg-names = "dbi", "elbi", "parf", "config";
                        device_type = "pci";
                        linux,pci-domain = <1>;
  
                pcie0: pci@20000000 {
                        compatible = "qcom,pcie-ipq8074";
 -                      reg =  <0x20000000 0xf1d
 -                              0x20000f20 0xa8
 -                              0x00080000 0x2000
 -                              0x20100000 0x1000>;
 +                      reg = <0x20000000 0xf1d>,
 +                            <0x20000f20 0xa8>,
 +                            <0x00080000 0x2000>,
 +                            <0x20100000 0x1000>;
                        reg-names = "dbi", "elbi", "parf", "config";
                        device_type = "pci";
                        linux,pci-domain = <0>;
        chosen { };
  
        clocks {
 -              xo_board: xo_board {
 +              xo_board: xo-board {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <19200000>;
                        clock-output-names = "xo_board";
                };
  
 -              sleep_clk: sleep_clk {
 +              sleep_clk: sleep-clk {
                        compatible = "fixed-clock";
                        #clock-cells = <0>;
                        clock-frequency = <32764>;
                #hwlock-cells = <1>;
        };
  
 -      memory {
 +      memory@80000000 {
                device_type = "memory";
                /* We expect the bootloader to fill in the reg */
 -              reg = <0 0 0 0>;
 +              reg = <0x0 0x80000000 0x0 0x0>;
        };
  
        psci {
                                phy-names = "hdmi_phy";
                                #sound-dai-cells = <1>;
  
 +                              status = "disabled";
 +
                                ports {
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                         <&gcc GCC_HDMI_CLKREF_CLK>;
                                clock-names = "iface",
                                              "ref";
 +
 +                              status = "disabled";
                        };
                };
  
  
                        status = "disabled";
  
 +                      #cooling-cells = <2>;
 +
                        gpu_opp_table: opp-table {
                                compatible  ="operating-points-v2";
  
  
                        camera0_state_on:
                        camera_rear_default: camera-rear-default {
 -                              mclk0 {
 +                              camera0_mclk: mclk0 {
                                        pins = "gpio13";
                                        function = "cam_mclk";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
  
 -                              rst {
 +                              camera0_rst: rst {
                                        pins = "gpio25";
                                        function = "gpio";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
  
 -                              pwdn {
 +                              camera0_pwdn: pwdn {
                                        pins = "gpio26";
                                        function = "gpio";
                                        drive-strength = <16>;
  
                        camera2_state_on:
                        camera_front_default: camera-front-default {
 -                              mclk2 {
 +                              camera2_mclk: mclk2 {
                                        pins = "gpio15";
                                        function = "cam_mclk";
                                        drive-strength = <16>;
                                        bias-disable;
                                };
  
 -                              rst {
 +                              camera2_rst: rst {
                                        pins = "gpio23";
                                        function = "gpio";
                                        drive-strength = <16>;
                        power-domains = <&gcc USB30_GDSC>;
                        status = "disabled";
  
-                       usb3_dwc3: usb@6a00000 {
 -                      dwc3@6a00000 {
++                      usb3_dwc3: dwc3@6a00000 {
                                compatible = "snps,dwc3";
                                reg = <0x06a00000 0xcc00>;
                                interrupts = <0 131 IRQ_TYPE_LEVEL_HIGH>;
                        qcom,select-utmi-as-pipe-clk;
                        status = "disabled";
  
-                       usb@7600000 {
+                       dwc3@7600000 {
                                compatible = "snps,dwc3";
                                reg = <0x07600000 0xcc00>;
                                interrupts = <0 138 IRQ_TYPE_LEVEL_HIGH>;
                                gpu1_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
 -                                      type = "hot";
 +                                      type = "passive";
 +                              };
 +                      };
 +
 +                      cooling-maps {
 +                              map0 {
 +                                      trip = <&gpu1_alert0>;
 +                                      cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                                };
                        };
                };
                                gpu2_alert0: trip-point0 {
                                        temperature = <90000>;
                                        hysteresis = <2000>;
 -                                      type = "hot";
 +                                      type = "passive";
 +                              };
 +                      };
 +
 +                      cooling-maps {
 +                              map0 {
 +                                      trip = <&gpu2_alert0>;
 +                                      cooling-device = <&gpu THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
                                };
                        };
                };
  
        chosen { };
  
 -      memory {
 +      memory@80000000 {
                device_type = "memory";
                /* We expect the bootloader to fill in the reg */
 -              reg = <0 0 0 0>;
 +              reg = <0x0 0x80000000 0x0 0x0>;
        };
  
        reserved-memory {
  
                        resets = <&gcc GCC_USB_30_BCR>;
  
-                       usb3_dwc3: usb@a800000 {
+                       usb3_dwc3: dwc3@a800000 {
                                compatible = "snps,dwc3";
                                reg = <0x0a800000 0xcd00>;
                                interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;
                        no-map;
                };
  
 +              ipa_fw_mem: memory@8b700000 {
 +                      reg = <0 0x8b700000 0 0x10000>;
 +                      no-map;
 +              };
 +
                rmtfs_mem: memory@94600000 {
                        compatible = "qcom,rmtfs-mem";
                        reg = <0x0 0x94600000 0x0 0x200000>;
  
                qfprom: efuse@784000 {
                        compatible = "qcom,sc7180-qfprom", "qcom,qfprom";
 -                      reg = <0 0x00784000 0 0x8ff>,
 +                      reg = <0 0x00784000 0 0x7a0>,
                              <0 0x00780000 0 0x7a0>,
                              <0 0x00782000 0 0x100>,
                              <0 0x00786000 0 0x1fff>;
                                        <&gem_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
  
-                       usb_1_dwc3: usb@a600000 {
+                       usb_1_dwc3: dwc3@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xe000>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
                                                        remote-endpoint = <&dsi0_in>;
                                                };
                                        };
 +
 +                                      port@2 {
 +                                              reg = <2>;
 +                                              dpu_intf0_out: endpoint {
 +                                                      remote-endpoint = <&dp_in>;
 +                                              };
 +                                      };
                                };
  
                                mdp_opp_table: mdp-opp-table {
                                              "iface",
                                              "bus";
  
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
 +                              assigned-clock-parents = <&dsi_phy 0>, <&dsi_phy 1>;
 +
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SC7180_CX>;
  
  
                                status = "disabled";
                        };
 +
 +                      mdss_dp: displayport-controller@ae90000 {
 +                              compatible = "qcom,sc7180-dp";
 +                              status = "disabled";
 +
 +                              reg = <0 0x0ae90000 0 0x1400>;
 +
 +                              interrupt-parent = <&mdss>;
 +                              interrupts = <12>;
 +
 +                              clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DP_AUX_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DP_LINK_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DP_LINK_INTF_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK>;
 +                              clock-names = "core_iface", "core_aux", "ctrl_link",
 +                                            "ctrl_link_iface", "stream_pixel";
 +                              #clock-cells = <1>;
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_DP_LINK_CLK_SRC>,
 +                                                <&dispcc DISP_CC_MDSS_DP_PIXEL_CLK_SRC>;
 +                              assigned-clock-parents = <&dp_phy 0>, <&dp_phy 1>;
 +                              phys = <&dp_phy>;
 +                              phy-names = "dp";
 +
 +                              operating-points-v2 = <&dp_opp_table>;
 +                              power-domains = <&rpmhpd SC7180_CX>;
 +
 +                              #sound-dai-cells = <0>;
 +
 +                              ports {
 +                                      #address-cells = <1>;
 +                                      #size-cells = <0>;
 +                                      port@0 {
 +                                              reg = <0>;
 +                                              dp_in: endpoint {
 +                                                      remote-endpoint = <&dpu_intf0_out>;
 +                                              };
 +                                      };
 +
 +                                      port@1 {
 +                                              reg = <1>;
 +                                              dp_out: endpoint { };
 +                                      };
 +                              };
 +
 +                              dp_opp_table: opp-table {
 +                                      compatible = "operating-points-v2";
 +
 +                                      opp-160000000 {
 +                                              opp-hz = /bits/ 64 <160000000>;
 +                                              required-opps = <&rpmhpd_opp_low_svs>;
 +                                      };
 +
 +                                      opp-270000000 {
 +                                              opp-hz = /bits/ 64 <270000000>;
 +                                              required-opps = <&rpmhpd_opp_svs>;
 +                                      };
 +
 +                                      opp-540000000 {
 +                                              opp-hz = /bits/ 64 <540000000>;
 +                                              required-opps = <&rpmhpd_opp_svs_l1>;
 +                                      };
 +
 +                                      opp-810000000 {
 +                                              opp-hz = /bits/ 64 <810000000>;
 +                                              required-opps = <&rpmhpd_opp_nom>;
 +                                      };
 +                              };
 +                      };
                };
  
                dispcc: clock-controller@af00000 {
                        #power-domain-cells = <1>;
                };
  
 -              lpass_cpu: lpass@62f00000 {
 +              lpass_cpu: lpass@62d87000 {
                        compatible = "qcom,sc7180-lpass-cpu";
  
 -                      reg = <0 0x62f00000 0 0x29000>;
 -                      reg-names = "lpass-lpaif";
 +                      reg = <0 0x62d87000 0 0x68000>, <0 0x62f00000 0 0x29000>;
 +                      reg-names =  "lpass-hdmiif", "lpass-lpaif";
  
                        iommus = <&apps_smmu 0x1020 0>,
 -                              <&apps_smmu 0x1021 0>;
 +                              <&apps_smmu 0x1021 0>,
 +                              <&apps_smmu 0x1032 0>;
  
                        power-domains = <&lpass_hm LPASS_CORE_HM_GDSCR>;
  
 +                      status = "disabled";
 +
                        clocks = <&gcc GCC_LPASS_CFG_NOC_SWAY_CLK>,
                                 <&lpasscc LPASS_AUDIO_CORE_CORE_CLK>,
                                 <&lpasscc LPASS_AUDIO_CORE_EXT_MCLK0_CLK>,
                        #address-cells = <1>;
                        #size-cells = <0>;
  
 -                      interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;
 -                      interrupt-names = "lpass-irq-lpaif";
 +                      interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
 +                                      <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
 +                      interrupt-names = "lpass-irq-lpaif", "lpass-irq-hdmi";
                };
  
                lpass_hm: clock-controller@63000000 {
                        no-map;
                };
  
 -              ipa_fw_mem: memory@8c400000 {
 -                      reg = <0 0x8c400000 0 0x10000>;
 +              wlan_msa_mem: memory@8c400000 {
 +                      reg = <0 0x8c400000 0 0x100000>;
                        no-map;
                };
  
 -              ipa_gsi_mem: memory@8c410000 {
 -                      reg = <0 0x8c410000 0 0x5000>;
 +              gpu_mem: memory@8c515000 {
 +                      reg = <0 0x8c515000 0 0x2000>;
                        no-map;
                };
  
 -              gpu_mem: memory@8c415000 {
 -                      reg = <0 0x8c415000 0 0x2000>;
 +              ipa_fw_mem: memory@8c517000 {
 +                      reg = <0 0x8c517000 0 0x5a000>;
                        no-map;
                };
  
 -              adsp_mem: memory@8c500000 {
 -                      reg = <0 0x8c500000 0 0x1a00000>;
 -                      no-map;
 -              };
 -
 -              wlan_msa_mem: memory@8df00000 {
 -                      reg = <0 0x8df00000 0 0x100000>;
 +              adsp_mem: memory@8c600000 {
 +                      reg = <0 0x8c600000 0 0x1a00000>;
                        no-map;
                };
  
                                        <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_0 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
  
-                       usb_1_dwc3: usb@a600000 {
+                       usb_1_dwc3: dwc3@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xcd00>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
                                        <&gladiator_noc MASTER_APPSS_PROC 0 &config_noc SLAVE_USB3_1 0>;
                        interconnect-names = "usb-ddr", "apps-usb";
  
-                       usb_2_dwc3: usb@a800000 {
+                       usb_2_dwc3: dwc3@a800000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a800000 0 0xcd00>;
                                interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
                        power-domains = <&dispcc MDSS_GDSC>;
  
                        clocks = <&gcc GCC_DISP_AHB_CLK>,
 -                               <&gcc GCC_DISP_AXI_CLK>,
                                 <&dispcc DISP_CC_MDSS_MDP_CLK>;
 -                      clock-names = "iface", "bus", "core";
 +                      clock-names = "iface", "core";
  
                        assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>;
                        assigned-clock-rates = <300000000>;
                                      <0 0x0aeb0000 0 0x2008>;
                                reg-names = "mdp", "vbif";
  
 -                              clocks = <&dispcc DISP_CC_MDSS_AHB_CLK>,
 +                              clocks = <&gcc GCC_DISP_AXI_CLK>,
 +                                       <&dispcc DISP_CC_MDSS_AHB_CLK>,
                                         <&dispcc DISP_CC_MDSS_AXI_CLK>,
                                         <&dispcc DISP_CC_MDSS_MDP_CLK>,
                                         <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
 -                              clock-names = "iface", "bus", "core", "vsync";
 +                              clock-names = "gcc-bus", "iface", "bus", "core", "vsync";
  
                                assigned-clocks = <&dispcc DISP_CC_MDSS_MDP_CLK>,
                                                  <&dispcc DISP_CC_MDSS_VSYNC_CLK>;
                                              "core",
                                              "iface",
                                              "bus";
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK0_CLK_SRC>;
 +                              assigned-clock-parents = <&dsi0_phy 0>, <&dsi0_phy 1>;
 +
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;
  
                                              "core",
                                              "iface",
                                              "bus";
 +                              assigned-clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_PCLK1_CLK_SRC>;
 +                              assigned-clock-parents = <&dsi1_phy 0>, <&dsi1_phy 1>;
 +
                                operating-points-v2 = <&dsi_opp_table>;
                                power-domains = <&rpmhpd SDM845_CX>;
  
@@@ -13,7 -13,6 +13,7 @@@
  #include <dt-bindings/clock/qcom,gcc-sm8150.h>
  #include <dt-bindings/clock/qcom,gpucc-sm8150.h>
  #include <dt-bindings/interconnect/qcom,osm-l3.h>
 +#include <dt-bindings/interconnect/qcom,sm8150.h>
  #include <dt-bindings/thermal/thermal.h>
  
  / {
@@@ -53,9 -52,6 +53,9 @@@
                        dynamic-power-coefficient = <232>;
                        next-level-cache = <&L2_0>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
 +                      operating-points-v2 = <&cpu0_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD0>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
@@@ -77,9 -73,6 +77,9 @@@
                        dynamic-power-coefficient = <232>;
                        next-level-cache = <&L2_100>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
 +                      operating-points-v2 = <&cpu0_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD1>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
@@@ -99,9 -92,6 +99,9 @@@
                        dynamic-power-coefficient = <232>;
                        next-level-cache = <&L2_200>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
 +                      operating-points-v2 = <&cpu0_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD2>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <232>;
                        next-level-cache = <&L2_300>;
                        qcom,freq-domain = <&cpufreq_hw 0>;
 +                      operating-points-v2 = <&cpu0_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD3>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <369>;
                        next-level-cache = <&L2_400>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
 +                      operating-points-v2 = <&cpu4_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD4>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <369>;
                        next-level-cache = <&L2_500>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
 +                      operating-points-v2 = <&cpu4_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD5>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <369>;
                        next-level-cache = <&L2_600>;
                        qcom,freq-domain = <&cpufreq_hw 1>;
 +                      operating-points-v2 = <&cpu4_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD6>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                        dynamic-power-coefficient = <421>;
                        next-level-cache = <&L2_700>;
                        qcom,freq-domain = <&cpufreq_hw 2>;
 +                      operating-points-v2 = <&cpu7_opp_table>;
 +                      interconnects = <&gem_noc MASTER_AMPSS_M0 &mc_virt SLAVE_EBI_CH0>,
 +                                      <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>;
                        power-domains = <&CPU_PD7>;
                        power-domain-names = "psci";
                        #cooling-cells = <2>;
                };
        };
  
 +      cpu0_opp_table: cpu0_opp_table {
 +              compatible = "operating-points-v2";
 +              opp-shared;
 +
 +              cpu0_opp1: opp-300000000 {
 +                      opp-hz = /bits/ 64 <300000000>;
 +                      opp-peak-kBps = <800000 9600000>;
 +              };
 +
 +              cpu0_opp2: opp-403200000 {
 +                      opp-hz = /bits/ 64 <403200000>;
 +                      opp-peak-kBps = <800000 9600000>;
 +              };
 +
 +              cpu0_opp3: opp-499200000 {
 +                      opp-hz = /bits/ 64 <499200000>;
 +                      opp-peak-kBps = <800000 12902400>;
 +              };
 +
 +              cpu0_opp4: opp-576000000 {
 +                      opp-hz = /bits/ 64 <576000000>;
 +                      opp-peak-kBps = <800000 12902400>;
 +              };
 +
 +              cpu0_opp5: opp-672000000 {
 +                      opp-hz = /bits/ 64 <672000000>;
 +                      opp-peak-kBps = <800000 15974400>;
 +              };
 +
 +              cpu0_opp6: opp-768000000 {
 +                      opp-hz = /bits/ 64 <768000000>;
 +                      opp-peak-kBps = <1804000 19660800>;
 +              };
 +
 +              cpu0_opp7: opp-844800000 {
 +                      opp-hz = /bits/ 64 <844800000>;
 +                      opp-peak-kBps = <1804000 19660800>;
 +              };
 +
 +              cpu0_opp8: opp-940800000 {
 +                      opp-hz = /bits/ 64 <940800000>;
 +                      opp-peak-kBps = <1804000 22732800>;
 +              };
 +
 +              cpu0_opp9: opp-1036800000 {
 +                      opp-hz = /bits/ 64 <1036800000>;
 +                      opp-peak-kBps = <1804000 22732800>;
 +              };
 +
 +              cpu0_opp10: opp-1113600000 {
 +                      opp-hz = /bits/ 64 <1113600000>;
 +                      opp-peak-kBps = <2188000 25804800>;
 +              };
 +
 +              cpu0_opp11: opp-1209600000 {
 +                      opp-hz = /bits/ 64 <1209600000>;
 +                      opp-peak-kBps = <2188000 31948800>;
 +              };
 +
 +              cpu0_opp12: opp-1305600000 {
 +                      opp-hz = /bits/ 64 <1305600000>;
 +                      opp-peak-kBps = <3072000 31948800>;
 +              };
 +
 +              cpu0_opp13: opp-1382400000 {
 +                      opp-hz = /bits/ 64 <1382400000>;
 +                      opp-peak-kBps = <3072000 31948800>;
 +              };
 +
 +              cpu0_opp14: opp-1478400000 {
 +                      opp-hz = /bits/ 64 <1478400000>;
 +                      opp-peak-kBps = <3072000 31948800>;
 +              };
 +
 +              cpu0_opp15: opp-1555200000 {
 +                      opp-hz = /bits/ 64 <1555200000>;
 +                      opp-peak-kBps = <3072000 40550400>;
 +              };
 +
 +              cpu0_opp16: opp-1632000000 {
 +                      opp-hz = /bits/ 64 <1632000000>;
 +                      opp-peak-kBps = <3072000 40550400>;
 +              };
 +
 +              cpu0_opp17: opp-1708800000 {
 +                      opp-hz = /bits/ 64 <1708800000>;
 +                      opp-peak-kBps = <3072000 43008000>;
 +              };
 +
 +              cpu0_opp18: opp-1785600000 {
 +                      opp-hz = /bits/ 64 <1785600000>;
 +                      opp-peak-kBps = <3072000 43008000>;
 +              };
 +      };
 +
 +      cpu4_opp_table: cpu4_opp_table {
 +              compatible = "operating-points-v2";
 +              opp-shared;
 +
 +              cpu4_opp1: opp-710400000 {
 +                      opp-hz = /bits/ 64 <710400000>;
 +                      opp-peak-kBps = <1804000 15974400>;
 +              };
 +
 +              cpu4_opp2: opp-825600000 {
 +                      opp-hz = /bits/ 64 <825600000>;
 +                      opp-peak-kBps = <2188000 19660800>;
 +              };
 +
 +              cpu4_opp3: opp-940800000 {
 +                      opp-hz = /bits/ 64 <940800000>;
 +                      opp-peak-kBps = <2188000 22732800>;
 +              };
 +
 +              cpu4_opp4: opp-1056000000 {
 +                      opp-hz = /bits/ 64 <1056000000>;
 +                      opp-peak-kBps = <3072000 25804800>;
 +              };
 +
 +              cpu4_opp5: opp-1171200000 {
 +                      opp-hz = /bits/ 64 <1171200000>;
 +                      opp-peak-kBps = <3072000 31948800>;
 +              };
 +
 +              cpu4_opp6: opp-1286400000 {
 +                      opp-hz = /bits/ 64 <1286400000>;
 +                      opp-peak-kBps = <4068000 31948800>;
 +              };
 +
 +              cpu4_opp7: opp-1401600000 {
 +                      opp-hz = /bits/ 64 <1401600000>;
 +                      opp-peak-kBps = <4068000 31948800>;
 +              };
 +
 +              cpu4_opp8: opp-1497600000 {
 +                      opp-hz = /bits/ 64 <1497600000>;
 +                      opp-peak-kBps = <4068000 40550400>;
 +              };
 +
 +              cpu4_opp9: opp-1612800000 {
 +                      opp-hz = /bits/ 64 <1612800000>;
 +                      opp-peak-kBps = <4068000 40550400>;
 +              };
 +
 +              cpu4_opp10: opp-1708800000 {
 +                      opp-hz = /bits/ 64 <1708800000>;
 +                      opp-peak-kBps = <4068000 43008000>;
 +              };
 +
 +              cpu4_opp11: opp-1804800000 {
 +                      opp-hz = /bits/ 64 <1804800000>;
 +                      opp-peak-kBps = <6220000 43008000>;
 +              };
 +
 +              cpu4_opp12: opp-1920000000 {
 +                      opp-hz = /bits/ 64 <1920000000>;
 +                      opp-peak-kBps = <6220000 49152000>;
 +              };
 +
 +              cpu4_opp13: opp-2016000000 {
 +                      opp-hz = /bits/ 64 <2016000000>;
 +                      opp-peak-kBps = <7216000 49152000>;
 +              };
 +
 +              cpu4_opp14: opp-2131200000 {
 +                      opp-hz = /bits/ 64 <2131200000>;
 +                      opp-peak-kBps = <8368000 49152000>;
 +              };
 +
 +              cpu4_opp15: opp-2227200000 {
 +                      opp-hz = /bits/ 64 <2227200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu4_opp16: opp-2323200000 {
 +                      opp-hz = /bits/ 64 <2323200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu4_opp17: opp-2419200000 {
 +                      opp-hz = /bits/ 64 <2419200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +      };
 +
 +      cpu7_opp_table: cpu7_opp_table {
 +              compatible = "operating-points-v2";
 +              opp-shared;
 +
 +              cpu7_opp1: opp-825600000 {
 +                      opp-hz = /bits/ 64 <825600000>;
 +                      opp-peak-kBps = <2188000 19660800>;
 +              };
 +
 +              cpu7_opp2: opp-940800000 {
 +                      opp-hz = /bits/ 64 <940800000>;
 +                      opp-peak-kBps = <2188000 22732800>;
 +              };
 +
 +              cpu7_opp3: opp-1056000000 {
 +                      opp-hz = /bits/ 64 <1056000000>;
 +                      opp-peak-kBps = <3072000 25804800>;
 +              };
 +
 +              cpu7_opp4: opp-1171200000 {
 +                      opp-hz = /bits/ 64 <1171200000>;
 +                      opp-peak-kBps = <3072000 31948800>;
 +              };
 +
 +              cpu7_opp5: opp-1286400000 {
 +                      opp-hz = /bits/ 64 <1286400000>;
 +                      opp-peak-kBps = <4068000 31948800>;
 +              };
 +
 +              cpu7_opp6: opp-1401600000 {
 +                      opp-hz = /bits/ 64 <1401600000>;
 +                      opp-peak-kBps = <4068000 31948800>;
 +              };
 +
 +              cpu7_opp7: opp-1497600000 {
 +                      opp-hz = /bits/ 64 <1497600000>;
 +                      opp-peak-kBps = <4068000 40550400>;
 +              };
 +
 +              cpu7_opp8: opp-1612800000 {
 +                      opp-hz = /bits/ 64 <1612800000>;
 +                      opp-peak-kBps = <4068000 40550400>;
 +              };
 +
 +              cpu7_opp9: opp-1708800000 {
 +                      opp-hz = /bits/ 64 <1708800000>;
 +                      opp-peak-kBps = <4068000 43008000>;
 +              };
 +
 +              cpu7_opp10: opp-1804800000 {
 +                      opp-hz = /bits/ 64 <1804800000>;
 +                      opp-peak-kBps = <6220000 43008000>;
 +              };
 +
 +              cpu7_opp11: opp-1920000000 {
 +                      opp-hz = /bits/ 64 <1920000000>;
 +                      opp-peak-kBps = <6220000 49152000>;
 +              };
 +
 +              cpu7_opp12: opp-2016000000 {
 +                      opp-hz = /bits/ 64 <2016000000>;
 +                      opp-peak-kBps = <7216000 49152000>;
 +              };
 +
 +              cpu7_opp13: opp-2131200000 {
 +                      opp-hz = /bits/ 64 <2131200000>;
 +                      opp-peak-kBps = <8368000 49152000>;
 +              };
 +
 +              cpu7_opp14: opp-2227200000 {
 +                      opp-hz = /bits/ 64 <2227200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp15: opp-2323200000 {
 +                      opp-hz = /bits/ 64 <2323200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp16: opp-2419200000 {
 +                      opp-hz = /bits/ 64 <2419200000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp17: opp-2534400000 {
 +                      opp-hz = /bits/ 64 <2534400000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp18: opp-2649600000 {
 +                      opp-hz = /bits/ 64 <2649600000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp19: opp-2745600000 {
 +                      opp-hz = /bits/ 64 <2745600000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +
 +              cpu7_opp20: opp-2841600000 {
 +                      opp-hz = /bits/ 64 <2841600000>;
 +                      opp-peak-kBps = <8368000 51609600>;
 +              };
 +      };
 +
        firmware {
                scm: scm {
                        compatible = "qcom,scm-sm8150", "qcom,scm";
                                status = "disabled";
                        };
  
 +                      spi0: spi@880000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x880000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S0_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi0_default>;
 +                              interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c1: i2c@884000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00884000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi1: spi@884000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x884000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S1_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi1_default>;
 +                              interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c2: i2c@888000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00888000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi2: spi@888000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x888000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S2_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi2_default>;
 +                              interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c3: i2c@88c000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x0088c000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi3: spi@88c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x88c000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi3_default>;
 +                              interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c4: i2c@890000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00890000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi4: spi@890000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x890000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S4_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi4_default>;
 +                              interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c5: i2c@894000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00894000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi5: spi@894000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x894000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi5_default>;
 +                              interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c6: i2c@898000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00898000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi6: spi@898000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x898000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S6_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi6_default>;
 +                              interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c7: i2c@89c000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x0089c000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi7: spi@89c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0x89c000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP0_S7_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi7_default>;
 +                              interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
                };
  
                gpi_dma1: dma-controller@a00000 {
                                status = "disabled";
                        };
  
 +                      spi8: spi@a80000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa80000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S0_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi8_default>;
 +                              interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c9: i2c@a84000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00a84000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi9: spi@a84000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa84000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S1_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi9_default>;
 +                              interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c10: i2c@a88000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00a88000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi10: spi@a88000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa88000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S2_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi10_default>;
 +                              interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c11: i2c@a8c000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00a8c000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi11: spi@a8c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa8c000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S3_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi11_default>;
 +                              interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        uart2: serial@a90000 {
                                compatible = "qcom,geni-debug-uart";
                                reg = <0x0 0x00a90000 0x0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi12: spi@a90000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa90000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S4_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi12_default>;
 +                              interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c16: i2c@94000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x0094000 0 0x4000>;
                                #size-cells = <0>;
                                status = "disabled";
                        };
 +
 +                      spi16: spi@a94000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xa94000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP1_S5_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi16_default>;
 +                              interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
                };
  
                gpi_dma2: dma-controller@c00000 {
                                status = "disabled";
                        };
  
 +                      spi17: spi@c80000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc80000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S0_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi17_default>;
 +                              interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c18: i2c@c84000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00c84000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi18: spi@c84000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc84000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi18_default>;
 +                              interrupts = <GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c19: i2c@c88000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00c88000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi19: spi@c88000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc88000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S2_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi19_default>;
 +                              interrupts = <GIC_SPI 584 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c13: i2c@c8c000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00c8c000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi13: spi@c8c000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc8c000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S3_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi13_default>;
 +                              interrupts = <GIC_SPI 585 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c14: i2c@c90000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00c90000 0 0x4000>;
                                status = "disabled";
                        };
  
 +                      spi14: spi@c90000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc90000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S4_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi14_default>;
 +                              interrupts = <GIC_SPI 586 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
 +
                        i2c15: i2c@c94000 {
                                compatible = "qcom,geni-i2c";
                                reg = <0 0x00c94000 0 0x4000>;
                                #size-cells = <0>;
                                status = "disabled";
                        };
 +
 +                      spi15: spi@c94000 {
 +                              compatible = "qcom,geni-spi";
 +                              reg = <0 0xc94000 0 0x4000>;
 +                              reg-names = "se";
 +                              clock-names = "se";
 +                              clocks = <&gcc GCC_QUPV3_WRAP2_S5_CLK>;
 +                              pinctrl-names = "default";
 +                              pinctrl-0 = <&qup_spi15_default>;
 +                              interrupts = <GIC_SPI 587 IRQ_TYPE_LEVEL_HIGH>;
 +                              spi-max-frequency = <50000000>;
 +                              #address-cells = <1>;
 +                              #size-cells = <0>;
 +                              status = "disabled";
 +                      };
                };
  
                config_noc: interconnect@1500000 {
                ufs_mem_hc: ufshc@1d84000 {
                        compatible = "qcom,sm8150-ufshc", "qcom,ufshc",
                                     "jedec,ufs-2.0";
 -                      reg = <0 0x01d84000 0 0x2500>;
 +                      reg = <0 0x01d84000 0 0x2500>,
 +                            <0 0x01d90000 0 0x8000>;
 +                      reg-names = "std", "ice";
                        interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&ufs_mem_phy_lanes>;
                        phy-names = "ufsphy";
                                "ref_clk",
                                "tx_lane0_sync_clk",
                                "rx_lane0_sync_clk",
 -                              "rx_lane1_sync_clk";
 +                              "rx_lane1_sync_clk",
 +                              "ice_core_clk";
                        clocks =
                                <&gcc GCC_UFS_PHY_AXI_CLK>,
                                <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>,
                                <&rpmhcc RPMH_CXO_CLK>,
                                <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>,
                                <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>,
 -                              <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>;
 +                              <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>,
 +                              <&gcc GCC_UFS_PHY_ICE_CORE_CLK>;
                        freq-table-hz =
                                <37500000 300000000>,
                                <0 0>,
                                <0 0>,
                                <0 0>,
                                <0 0>,
 -                              <0 0>;
 +                              <0 0>,
 +                              <0 300000000>;
  
                        status = "disabled";
                };
                                };
                        };
  
 +                      qup_spi0_default: qup-spi0-default {
 +                              pins = "gpio0", "gpio1", "gpio2", "gpio3";
 +                              function = "qup0";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c1_default: qup-i2c1-default {
                                mux {
                                        pins = "gpio114", "gpio115";
                                };
                        };
  
 +                      qup_spi1_default: qup-spi1-default {
 +                              pins = "gpio114", "gpio115", "gpio116", "gpio117";
 +                              function = "qup1";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c2_default: qup-i2c2-default {
                                mux {
                                        pins = "gpio126", "gpio127";
                                };
                        };
  
 +                      qup_spi2_default: qup-spi2-default {
 +                              pins = "gpio126", "gpio127", "gpio128", "gpio129";
 +                              function = "qup2";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c3_default: qup-i2c3-default {
                                mux {
                                        pins = "gpio144", "gpio145";
                                };
                        };
  
 +                      qup_spi3_default: qup-spi3-default {
 +                              pins = "gpio144", "gpio145", "gpio146", "gpio147";
 +                              function = "qup3";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c4_default: qup-i2c4-default {
                                mux {
                                        pins = "gpio51", "gpio52";
                                };
                        };
  
 +                      qup_spi4_default: qup-spi4-default {
 +                              pins = "gpio51", "gpio52", "gpio53", "gpio54";
 +                              function = "qup4";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c5_default: qup-i2c5-default {
                                mux {
                                        pins = "gpio121", "gpio122";
                                };
                        };
  
 +                      qup_spi5_default: qup-spi5-default {
 +                              pins = "gpio119", "gpio120", "gpio121", "gpio122";
 +                              function = "qup5";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c6_default: qup-i2c6-default {
                                mux {
                                        pins = "gpio6", "gpio7";
                                };
                        };
  
 +                      qup_spi6_default: qup-spi6_default {
 +                              pins = "gpio4", "gpio5", "gpio6", "gpio7";
 +                              function = "qup6";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c7_default: qup-i2c7-default {
                                mux {
                                        pins = "gpio98", "gpio99";
                                };
                        };
  
 +                      qup_spi7_default: qup-spi7_default {
 +                              pins = "gpio98", "gpio99", "gpio100", "gpio101";
 +                              function = "qup7";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c8_default: qup-i2c8-default {
                                mux {
                                        pins = "gpio88", "gpio89";
                                };
                        };
  
 +                      qup_spi8_default: qup-spi8-default {
 +                              pins = "gpio88", "gpio89", "gpio90", "gpio91";
 +                              function = "qup8";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c9_default: qup-i2c9-default {
                                mux {
                                        pins = "gpio39", "gpio40";
                                };
                        };
  
 +                      qup_spi9_default: qup-spi9-default {
 +                              pins = "gpio39", "gpio40", "gpio41", "gpio42";
 +                              function = "qup9";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c10_default: qup-i2c10-default {
                                mux {
                                        pins = "gpio9", "gpio10";
                                };
                        };
  
 +                      qup_spi10_default: qup-spi10-default {
 +                              pins = "gpio9", "gpio10", "gpio11", "gpio12";
 +                              function = "qup10";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c11_default: qup-i2c11-default {
                                mux {
                                        pins = "gpio94", "gpio95";
                                };
                        };
  
 +                      qup_spi11_default: qup-spi11-default {
 +                              pins = "gpio92", "gpio93", "gpio94", "gpio95";
 +                              function = "qup11";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c12_default: qup-i2c12-default {
                                mux {
                                        pins = "gpio83", "gpio84";
                                };
                        };
  
 +                      qup_spi12_default: qup-spi12-default {
 +                              pins = "gpio83", "gpio84", "gpio85", "gpio86";
 +                              function = "qup12";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c13_default: qup-i2c13-default {
                                mux {
                                        pins = "gpio43", "gpio44";
                                };
                        };
  
 +                      qup_spi13_default: qup-spi13-default {
 +                              pins = "gpio43", "gpio44", "gpio45", "gpio46";
 +                              function = "qup13";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c14_default: qup-i2c14-default {
                                mux {
                                        pins = "gpio47", "gpio48";
                                };
                        };
  
 +                      qup_spi14_default: qup-spi14-default {
 +                              pins = "gpio47", "gpio48", "gpio49", "gpio50";
 +                              function = "qup14";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c15_default: qup-i2c15-default {
                                mux {
                                        pins = "gpio27", "gpio28";
                                };
                        };
  
 +                      qup_spi15_default: qup-spi15-default {
 +                              pins = "gpio27", "gpio28", "gpio29", "gpio30";
 +                              function = "qup15";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c16_default: qup-i2c16-default {
                                mux {
                                        pins = "gpio86", "gpio85";
                                };
                        };
  
 +                      qup_spi16_default: qup-spi16-default {
 +                              pins = "gpio83", "gpio84", "gpio85", "gpio86";
 +                              function = "qup16";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c17_default: qup-i2c17-default {
                                mux {
                                        pins = "gpio55", "gpio56";
                                };
                        };
  
 +                      qup_spi17_default: qup-spi17-default {
 +                              pins = "gpio55", "gpio56", "gpio57", "gpio58";
 +                              function = "qup17";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c18_default: qup-i2c18-default {
                                mux {
                                        pins = "gpio23", "gpio24";
                                };
                        };
  
 +                      qup_spi18_default: qup-spi18-default {
 +                              pins = "gpio23", "gpio24", "gpio25", "gpio26";
 +                              function = "qup18";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
 +
                        qup_i2c19_default: qup-i2c19-default {
                                mux {
                                        pins = "gpio57", "gpio58";
                                        bias-disable;
                                };
                        };
 +
 +                      qup_spi19_default: qup-spi19-default {
 +                              pins = "gpio55", "gpio56", "gpio57", "gpio58";
 +                              function = "qup19";
 +                              drive-strength = <6>;
 +                              bias-disable;
 +                      };
                };
  
                remoteproc_mpss: remoteproc@4080000 {
                        };
                };
  
 -              dc_noc: interconnect@9160000 {
 -                      compatible = "qcom,sm8150-dc-noc";
 -                      reg = <0 0x09160000 0 0x3200>;
 -                      #interconnect-cells = <1>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -              };
 -
 -              gem_noc: interconnect@9680000 {
 -                      compatible = "qcom,sm8150-gem-noc";
 -                      reg = <0 0x09680000 0 0x3e200>;
 -                      #interconnect-cells = <1>;
 -                      qcom,bcm-voters = <&apps_bcm_voter>;
 -              };
 -
                usb_2_qmpphy: phy@88eb000 {
                        compatible = "qcom,sm8150-qmp-usb3-uni-phy";
                        reg = <0 0x088eb000 0 0x200>;
                        };
                };
  
 +              dc_noc: interconnect@9160000 {
 +                      compatible = "qcom,sm8150-dc-noc";
 +                      reg = <0 0x09160000 0 0x3200>;
 +                      #interconnect-cells = <1>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +              };
 +
 +              gem_noc: interconnect@9680000 {
 +                      compatible = "qcom,sm8150-gem-noc";
 +                      reg = <0 0x09680000 0 0x3e200>;
 +                      #interconnect-cells = <1>;
 +                      qcom,bcm-voters = <&apps_bcm_voter>;
 +              };
 +
                usb_1: usb@a6f8800 {
                        compatible = "qcom,sm8150-dwc3", "qcom,dwc3";
                        reg = <0 0x0a6f8800 0 0x400>;
  
                        resets = <&gcc GCC_USB30_PRIM_BCR>;
  
-                       usb_1_dwc3: usb@a600000 {
+                       usb_1_dwc3: dwc3@a600000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a600000 0 0xcd00>;
                                interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
  
                        resets = <&gcc GCC_USB30_SEC_BCR>;
  
 -                      usb_2_dwc3: dwc3@a800000 {
 +                      usb_2_dwc3: usb@a800000 {
                                compatible = "snps,dwc3";
                                reg = <0 0x0a800000 0 0xcd00>;
                                interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;