Skip to content

L
linux
Commit 0e1b27f4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: align dmas in I2C/SPI/UART with DT schema 

The DT schema expects dma channels in tx-rx order.  No functional
change.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220405063451.12011-2-krzysztof.kozlowski@linaro.org
parent dcd0a663
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
arch/arm64/boot/dts/qcom/ipq6018.dtsi
View file @ 0e1b27f4
...@@ -322,8 +322,8 @@ i2c_0: i2c@78b6000 { ...@@ -322,8 +322,8 @@ i2c_0: i2c@78b6000 {
<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;
dmas = <&blsp_dma 15>, <&blsp_dma 14>; dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
}; };
...@@ -337,8 +337,8 @@ i2c_1: i2c@78b7000 { /* BLSP1 QUP2 */ ...@@ -337,8 +337,8 @@ i2c_1: i2c@78b7000 { /* BLSP1 QUP2 */
<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;
dmas = <&blsp_dma 17>, <&blsp_dma 16>; dmas = <&blsp_dma 16>, <&blsp_dma 17>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
}; };
......
arch/arm64/boot/dts/qcom/ipq8074.dtsi
View file @ 0e1b27f4
...@@ -471,8 +471,8 @@ blsp1_i2c2: i2c@78b6000 { ...@@ -471,8 +471,8 @@ blsp1_i2c2: i2c@78b6000 {
<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;
dmas = <&blsp_dma 15>, <&blsp_dma 14>; dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-0 = <&i2c_0_pins>; pinctrl-0 = <&i2c_0_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
status = "disabled"; status = "disabled";
...@@ -488,8 +488,8 @@ blsp1_i2c3: i2c@78b7000 { ...@@ -488,8 +488,8 @@ blsp1_i2c3: i2c@78b7000 {
<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <100000>; clock-frequency = <100000>;
dmas = <&blsp_dma 17>, <&blsp_dma 16>; dmas = <&blsp_dma 16>, <&blsp_dma 17>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
}; };
...@@ -503,8 +503,8 @@ blsp1_i2c5: i2c@78b9000 { ...@@ -503,8 +503,8 @@ blsp1_i2c5: i2c@78b9000 {
<&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <400000>; clock-frequency = <400000>;
dmas = <&blsp_dma 21>, <&blsp_dma 20>; dmas = <&blsp_dma 20>, <&blsp_dma 21>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
}; };
...@@ -518,8 +518,8 @@ blsp1_i2c6: i2c@78ba000 { ...@@ -518,8 +518,8 @@ blsp1_i2c6: i2c@78ba000 {
<&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
clock-names = "iface", "core"; clock-names = "iface", "core";
clock-frequency = <100000>; clock-frequency = <100000>;
dmas = <&blsp_dma 23>, <&blsp_dma 22>; dmas = <&blsp_dma 22>, <&blsp_dma 23>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
status = "disabled"; status = "disabled";
}; };
......
arch/arm64/boot/dts/qcom/msm8916.dtsi
View file @ 0e1b27f4
...@@ -1485,8 +1485,8 @@ blsp1_uart1: serial@78af000 { ...@@ -1485,8 +1485,8 @@ blsp1_uart1: serial@78af000 {
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 1>, <&blsp_dma 0>; dmas = <&blsp_dma 0>, <&blsp_dma 1>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart1_default>; pinctrl-0 = <&blsp1_uart1_default>;
pinctrl-1 = <&blsp1_uart1_sleep>; pinctrl-1 = <&blsp1_uart1_sleep>;
...@@ -1499,8 +1499,8 @@ blsp1_uart2: serial@78b0000 { ...@@ -1499,8 +1499,8 @@ blsp1_uart2: serial@78b0000 {
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 3>, <&blsp_dma 2>; dmas = <&blsp_dma 2>, <&blsp_dma 3>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart2_default>; pinctrl-0 = <&blsp1_uart2_default>;
pinctrl-1 = <&blsp1_uart2_sleep>; pinctrl-1 = <&blsp1_uart2_sleep>;
...@@ -1529,8 +1529,8 @@ blsp_spi1: spi@78b5000 { ...@@ -1529,8 +1529,8 @@ blsp_spi1: spi@78b5000 {
clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 5>, <&blsp_dma 4>; dmas = <&blsp_dma 4>, <&blsp_dma 5>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi1_default>; pinctrl-0 = <&spi1_default>;
pinctrl-1 = <&spi1_sleep>; pinctrl-1 = <&spi1_sleep>;
...@@ -1561,8 +1561,8 @@ blsp_spi2: spi@78b6000 { ...@@ -1561,8 +1561,8 @@ blsp_spi2: spi@78b6000 {
clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 7>, <&blsp_dma 6>; dmas = <&blsp_dma 6>, <&blsp_dma 7>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi2_default>; pinctrl-0 = <&spi2_default>;
pinctrl-1 = <&spi2_sleep>; pinctrl-1 = <&spi2_sleep>;
...@@ -1593,8 +1593,8 @@ blsp_spi3: spi@78b7000 { ...@@ -1593,8 +1593,8 @@ blsp_spi3: spi@78b7000 {
clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 9>, <&blsp_dma 8>; dmas = <&blsp_dma 8>, <&blsp_dma 9>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi3_default>; pinctrl-0 = <&spi3_default>;
pinctrl-1 = <&spi3_sleep>; pinctrl-1 = <&spi3_sleep>;
...@@ -1625,8 +1625,8 @@ blsp_spi4: spi@78b8000 { ...@@ -1625,8 +1625,8 @@ blsp_spi4: spi@78b8000 {
clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 11>, <&blsp_dma 10>; dmas = <&blsp_dma 10>, <&blsp_dma 11>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi4_default>; pinctrl-0 = <&spi4_default>;
pinctrl-1 = <&spi4_sleep>; pinctrl-1 = <&spi4_sleep>;
...@@ -1657,8 +1657,8 @@ blsp_spi5: spi@78b9000 { ...@@ -1657,8 +1657,8 @@ blsp_spi5: spi@78b9000 {
clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP5_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 13>, <&blsp_dma 12>; dmas = <&blsp_dma 12>, <&blsp_dma 13>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi5_default>; pinctrl-0 = <&spi5_default>;
pinctrl-1 = <&spi5_sleep>; pinctrl-1 = <&spi5_sleep>;
...@@ -1689,8 +1689,8 @@ blsp_spi6: spi@78ba000 { ...@@ -1689,8 +1689,8 @@ blsp_spi6: spi@78ba000 {
clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP6_SPI_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp_dma 15>, <&blsp_dma 14>; dmas = <&blsp_dma 14>, <&blsp_dma 15>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&spi6_default>; pinctrl-0 = <&spi6_default>;
pinctrl-1 = <&spi6_sleep>; pinctrl-1 = <&spi6_sleep>;
......
arch/arm64/boot/dts/qcom/qcs404.dtsi
View file @ 0e1b27f4
...@@ -823,8 +823,8 @@ blsp1_uart0: serial@78af000 { ...@@ -823,8 +823,8 @@ blsp1_uart0: serial@78af000 {
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART0_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART0_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp1_dma 1>, <&blsp1_dma 0>; dmas = <&blsp1_dma 0>, <&blsp1_dma 1>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blsp1_uart0_default>; pinctrl-0 = <&blsp1_uart0_default>;
status = "disabled"; status = "disabled";
...@@ -836,8 +836,8 @@ blsp1_uart1: serial@78b0000 { ...@@ -836,8 +836,8 @@ blsp1_uart1: serial@78b0000 {
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART1_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp1_dma 3>, <&blsp1_dma 2>; dmas = <&blsp1_dma 2>, <&blsp1_dma 3>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blsp1_uart1_default>; pinctrl-0 = <&blsp1_uart1_default>;
status = "disabled"; status = "disabled";
...@@ -849,8 +849,8 @@ blsp1_uart2: serial@78b1000 { ...@@ -849,8 +849,8 @@ blsp1_uart2: serial@78b1000 {
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp1_dma 5>, <&blsp1_dma 4>; dmas = <&blsp1_dma 4>, <&blsp1_dma 5>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blsp1_uart2_default>; pinctrl-0 = <&blsp1_uart2_default>;
status = "okay"; status = "okay";
...@@ -903,8 +903,8 @@ blsp1_uart3: serial@78b2000 { ...@@ -903,8 +903,8 @@ blsp1_uart3: serial@78b2000 {
interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART3_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_UART3_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp1_dma 7>, <&blsp1_dma 6>; dmas = <&blsp1_dma 6>, <&blsp1_dma 7>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blsp1_uart3_default>; pinctrl-0 = <&blsp1_uart3_default>;
status = "disabled"; status = "disabled";
...@@ -1067,8 +1067,8 @@ blsp2_uart0: serial@7aef000 { ...@@ -1067,8 +1067,8 @@ blsp2_uart0: serial@7aef000 {
interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP2_UART0_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>; clocks = <&gcc GCC_BLSP2_UART0_APPS_CLK>, <&gcc GCC_BLSP2_AHB_CLK>;
clock-names = "core", "iface"; clock-names = "core", "iface";
dmas = <&blsp2_dma 1>, <&blsp2_dma 0>; dmas = <&blsp2_dma 0>, <&blsp2_dma 1>;
dma-names = "rx", "tx"; dma-names = "tx", "rx";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&blsp2_uart0_default>; pinctrl-0 = <&blsp2_uart0_default>;
status = "disabled"; status = "disabled";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7