diff --git a/qcom/parrot-pinctrl.dtsi b/qcom/parrot-pinctrl.dtsi index 7d9220df..8bd3f19c 100644 --- a/qcom/parrot-pinctrl.dtsi +++ b/qcom/parrot-pinctrl.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ &soc { @@ -1897,4 +1897,11 @@ &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0>; }; }; + + tlmm-vm-test { + compatible = "qcom,tlmm-vm-test"; + qcom,master; + tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0 &tlmm 10 0 &tlmm 11 0 + &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0>; + }; }; diff --git a/qcom/parrot-vm.dtsi b/qcom/parrot-vm.dtsi index 953d401c..9a84e930 100644 --- a/qcom/parrot-vm.dtsi +++ b/qcom/parrot-vm.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "waipio-vm.dtsi" @@ -56,6 +56,39 @@ tlmm: pinctrl@f000000 { compatible = "qcom,parrot-vm-tlmm"; gpios = /bits/ 16 <98 99 10 11 12 13 64 65>; + + qupv3_se11_i2c_active: qupv3_se11_i2c_sda_active { + mux { + pins = "gpio10"; + function = "qup1_se3_l0"; + }; + + config { + pins = "gpio10"; + drive-strength = <2>; + bias-pull-up; + }; + }; + + qupv3_se11_i2c_sleep: qupv3_se11_i2c_sleep { + mux { + pins = "gpio10"; + function = "gpio"; + }; + + config { + pins = "gpio10"; + drive-strength = <2>; + }; + }; + }; + + tlmm-vm-test { + pinctrl-names = "active", "sleep"; + pinctrl-0 = <&qupv3_se11_i2c_active>; + pinctrl-1 = <&qupv3_se11_i2c_sleep>; + tlmm-vm-gpio-list = <&tlmm 98 0 &tlmm 99 0 &tlmm 10 0 &tlmm 11 0 + &tlmm 12 0 &tlmm 13 0 &tlmm 64 0 &tlmm 65 0>; }; tlmm-vm-mem-access { diff --git a/qcom/parrot.dtsi b/qcom/parrot.dtsi index b01a2cc7..557a2e9a 100644 --- a/qcom/parrot.dtsi +++ b/qcom/parrot.dtsi @@ -2618,7 +2618,16 @@ qcom,pipe-attr-ee; }; + qcom,test-dbl-tuivm { + compatible = "qcom,gh-dbl"; + qcom,label = <0x4>; + }; + qcom,test-msgq-tuivm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x4>; + qcom,primary; + }; thermal_zones: thermal-zones { }; diff --git a/qcom/waipio-vm.dtsi b/qcom/waipio-vm.dtsi index 36ec422f..cf746ca9 100644 --- a/qcom/waipio-vm.dtsi +++ b/qcom/waipio-vm.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -215,16 +215,25 @@ }; }; - test-dbl { + test-dbl-tuivm { vdevice-type = "doorbell"; - generate = "/hypervisor/test-dbl"; + generate = "/hypervisor/test-dbl-tuivm"; qcom,label = <0x4>; peer-default; }; - test-dbl-source { + test-dbl-tuivm-source { vdevice-type = "doorbell-source"; - generate = "/hypervisor/test-dbl-source"; + generate = "/hypervisor/test-dbl-tuivm-source"; + qcom,label = <0x4>; + peer-default; + }; + + test-msgq-tuivm { + vdevice-type = "message-queue-pair"; + generate = "/hypervisor/test-msgq-tuivm-pair"; + message-size = <0xf0>; + queue-depth = <0x8>; qcom,label = <0x4>; peer-default; }; @@ -280,6 +289,13 @@ gpios = /bits/ 16 <64 65 66 67 0 4 86 87 16 17 18 19 20 21>; }; + tlmm-vm-test { + compatible = "qcom,tlmm-vm-test"; + tlmm-vm-gpio-list = <&tlmm 64 0 &tlmm 65 0 &tlmm 66 0 &tlmm 67 0 &tlmm 0 0 + &tlmm 4 0 &tlmm 86 0 &tlmm 87 0 &tlmm 16 0 &tlmm 17 0 + &tlmm 18 0 &tlmm 19 0 &tlmm 20 0 &tlmm 21 0>; + }; + psci { compatible = "arm,psci-1.0"; method = "smc"; @@ -396,10 +412,17 @@ qcom,support-hypervisor; }; - qcom,test-dbl { + qcom,test-dbl-tuivm { compatible = "qcom,gh-dbl"; qcom,label = <0x4>; }; + + qcom,test-msgq-tuivm { + compatible = "qcom,gh-msgq-test"; + gunyah-label = <0x4>; + affinity = <0>; + }; + }; #include "waipio-vm-dma-heaps.dtsi"