diff mbox

[V7,5/6] dts: msm8974: Add blsp2_bam dma node

Message ID 1453197766-18976-6-git-send-email-sricharan@codeaurora.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sricharan Ramabadhran Jan. 19, 2016, 10:02 a.m. UTC
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Reviewed-by: Andy Gross <andy.gross@linaro.org>
---
 arch/arm/boot/dts/qcom-msm8974.dtsi | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

Bjorn Andersson March 25, 2016, 11:17 p.m. UTC | #1
On Tue, Jan 19, 2016 at 2:02 AM, Sricharan R <sricharan@codeaurora.org> wrote:
> Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> Reviewed-by: Andy Gross <andy.gross@linaro.org>
> ---
>  arch/arm/boot/dts/qcom-msm8974.dtsi | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
> index 753bdfd..7786408 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1,6 +1,6 @@
>  /dts-v1/;
>
> -#include <dt-bindings/interrupt-controller/irq.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>  #include <dt-bindings/clock/qcom,gcc-msm8974.h>
>  #include "skeleton.dtsi"
>
> @@ -345,6 +345,16 @@
>                         interrupt-controller;
>                         #interrupt-cells = <4>;
>                 };
> +
> +               blsp2_dma: dma-controller@f9944000 {
> +                       compatible = "qcom,bam-v1.4.0";
> +                       reg = <0xf9944000 0x19000>;
> +                       interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
> +                       clocks = <&gcc GCC_BLSP2_AHB_CLK>;
> +                       clock-names = "bam_clk";
> +                       #dma-cells = <1>;
> +                       qcom,ee = <0>;

Without "qcom,bam_ctrl_remote;" and
https://patchwork.kernel.org/patch/8639181/ the Xperia Honami board
fails to boot with this patch included.

> +               };
>         };
>

Regards,
Bjorn
Andy Gross March 26, 2016, 2:26 a.m. UTC | #2
On Fri, Mar 25, 2016 at 04:17:30PM -0700, Bjorn Andersson wrote:
> On Tue, Jan 19, 2016 at 2:02 AM, Sricharan R <sricharan@codeaurora.org> wrote:
> > Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> > Reviewed-by: Andy Gross <andy.gross@linaro.org>

<snip>

> > +               blsp2_dma: dma-controller@f9944000 {
> > +                       compatible = "qcom,bam-v1.4.0";
> > +                       reg = <0xf9944000 0x19000>;
> > +                       interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
> > +                       clocks = <&gcc GCC_BLSP2_AHB_CLK>;
> > +                       clock-names = "bam_clk";
> > +                       #dma-cells = <1>;
> > +                       qcom,ee = <0>;
> 
> Without "qcom,bam_ctrl_remote;" and
> https://patchwork.kernel.org/patch/8639181/ the Xperia Honami board
> fails to boot with this patch included.

Ouch.  At least one set of pipes must be used by some other processor and TZ has
locked down that BLSP.
Sricharan Ramabadhran March 28, 2016, 12:59 p.m. UTC | #3
> On Fri, Mar 25, 2016 at 04:17:30PM -0700, Bjorn Andersson wrote:
> > On Tue, Jan 19, 2016 at 2:02 AM, Sricharan R <sricharan@codeaurora.org>
> wrote:
> > > Signed-off-by: Sricharan R <sricharan@codeaurora.org>
> > > Reviewed-by: Andy Gross <andy.gross@linaro.org>
> 
> <snip>
> 
> > > +               blsp2_dma: dma-controller@f9944000 {
> > > +                       compatible = "qcom,bam-v1.4.0";
> > > +                       reg = <0xf9944000 0x19000>;
> > > +                       interrupts = <GIC_SPI 239
IRQ_TYPE_LEVEL_HIGH>;
> > > +                       clocks = <&gcc GCC_BLSP2_AHB_CLK>;
> > > +                       clock-names = "bam_clk";
> > > +                       #dma-cells = <1>;
> > > +                       qcom,ee = <0>;
> >
> > Without "qcom,bam_ctrl_remote;" and
> > https://patchwork.kernel.org/patch/8639181/ the Xperia Honami board
> > fails to boot with this patch included.
> 
> Ouch.  At least one set of pipes must be used by some other processor and
> TZ has locked down that BLSP.

 Hmm, this was not the case atleast on the apq8074DB board that I tested
this on.

Regards,
 Sricharan
diff mbox

Patch

diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 753bdfd..7786408 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1,6 +1,6 @@ 
 /dts-v1/;
 
-#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/qcom,gcc-msm8974.h>
 #include "skeleton.dtsi"
 
@@ -345,6 +345,16 @@ 
 			interrupt-controller;
 			#interrupt-cells = <4>;
 		};
+
+		blsp2_dma: dma-controller@f9944000 {
+			compatible = "qcom,bam-v1.4.0";
+			reg = <0xf9944000 0x19000>;
+			interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_BLSP2_AHB_CLK>;
+			clock-names = "bam_clk";
+			#dma-cells = <1>;
+			qcom,ee = <0>;
+		};
 	};
 
 	smd {