Merge "ARM: dts: msm: Add QUPv3 console node for parrot"

This commit is contained in:
qctecmdr
2021-12-17 06:59:17 -08:00
committed by Gerrit - the friendly Code Review server
4 changed files with 74 additions and 0 deletions

View File

@@ -8,6 +8,34 @@
interrupt-controller;
#interrupt-cells = <2>;
wakeup-parent = <&pdc>;
qupv3_se3_2uart_pins: qupv3_se3_2uart_pins {
qupv3_se3_2uart_active: qupv3_se3_2uart_active {
mux {
pins = "gpio22", "gpio23";
function = "qup0_se3";
};
config {
pins = "gpio22", "gpio23";
drive-strength = <2>;
bias-disable;
};
};
qupv3_se3_2uart_sleep: qupv3_se3_2uart_sleep {
mux {
pins = "gpio22", "gpio23";
function = "gpio";
};
config {
pins = "gpio22", "gpio23";
drive-strength = <2>;
bias-pull-down;
};
};
};
};
sdc1_on: sdc1_on {

36
qcom/parrot-qupv3.dtsi Normal file
View File

@@ -0,0 +1,36 @@
&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 = <3>;
interconnect-names = "qup-core", "snoc-llcc", "qup-ddr";
interconnects =
<&clk_virt MASTER_QUP_CORE_0 &clk_virt SLAVE_QUP_CORE_0>,
<&system_noc MASTER_A1NOC_SNOC &gem_noc SLAVE_LLCC>,
<&aggre1_noc MASTER_QUP_0 &mc_virt SLAVE_EBI1>;
iommus = <&apps_smmu 0x0163 0x0>;
qcom,iommu-dma-addr-pool = <0x40000000 0x10000000>;
qcom,iommu-geometry = <0x40000000 0x10000000>;
qcom,iommu-dma = "fastmap";
dma-coherent;
status = "ok";
};
/* Debug UART Instance */
qupv3_se3_2uart: qcom,qup_uart@98C000 {
compatible = "qcom,msm-geni-console";
reg = <0x98C000 0x4000>;
reg-names = "se_phys";
interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "se-clk", "m-ahb", "s-ahb";
clocks = <&gcc GCC_QUPV3_WRAP0_S3_CLK>,
<&gcc GCC_QUPV3_WRAP_0_M_AHB_CLK>,
<&gcc GCC_QUPV3_WRAP_0_S_AHB_CLK>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&qupv3_se3_2uart_active>;
pinctrl-1 = <&qupv3_se3_2uart_sleep>;
qcom,wrapper-core = <&qupv3_0>;
status = "disabled";
};
};

View File

@@ -125,3 +125,7 @@
status = "ok";
};
&qupv3_se3_2uart {
qcom,rumi_platform;
};

View File

@@ -29,6 +29,7 @@
mmc0 = &sdhc_1; /*SDC1 eMMC slot*/
mmc1 = &sdhc_2; /* SDC2 SD card slot */
ufshc1 = &ufshc_mem; /* Embedded UFS Slot */
serial0 = &qupv3_se3_2uart;
};
firmware: firmware {};
@@ -966,6 +967,11 @@
status = "ok";
};
#include "parrot-qupv3.dtsi"
#include "parrot-pinctrl.dtsi"
#include "parrot-dma-heaps.dtsi"
#include "msm-arm-smmu-parrot.dtsi"
&qupv3_se3_2uart {
status = "ok";
};