diff --git a/bindings/remoteproc/qcom,adsp.yaml b/bindings/remoteproc/qcom,adsp.yaml index 191ee125..15a55748 100644 --- a/bindings/remoteproc/qcom,adsp.yaml +++ b/bindings/remoteproc/qcom,adsp.yaml @@ -66,6 +66,7 @@ properties: - qcom,tuna-adsp-pas - qcom,tuna-cdsp-pas - qcom,tuna-modem-pas + - qcom,tuna-soccp-pas - qcom,parrot-adsp-pas - qcom,parrot-cdsp-pas - qcom,parrot-modem-pas diff --git a/qcom/tuna-cdp.dtsi b/qcom/tuna-cdp.dtsi index 86c0f38a..d048ade7 100644 --- a/qcom/tuna-cdp.dtsi +++ b/qcom/tuna-cdp.dtsi @@ -99,7 +99,7 @@ pinctrl-0 = <&sdc2_on>; pinctrl-1 = <&sdc2_off>; - cd-gpios = <&tlmm 55 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; qcom,uses_level_shifter; diff --git a/qcom/tuna-mtp.dtsi b/qcom/tuna-mtp.dtsi index 36ab15e3..339aa4f6 100644 --- a/qcom/tuna-mtp.dtsi +++ b/qcom/tuna-mtp.dtsi @@ -101,7 +101,7 @@ pinctrl-0 = <&sdc2_on>; pinctrl-1 = <&sdc2_off>; - cd-gpios = <&tlmm 55 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; qcom,uses_level_shifter; diff --git a/qcom/tuna-pinctrl.dtsi b/qcom/tuna-pinctrl.dtsi index 61496114..1fb3c932 100644 --- a/qcom/tuna-pinctrl.dtsi +++ b/qcom/tuna-pinctrl.dtsi @@ -1096,6 +1096,7 @@ drive-strength = <2>; bias-pull-up; qcom,i2c_pull; + qcom,apps; }; }; @@ -1110,6 +1111,7 @@ drive-strength = <2>; bias-pull-up; qcom,i2c_pull; + qcom,apps; }; }; @@ -1122,6 +1124,7 @@ config { pins = "gpio0", "gpio1"; drive-strength = <2>; + qcom,remote; }; }; }; @@ -1969,7 +1972,34 @@ drive-strength = <2>; }; }; + usb_phy_ps: usb_phy_ps { + usb3phy_portselect_default: usb3phy_portselect_default { + mux { + pins = "gpio122"; + function = "usb0_phy_ps"; + }; + config { + pins = "gpio122"; + bias-pull-down; + drive-strength = <2>; + }; + }; + + usb3phy_portselect_gpio: usb3phy_portselect_gpio { + mux { + pins = "gpio122"; + function = "gpio"; + }; + + config { + pins = "gpio122"; + drive-strength = <2>; + bias-pull-down; + input-enable; + }; + }; + }; /* touchscreen pins */ pmx_ts_active { ts_active: ts_active { diff --git a/qcom/tuna-pm7550ba.dtsi b/qcom/tuna-pm7550ba.dtsi index 344d2862..341597f4 100644 --- a/qcom/tuna-pm7550ba.dtsi +++ b/qcom/tuna-pm7550ba.dtsi @@ -259,3 +259,14 @@ }; }; }; + +&pm7550ba_eusb2_repeater { + vdd18-supply = <&L7B>; + vdd3-supply = <&L17B>; + status = "ok"; +}; + +&eusb2_phy0 { + dummy-supply = <&pm7550ba_eusb2_repeater>; + usb-repeater = <&pm7550ba_eusb2_repeater>; +}; diff --git a/qcom/tuna-qrd.dtsi b/qcom/tuna-qrd.dtsi index cfd38eeb..d6c949e5 100644 --- a/qcom/tuna-qrd.dtsi +++ b/qcom/tuna-qrd.dtsi @@ -111,7 +111,7 @@ pinctrl-0 = <&sdc2_on>; pinctrl-1 = <&sdc2_off>; - cd-gpios = <&tlmm 55 GPIO_ACTIVE_LOW>; + cd-gpios = <&tlmm 39 GPIO_ACTIVE_LOW>; qcom,uses_level_shifter; diff --git a/qcom/tuna-qupv3.dtsi b/qcom/tuna-qupv3.dtsi index 4ad94442..b1aad089 100644 --- a/qcom/tuna-qupv3.dtsi +++ b/qcom/tuna-qupv3.dtsi @@ -466,8 +466,8 @@ pinctrl-names = "default", "sleep"; pinctrl-0 = <&qupv3_se8_i2c_sda_active>, <&qupv3_se8_i2c_scl_active>; pinctrl-1 = <&qupv3_se8_i2c_sleep>; - dmas = <&gpi_dma2 0 0 3 64 0>, - <&gpi_dma2 1 0 3 64 0>; + dmas = <&gpi_dma2 0 0 3 1024 0>, + <&gpi_dma2 1 0 3 1024 0>; dma-names = "tx", "rx"; status = "disabled"; }; diff --git a/qcom/tuna-usb.dtsi b/qcom/tuna-usb.dtsi index ca4fee3e..e9733a1a 100644 --- a/qcom/tuna-usb.dtsi +++ b/qcom/tuna-usb.dtsi @@ -76,7 +76,7 @@ dma-coherent; interrupts = ; - usb-phy = <&eusb2_phy0>, <&usb_nop_phy>; + usb-phy = <&eusb2_phy0>, <&usb_qmp_dp_phy>; snps,disable-clk-gating; snps,has-lpm-erratum; snps,hird-threshold = /bits/ 8 <0x0>; @@ -152,6 +152,9 @@ <&gcc GCC_USB3_PHY_PRIM_BCR>; reset-names = "global_phy_reset", "phy_reset"; + pinctrl-names = "default"; + pinctrl-0 = <&usb3phy_portselect_default>; + qcom,qmp-phy-reg-offset = ; + status = "ok"; + + cx-supply = <&VDD_CX_LEVEL>; + cx-uV-uA = ; + mx-supply = <&VDD_MX_LEVEL>; + mx-uV-uA = ; + reg-names = "cx", "mx"; + + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "xo"; + + memory-region = <&soccp_mem 0>; + soccp-config = <&tcsr 0x1a000>; + + /* Inputs from SOCCP */ + interrupts-extended = <&intc GIC_SPI 167 IRQ_TYPE_EDGE_RISING>, + <&soccp_smp2p_in 0 0>, + <&soccp_smp2p_in 1 0>, + <&soccp_smp2p_in 3 0>, + <&soccp_smp2p_in 2 0>, + <&soccp_smp2p_in 9 0>; + + interrupt-names = "wdog", + "fatal", + "ready", + "stop-ack", + "handover", + "pong"; + + /* Outputs to soccp */ + qcom,smem-states = <&soccp_smp2p_out 0>, <&soccp_smp2p_out 10>, <&soccp_smp2p_out 9>; + qcom,smem-state-names = "stop", "wakeup", "sleep"; + }; + sys-pm-vx@c320000 { compatible = "qcom,sys-pm-violators", "qcom,sys-pm-tuna"; reg = <0xc320000 0x400>; @@ -2198,7 +2235,7 @@ dma-coherent; memory-region = <&sdhc_2_dma_resv>; - interconnects = <&aggre2_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>, + interconnects = <&aggre1_noc MASTER_SDCC_2 &mc_virt SLAVE_EBI1>, <&gem_noc MASTER_APPSS_PROC &config_noc SLAVE_SDCC_2>; interconnect-names = "sdhc-ddr","cpu-sdhc"; operating-points-v2 = <&sdhc2_opp_table>; @@ -2839,6 +2876,44 @@ compatible = "qcom,cpufreq-stats-v2"; }; + qcom_mpam: qcom,mpam { + compatible = "qcom,mpam"; + }; + + cpu_mpam: qcom,cpu_mpam { + compatible = "qcom,cpu-mpam"; + + L3 { + qcom,msc-id = <0>; + qcom,msc-name = "L3"; + }; + }; + + noc_bw_mpam: qcom,noc_bw_mpam { + compatible = "qcom,platform-mpam"; + reg = <0x17D2EC00 0x400>; + reg-names = "mon-base"; + qcom,msc-id = <3>; + qcom,msc-name = "noc_bw"; + qcom,gears = "low", "medium", "high", "veryhigh"; + qcom,gear-id = <1>, <2>, <3>, <4>; + + cpu { + qcom,client-id = <0x1>; + qcom,client-name = "cpu"; + }; + + gpu { + qcom,client-id = <0x10>; + qcom,client-name = "gpu"; + }; + + nsp { + qcom,client-id = <0x100>; + qcom,client-name = "nsp"; + }; + }; + llcc_pmu: llcc-pmu@24095000 { compatible = "qcom,llcc-pmu-ver2"; reg = <0x24095000 0x300>;