diff --git a/qcom/yupik-pinctrl.dtsi b/qcom/yupik-pinctrl.dtsi index baa6f7f738b5..01404eb41ded 100644 --- a/qcom/yupik-pinctrl.dtsi +++ b/qcom/yupik-pinctrl.dtsi @@ -8,5 +8,33 @@ interrupt-controller; #interrupt-cells = <2>; wakeup-parent = <&pdc>; + + qupv3_se5_2uart_pins: qupv3_se5_2uart_pins { + qupv3_se5_2uart_active: qupv3_se5_2uart_active { + mux { + pins = "gpio22", "gpio23"; + function = "qup05"; + }; + + config { + pins = "gpio22", "gpio23"; + drive-strength = <2>; + bias-disable; + }; + }; + + qupv3_se5_2uart_sleep: qupv3_se5_2uart_sleep { + mux { + pins = "gpio22", "gpio23"; + function = "gpio"; + }; + + config { + pins = "gpio22", "gpio23"; + drive-strength = <2>; + bias-pull-down; + }; + }; + }; }; }; diff --git a/qcom/yupik-qupv3.dtsi b/qcom/yupik-qupv3.dtsi new file mode 100644 index 000000000000..a593d4406eda --- /dev/null +++ b/qcom/yupik-qupv3.dtsi @@ -0,0 +1,35 @@ +#include + +&soc { + /* QUPv3_0 wrapper instance */ + qupv3_0: qcom,qupv3_0_geni_se@9c0000 { + compatible = "qcom,qupv3-geni-se"; + reg = <0x9c0000 0x2000>; + qcom,msm-bus,num-paths = <2>; + qcom,msm-bus,vectors-bus-ids = + , + ; + iommus = <&apps_smmu 0x123 0x0>; + qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>; + qcom,iommu-geometry = <0x40000000 0x10000000>; + qcom,iommu-dma = "fastmap"; + status = "ok"; + }; + + /* Debug UART Instance */ + qupv3_se5_2uart: qcom,qup_uart@994000 { + compatible = "qcom,msm-geni-console"; + reg = <0x994000 0x4000>; + reg-names = "se_phys"; + interrupts = ; + clock-names = "se-clk", "m-ahb", "s-ahb"; + clocks = <&gcc GCC_QUPV3_WRAP0_S5_CLK>, + <&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>, + <&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&qupv3_se5_2uart_active>; + pinctrl-1 = <&qupv3_se5_2uart_sleep>; + qcom,wrapper-core = <&qupv3_0>; + status = "ok"; + }; +}; diff --git a/qcom/yupik-rumi.dtsi b/qcom/yupik-rumi.dtsi index a7544916452f..1efb6b32bfaa 100644 --- a/qcom/yupik-rumi.dtsi +++ b/qcom/yupik-rumi.dtsi @@ -70,3 +70,8 @@ status = "ok"; }; + +/* Debug UART console */ +&qupv3_se5_2uart { + qcom,rumi_platform; +}; diff --git a/qcom/yupik.dtsi b/qcom/yupik.dtsi index 426b22f3b218..be693f53cd92 100644 --- a/qcom/yupik.dtsi +++ b/qcom/yupik.dtsi @@ -1272,3 +1272,4 @@ #include "yupik-usb.dtsi" #include "yupik-ion.dtsi" #include "msm-arm-smmu-yupik.dtsi" +#include "yupik-qupv3.dtsi"