lkml.org 
[lkml]   [2021]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 01/20] arm64/dts: qcom: Fix 'dma' & 'qcom,controlled-remotely' nodes in dts
    Date
    Preparatory patch for subsequent patch in this series which
    converts the qcom_bam_dma device-tree binding into YAML format.

    A few qcom device-tree files define dma-controller nodes
    with non-standard 'node names' and also set
    the bool property 'qcom,controlled-remotely' incorrectly, which
    leads to following errors with 'make dtbs_check':

    $ arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dt.yaml:
    dma@1dc4000: $nodename:0: 'dma@1dc4000' does not match
    '^dma-controller(@.*)?$'

    $ arch/arm64/boot/dts/qcom/sm8250-mtp.dt.yaml:
    dma@1dc4000: qcom,controlled-remotely: 'oneOf' conditional
    failed, one must be fixed:
    [[1]] is not of type 'boolean'
    True was expected
    [[1]] is not of type 'null'

    Fix the same.

    Cc: Thara Gopinath <thara.gopinath@linaro.org>
    Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
    Cc: Rob Herring <robh+dt@kernel.org>
    Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
    ---
    arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 ++--
    arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
    arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
    5 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
    index d2fe58e0eb7a..7b6205c180df 100644
    --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
    +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
    @@ -200,7 +200,7 @@ cryptobam: dma-controller@704000 {
    clock-names = "bam_clk";
    #dma-cells = <1>;
    qcom,ee = <1>;
    - qcom,controlled-remotely = <1>;
    + qcom,controlled-remotely;
    qcom,config-pipe-trust-reg = <0>;
    };

    diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
    index db333001df4d..99668e84953e 100644
    --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
    +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
    @@ -212,7 +212,7 @@ prng: rng@e3000 {
    status = "disabled";
    };

    - cryptobam: dma@704000 {
    + cryptobam: dma-controller@704000 {
    compatible = "qcom,bam-v1.7.0";
    reg = <0x00704000 0x20000>;
    interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
    @@ -220,7 +220,7 @@ cryptobam: dma@704000 {
    clock-names = "bam_clk";
    #dma-cells = <1>;
    qcom,ee = <1>;
    - qcom,controlled-remotely = <1>;
    + qcom,controlled-remotely;
    status = "disabled";
    };

    diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
    index 52df22ab3f6a..390468e1b62e 100644
    --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
    +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
    @@ -2686,7 +2686,7 @@ sdhc2: sdhci@74a4900 {
    status = "disabled";
    };

    - blsp1_dma: dma@7544000 {
    + blsp1_dma: dma-controller@7544000 {
    compatible = "qcom,bam-v1.7.0";
    reg = <0x07544000 0x2b000>;
    interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
    @@ -2743,7 +2743,7 @@ blsp1_i2c3: i2c@7577000 {
    status = "disabled";
    };

    - blsp2_dma: dma@7584000 {
    + blsp2_dma: dma-controller@7584000 {
    compatible = "qcom,bam-v1.7.0";
    reg = <0x07584000 0x2b000>;
    interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
    diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
    index 34039b5c8017..a46838f1e310 100644
    --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
    +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
    @@ -2187,7 +2187,7 @@ blsp1_i2c6: i2c@c17a000 {
    #size-cells = <0>;
    };

    - blsp2_dma: dma@c184000 {
    + blsp2_dma: dma-controller@c184000 {
    compatible = "qcom,bam-v1.7.0";
    reg = <0x0c184000 0x25000>;
    interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
    diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
    index b3b911926184..72ec48c4e03c 100644
    --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
    @@ -2312,7 +2312,7 @@ ufs_mem_phy_lanes: lanes@1d87400 {
    };
    };

    - cryptobam: dma@1dc4000 {
    + cryptobam: dma-controller@1dc4000 {
    compatible = "qcom,bam-v1.7.0";
    reg = <0 0x01dc4000 0 0x24000>;
    interrupts = <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>;
    @@ -2320,7 +2320,7 @@ cryptobam: dma@1dc4000 {
    clock-names = "bam_clk";
    #dma-cells = <1>;
    qcom,ee = <0>;
    - qcom,controlled-remotely = <1>;
    + qcom,controlled-remotely;
    iommus = <&apps_smmu 0x704 0x1>,
    <&apps_smmu 0x706 0x1>,
    <&apps_smmu 0x714 0x1>,
    --
    2.31.1
    \
     
     \ /
      Last update: 2021-10-13 12:56    [W:4.167 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site