Merge "ARM: dts: msm: Add Shared flag and correct GPIO's on Diwali"

This commit is contained in:
qctecmdr
2021-11-01 07:08:52 -07:00
committed by Gerrit - the friendly Code Review server
3 changed files with 14 additions and 9 deletions

View File

@@ -425,14 +425,14 @@
qupv3_se6_spi_sleep: qupv3_se6_spi_sleep {
mux {
pins = "gpio20", "gpio21",
"gpio22", "gpio23";
pins = "gpio24", "gpio25",
"gpio26", "gpio27";
function = "gpio";
};
config {
pins = "gpio20", "gpio21",
"gpio22", "gpio23";
pins = "gpio24", "gpio25",
"gpio26", "gpio27";
drive-strength = <6>;
bias-disable;
};

View File

@@ -60,6 +60,7 @@
qcom,gpii-mask = <0x7f>;
qcom,ev-factor = <2>;
qcom,iommu-dma-addr-pool = <0x100000 0x100000>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
};
@@ -81,6 +82,7 @@
status = "disabled";
};
/* TUI over I2C */
qupv3_se0_i2c: i2c@980000 {
compatible = "qcom,i2c-geni";
reg = <0x980000 0x4000>;
@@ -94,8 +96,8 @@
pinctrl-names = "default", "sleep";
pinctrl-0 = <&qupv3_se0_i2c_active>;
pinctrl-1 = <&qupv3_se0_i2c_sleep>;
dmas = <&gpi_dma0 0 0 3 64 0>,
<&gpi_dma0 1 0 3 64 0>;
dmas = <&gpi_dma0 0 0 3 64 2>,
<&gpi_dma0 1 0 3 64 2>;
dma-names = "tx", "rx";
qcom,wrapper-core = <&qupv3_0>;
status = "disabled";
@@ -115,8 +117,8 @@
pinctrl-names = "default", "sleep";
pinctrl-0 = <&qupv3_se0_spi_active>;
pinctrl-1 = <&qupv3_se0_spi_sleep>;
dmas = <&gpi_dma0 0 0 1 64 0>,
<&gpi_dma0 1 0 1 64 0>;
dmas = <&gpi_dma0 0 0 1 64 2>,
<&gpi_dma0 1 0 1 64 2>;
dma-names = "tx", "rx";
spi-max-frequency = <50000000>;
qcom,wrapper-core = <&qupv3_0>;
@@ -182,6 +184,7 @@
<&gpi_dma0 1 2 3 64 0>;
dma-names = "tx", "rx";
qcom,wrapper-core = <&qupv3_0>;
qcom,shared;
status = "disabled";
};
@@ -356,7 +359,7 @@
status = "disabled";
};
/* QUPv3_1 wrapper instance */
/* QUPv3_1 wrapper instance */
qupv3_1: qcom,qupv3_1_geni_se@ac0000 {
compatible = "qcom,qupv3-geni-se";
reg = <0xac0000 0x2000>;
@@ -397,6 +400,7 @@
qcom,gpii-mask = <0x6f>;
qcom,ev-factor = <2>;
qcom,iommu-dma-addr-pool = <0x100000 0x100000>;
dma-coherent;
qcom,gpi-ee-offset = <0x10000>;
status = "ok";
};

View File

@@ -34,6 +34,7 @@
aliases: aliases {
serial0 = &qupv3_se5_2uart;
hsuart0 = &qupv3_se7_4uart;
ufshc1 = &ufshc_mem; /* Embedded UFS Slot */
sdhc2 = &sdhc_2; /* SDC2 SD card slot */
};