Skip to content

L
linux
Commit 77e9c198 authored by Zhen Lei's avatar Zhen Lei Committed by Bjorn Andersson
Browse files
Options

arm64: dts: qcom: clear the warnings caused by empty dma-ranges 

The scripts/dtc/checks.c requires that the node have empty "dma-ranges"
property must have the same "#address-cells" and "#size-cells" values as
the parent node. Otherwise, the following warnings is reported:

arch/arm64/boot/dts/qcom/ipq6018.dtsi:185.3-14: Warning \
(dma_ranges_format): /soc:dma-ranges: empty "dma-ranges" property but \
its #address-cells (1) differs from / (2)
arch/arm64/boot/dts/qcom/ipq6018.dtsi:185.3-14: Warning \
(dma_ranges_format): /soc:dma-ranges: empty "dma-ranges" property but \
its #size-cells (1) differs from / (2)

Arnd Bergmann figured out why it's necessary:
Also note that the #address-cells=<1> means that any device under
this bus is assumed to only support 32-bit addressing, and DMA will
have to go through a slow swiotlb in the absence of an IOMMU.
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20201016090833.1892-3-thunder.leizhen@huawei.comSigned-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent ef9a5d18
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
arch/arm64/boot/dts/qcom/ipq6018.dtsi
View file @ 77e9c198
...@@ -179,22 +179,22 @@ smem { ...@@ -179,22 +179,22 @@ smem {
}; };
soc: soc { soc: soc {
#address-cells = <1>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <2>;
ranges = <0 0 0 0xffffffff>; ranges = <0 0 0 0 0x0 0xffffffff>;
dma-ranges; dma-ranges;
compatible = "simple-bus"; compatible = "simple-bus";
prng: qrng@e1000 { prng: qrng@e1000 {
compatible = "qcom,prng-ee"; compatible = "qcom,prng-ee";
reg = <0xe3000 0x1000>; reg = <0x0 0xe3000 0x0 0x1000>;
clocks = <&gcc GCC_PRNG_AHB_CLK>; clocks = <&gcc GCC_PRNG_AHB_CLK>;
clock-names = "core"; clock-names = "core";
}; };
cryptobam: dma@704000 { cryptobam: dma@704000 {
compatible = "qcom,bam-v1.7.0"; compatible = "qcom,bam-v1.7.0";
reg = <0x00704000 0x20000>; reg = <0x0 0x00704000 0x0 0x20000>;
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>; clocks = <&gcc GCC_CRYPTO_AHB_CLK>;
clock-names = "bam_clk"; clock-names = "bam_clk";
...@@ -206,7 +206,7 @@ cryptobam: dma@704000 { ...@@ -206,7 +206,7 @@ cryptobam: dma@704000 {
crypto: crypto@73a000 { crypto: crypto@73a000 {
compatible = "qcom,crypto-v5.1"; compatible = "qcom,crypto-v5.1";
reg = <0x0073a000 0x6000>; reg = <0x0 0x0073a000 0x0 0x6000>;
clocks = <&gcc GCC_CRYPTO_AHB_CLK>, clocks = <&gcc GCC_CRYPTO_AHB_CLK>,
<&gcc GCC_CRYPTO_AXI_CLK>, <&gcc GCC_CRYPTO_AXI_CLK>,
<&gcc GCC_CRYPTO_CLK>; <&gcc GCC_CRYPTO_CLK>;
...@@ -217,7 +217,7 @@ crypto: crypto@73a000 { ...@@ -217,7 +217,7 @@ crypto: crypto@73a000 {
tlmm: pinctrl@1000000 { tlmm: pinctrl@1000000 {
compatible = "qcom,ipq6018-pinctrl"; compatible = "qcom,ipq6018-pinctrl";
reg = <0x01000000 0x300000>; reg = <0x0 0x01000000 0x0 0x300000>;
interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>;
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
...@@ -235,7 +235,7 @@ serial_3_pins: serial3-pinmux { ...@@ -235,7 +235,7 @@ serial_3_pins: serial3-pinmux {
gcc: gcc@1800000 { gcc: gcc@1800000 {
compatible = "qcom,gcc-ipq6018"; compatible = "qcom,gcc-ipq6018";
reg = <0x01800000 0x80000>; reg = <0x0 0x01800000 0x0 0x80000>;
clocks = <&xo>, <&sleep_clk>; clocks = <&xo>, <&sleep_clk>;
clock-names = "xo", "sleep_clk"; clock-names = "xo", "sleep_clk";
#clock-cells = <1>; #clock-cells = <1>;
...@@ -244,17 +244,17 @@ gcc: gcc@1800000 { ...@@ -244,17 +244,17 @@ gcc: gcc@1800000 {
tcsr_mutex_regs: syscon@1905000 { tcsr_mutex_regs: syscon@1905000 {
compatible = "syscon"; compatible = "syscon";
reg = <0x01905000 0x8000>; reg = <0x0 0x01905000 0x0 0x8000>;
}; };
tcsr_q6: syscon@1945000 { tcsr_q6: syscon@1945000 {
compatible = "syscon"; compatible = "syscon";
reg = <0x01945000 0xe000>; reg = <0x0 0x01945000 0x0 0xe000>;
}; };
blsp_dma: dma@7884000 { blsp_dma: dma@7884000 {
compatible = "qcom,bam-v1.7.0"; compatible = "qcom,bam-v1.7.0";
reg = <0x07884000 0x2b000>; reg = <0x0 0x07884000 0x0 0x2b000>;
interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_AHB_CLK>; clocks = <&gcc GCC_BLSP1_AHB_CLK>;
clock-names = "bam_clk"; clock-names = "bam_clk";
...@@ -264,7 +264,7 @@ blsp_dma: dma@7884000 { ...@@ -264,7 +264,7 @@ blsp_dma: dma@7884000 {
blsp1_uart3: serial@78b1000 { blsp1_uart3: serial@78b1000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x078b1000 0x200>; reg = <0x0 0x078b1000 0x0 0x200>;
interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 306 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_UART3_APPS_CLK>, clocks = <&gcc GCC_BLSP1_UART3_APPS_CLK>,
<&gcc GCC_BLSP1_AHB_CLK>; <&gcc GCC_BLSP1_AHB_CLK>;
...@@ -276,7 +276,7 @@ spi_0: spi@78b5000 { ...@@ -276,7 +276,7 @@ spi_0: spi@78b5000 {
compatible = "qcom,spi-qup-v2.2.1"; compatible = "qcom,spi-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x078b5000 0x600>; reg = <0x0 0x078b5000 0x0 0x600>;
interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
...@@ -291,7 +291,7 @@ spi_1: spi@78b6000 { ...@@ -291,7 +291,7 @@ spi_1: spi@78b6000 {
compatible = "qcom,spi-qup-v2.2.1"; compatible = "qcom,spi-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x078b6000 0x600>; reg = <0x0 0x078b6000 0x0 0x600>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>, clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
...@@ -306,7 +306,7 @@ i2c_0: i2c@78b6000 { ...@@ -306,7 +306,7 @@ i2c_0: i2c@78b6000 {
compatible = "qcom,i2c-qup-v2.2.1"; compatible = "qcom,i2c-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x078b6000 0x600>; reg = <0x0 0x078b6000 0x0 0x600>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_AHB_CLK>, clocks = <&gcc GCC_BLSP1_AHB_CLK>,
<&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
...@@ -321,7 +321,7 @@ i2c_1: i2c@78b7000 { /* BLSP1 QUP2 */ ...@@ -321,7 +321,7 @@ i2c_1: i2c@78b7000 { /* BLSP1 QUP2 */
compatible = "qcom,i2c-qup-v2.2.1"; compatible = "qcom,i2c-qup-v2.2.1";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
reg = <0x078b7000 0x600>; reg = <0x0 0x078b7000 0x0 0x600>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&gcc GCC_BLSP1_AHB_CLK>, clocks = <&gcc GCC_BLSP1_AHB_CLK>,
<&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>; <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
...@@ -336,24 +336,24 @@ intc: interrupt-controller@b000000 { ...@@ -336,24 +336,24 @@ intc: interrupt-controller@b000000 {
compatible = "qcom,msm-qgic2"; compatible = "qcom,msm-qgic2";
interrupt-controller; interrupt-controller;
#interrupt-cells = <0x3>; #interrupt-cells = <0x3>;
reg = <0x0b000000 0x1000>, /*GICD*/ reg = <0x0 0x0b000000 0x0 0x1000>, /*GICD*/
<0x0b002000 0x1000>, /*GICC*/ <0x0 0x0b002000 0x0 0x1000>, /*GICC*/
<0x0b001000 0x1000>, /*GICH*/ <0x0 0x0b001000 0x0 0x1000>, /*GICH*/
<0x0b004000 0x1000>; /*GICV*/ <0x0 0x0b004000 0x0 0x1000>; /*GICV*/
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
}; };
watchdog@b017000 { watchdog@b017000 {
compatible = "qcom,kpss-wdt"; compatible = "qcom,kpss-wdt";
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
reg = <0x0b017000 0x40>; reg = <0x0 0x0b017000 0x0 0x40>;
clocks = <&sleep_clk>; clocks = <&sleep_clk>;
timeout-sec = <10>; timeout-sec = <10>;
}; };
apcs_glb: mailbox@b111000 { apcs_glb: mailbox@b111000 {
compatible = "qcom,ipq6018-apcs-apps-global"; compatible = "qcom,ipq6018-apcs-apps-global";
reg = <0x0b111000 0x1000>; reg = <0x0 0x0b111000 0x0 0x1000>;
#clock-cells = <1>; #clock-cells = <1>;
clocks = <&a53pll>, <&xo>; clocks = <&a53pll>, <&xo>;
clock-names = "pll", "xo"; clock-names = "pll", "xo";
...@@ -362,7 +362,7 @@ apcs_glb: mailbox@b111000 { ...@@ -362,7 +362,7 @@ apcs_glb: mailbox@b111000 {
a53pll: clock@b116000 { a53pll: clock@b116000 {
compatible = "qcom,ipq6018-a53pll"; compatible = "qcom,ipq6018-a53pll";
reg = <0x0b116000 0x40>; reg = <0x0 0x0b116000 0x0 0x40>;
#clock-cells = <0>; #clock-cells = <0>;
clocks = <&xo>; clocks = <&xo>;
clock-names = "xo"; clock-names = "xo";
...@@ -377,68 +377,68 @@ timer { ...@@ -377,68 +377,68 @@ timer {
}; };
timer@b120000 { timer@b120000 {
#address-cells = <1>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <2>;
ranges; ranges;
compatible = "arm,armv7-timer-mem"; compatible = "arm,armv7-timer-mem";
reg = <0x0b120000 0x1000>; reg = <0x0 0x0b120000 0x0 0x1000>;
clock-frequency = <19200000>; clock-frequency = <19200000>;
frame@b120000 { frame@b120000 {
frame-number = <0>; frame-number = <0>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b121000 0x1000>, reg = <0x0 0x0b121000 0x0 0x1000>,
<0x0b122000 0x1000>; <0x0 0x0b122000 0x0 0x1000>;
}; };
frame@b123000 { frame@b123000 {
frame-number = <1>; frame-number = <1>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
reg = <0xb123000 0x1000>; reg = <0x0 0xb123000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
frame@b124000 { frame@b124000 {
frame-number = <2>; frame-number = <2>;
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b124000 0x1000>; reg = <0x0 0x0b124000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
frame@b125000 { frame@b125000 {
frame-number = <3>; frame-number = <3>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b125000 0x1000>; reg = <0x0 0x0b125000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
frame@b126000 { frame@b126000 {
frame-number = <4>; frame-number = <4>;
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b126000 0x1000>; reg = <0x0 0x0b126000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
frame@b127000 { frame@b127000 {
frame-number = <5>; frame-number = <5>;
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b127000 0x1000>; reg = <0x0 0x0b127000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
frame@b128000 { frame@b128000 {
frame-number = <6>; frame-number = <6>;
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
reg = <0x0b128000 0x1000>; reg = <0x0 0x0b128000 0x0 0x1000>;
status = "disabled"; status = "disabled";
}; };
}; };
q6v5_wcss: remoteproc@cd00000 { q6v5_wcss: remoteproc@cd00000 {
compatible = "qcom,ipq8074-wcss-pil"; compatible = "qcom,ipq8074-wcss-pil";
reg = <0x0cd00000 0x4040>, reg = <0x0 0x0cd00000 0x0 0x4040>,
<0x004ab000 0x20>; <0x0 0x004ab000 0x0 0x20>;
reg-names = "qdsp6", reg-names = "qdsp6",
"rmb"; "rmb";
interrupts-extended = <&intc GIC_SPI 325 IRQ_TYPE_EDGE_RISING>, interrupts-extended = <&intc GIC_SPI 325 IRQ_TYPE_EDGE_RISING>,
......
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