From b965a60780cf8d465f456be429c9253757dba02a Mon Sep 17 00:00:00 2001 From: Uttkarsh Aggarwal Date: Fri, 18 Oct 2024 15:19:45 +0530 Subject: [PATCH 1/8] ARM: dts: msm: Add pin configuration for USB3 PHY portselect on Tuna TLMM pin is used to notify USB3/DP Combo PHY about the orientation. Select this pinctrl from the usb_qmp_dp_phy and ensure it is selecting the "usb0_phy_ps" pin function for Tuna. Change-Id: I69f4004b00dcba0140871171b6c8b08471ae6aee Signed-off-by: Uttkarsh Aggarwal --- qcom/tuna-pinctrl.dtsi | 27 +++++++++++++++++++++++++++ qcom/tuna-usb.dtsi | 3 +++ 2 files changed, 30 insertions(+) diff --git a/qcom/tuna-pinctrl.dtsi b/qcom/tuna-pinctrl.dtsi index 61496114..aadf6988 100644 --- a/qcom/tuna-pinctrl.dtsi +++ b/qcom/tuna-pinctrl.dtsi @@ -1969,7 +1969,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-usb.dtsi b/qcom/tuna-usb.dtsi index ca4fee3e..3581be99 100644 --- a/qcom/tuna-usb.dtsi +++ b/qcom/tuna-usb.dtsi @@ -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 = Date: Thu, 21 Nov 2024 17:45:53 +0530 Subject: [PATCH 2/8] ARM: dts: msm: Add eUSB2 repeater nodes for Tuna MTP Add the eUSB2 repeater node and references for PM7550BA. Note: PM7550BA will be part of MTP platform. Change-Id: I6fff82d33434306106ae6ce390f322c7a478e680 Signed-off-by: Uttkarsh Aggarwal --- qcom/tuna-pm7550ba.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) 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>; +}; From 3f60a27d21bf111e4906a5c4d2febe22a9224dee Mon Sep 17 00:00:00 2001 From: Prasanna S Date: Wed, 30 Oct 2024 10:59:32 +0530 Subject: [PATCH 3/8] ARM: dts: msm: Add i2c gpio access to apps and adsp on Tuna To access gpios from apps and adsp, we have added apps and remote flag in dtsi. To identify apps is busy or not, added qcom-apps flag during active state and added qcom-remote flag during suspend state, so other SS can use gpios during apps in suspend state. This flags in pinctrl file for respective GPIOs will help eGPIO to work for AON camera usecase. Also, increase TRE size from 64 to 1024 for camera usecase. Change-Id: Ibc65d9e61d55a3eaeffdf78aef3f8852687f576f Signed-off-by: Prasanna S --- qcom/tuna-pinctrl.dtsi | 3 +++ qcom/tuna-qupv3.dtsi | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qcom/tuna-pinctrl.dtsi b/qcom/tuna-pinctrl.dtsi index aadf6988..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; }; }; }; 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"; }; From ae8f7f9ec5b05cfbea8e4ae6ebd21105f57a892b Mon Sep 17 00:00:00 2001 From: Shivendra Pratap Date: Fri, 25 Oct 2024 17:31:39 +0530 Subject: [PATCH 4/8] bindings: remoteproc: Add soccp remoteproc binding for Tuna Add devicetree bindings soccp for Tuna target. Change-Id: I2eac03261d6fa60f9422b8167649758fd8e75659 Signed-off-by: Shivendra Pratap --- bindings/remoteproc/qcom,adsp.yaml | 1 + 1 file changed, 1 insertion(+) 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 From 8354671925580d1b2a95367ac1bad4beea483300 Mon Sep 17 00:00:00 2001 From: Shivendra Pratap Date: Fri, 25 Oct 2024 17:38:26 +0530 Subject: [PATCH 5/8] ARM: dts: msm: Add soccp node for Tuna Add remoteproc soccp devicetree node for Tuna SoC. Change-Id: Ie5912e460ebd40877fa738b2fa9ba9528463695d Signed-off-by: Shivendra Pratap --- qcom/tuna.dtsi | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi index 698b00f3..59a73368 100644 --- a/qcom/tuna.dtsi +++ b/qcom/tuna.dtsi @@ -1204,6 +1204,43 @@ }; }; + soccp_pas: remoteproc-soccp@a3380000 { + compatible = "qcom,tuna-soccp-pas"; + reg = <0xa3380000 0x10000>; + 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>; From 0a2767607c44c4796f88cd72bb954b6cea47b388 Mon Sep 17 00:00:00 2001 From: Shivnandan Kumar Date: Thu, 10 Oct 2024 09:32:12 +0530 Subject: [PATCH 6/8] ARM: dts: msm: Add MPAM,NOC BW MPAM node for Tuna Add device nodes for MPAM,NOC BW MPAM node for Tuna. Change-Id: Ife534f2dab87c9ccd7ebf612bdead7471947f194 Signed-off-by: Shivnandan Kumar --- qcom/tuna.dtsi | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/qcom/tuna.dtsi b/qcom/tuna.dtsi index 59a73368..b49dae3a 100644 --- a/qcom/tuna.dtsi +++ b/qcom/tuna.dtsi @@ -2876,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>; From be9cebdc85d1bf212c4101adcfec31191573ab7f Mon Sep 17 00:00:00 2001 From: Sachin Gupta Date: Thu, 21 Nov 2024 19:49:22 +0530 Subject: [PATCH 7/8] ARM: dts: msm: Update card detection pin for tuna Update card detection pin for tuna platforms. Change-Id: I1ba1c06cb4f53ca29ac2369e7f65a5e88eb112cd Signed-off-by: Sachin Gupta --- qcom/tuna-cdp.dtsi | 2 +- qcom/tuna-mtp.dtsi | 2 +- qcom/tuna-qrd.dtsi | 2 +- qcom/tuna.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) 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-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.dtsi b/qcom/tuna.dtsi index b49dae3a..d29c53e4 100644 --- a/qcom/tuna.dtsi +++ b/qcom/tuna.dtsi @@ -2235,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>; From a79fc2d51ecc9da8c423703140ee525049a40600 Mon Sep 17 00:00:00 2001 From: Uttkarsh Aggarwal Date: Fri, 22 Nov 2024 15:12:18 +0530 Subject: [PATCH 8/8] ARM: dts: msm: Passing usb_qmp_dp_phy string to enable SS on tuna In this change usb_nop_phy is replaced with usb_qmp_dp_phy to enable Super-Speed on Tuna Platform. Change-Id: I24a255e4bf1154870ba676fcb3d778d0842503be Signed-off-by: Uttkarsh Aggarwal --- qcom/tuna-usb.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcom/tuna-usb.dtsi b/qcom/tuna-usb.dtsi index 3581be99..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>;